Changeset 104

Timestamp:

09/24/25 13:20:10 (38 hours ago)

Author:

Kris Deugau

Message:

/trunk/dnsbl

Apply largely the same semantic change from r101 to the dnsbl/ subtool, with
some differences due to the actual export not being inside the module.

Location:

trunk/dnsbl

Files:

• DNSBL.pm (modified) (1 diff)
• export-dnsbl (modified) (4 diffs)

trunk/dnsbl/DNSBL.pm

@@ -144 +144 @@
         dbuser => "dnsbl",
         dbpass => "spambgone",
+        misc => {
+                blzone => "spamhosts.example.com",
+                altblzone => "company.dnsbl",
+                bladmin => "systems.example.com",
+                ttl => 600,
+                soa => "600 600 600 600",
+                iplisted => '$ relayed a reported spam',
+                blocklisted => 'Netblock listed on one or more criteria',
+        },
   );
 

trunk/dnsbl/export-dnsbl

@@ -49 +49 @@
 if ($mode eq 'cidr') {
   # SOA, NS records.  Maybe dnscache needs them?
-  print "\$SOA 900 ".($dnsbl->{misc}{blzone} ? $dnsbl->{misc}{blzone} : 'company.dnsbl')." ".
-        ($dnsbl->{misc}{bladmin} ? $dnsbl->{misc}{bladmin} : 'systems.company.com')." 0 1200 600 600 900\n".
+  print "\$SOA 900 $dnsbl->{misc}{blzone} $dnsbl->{misc}{bladmin} 0 $dnsbl->{misc}{soa}\n".
         "\$NS 3600 127.0.0.1\n".
-        "\$TTL ".($dnsbl->{misc}{ttl} ? $dnsbl->{misc}{ttl} : '900')."\n";
+        "\$TTL $dnsbl->{misc}{ttl}\n";
 
   # more or less raw CIDR block-and-IP info.  rbldnsd format for convenience.
@@ -75 +74 @@
     }
     $entry .= $iplist{$_};
-    my $out = "$_:127.$entry:".
-        ($iplist{$_} & 2 ?
-                ($dnsbl->{misc}{iplisted} ? $dnsbl->{misc}{iplisted} : '$ relayed a reported spam') :
-                ($dnsbl->{misc}{blocklisted} ? $dnsbl->{misc}{blocklisted} : 'Netblock listed on one or more criteria')
-        )."\n";
+    my $out = "$_:127.$entry:".($iplist{$_} & 2 ? $dnsbl->{misc}{iplisted} : $dnsbl->{misc}{blocklisted})."\n";
     $out =~ s/:ENTITY:/$_/;
     print $out;
@@ -86 +81 @@
 } else {
   # default "mode";  tinyDNS data format
+  my $soa = $dnsbl->{misc}{soa};
+  $soa =~ s/\s+/:/g;
+  print "Z$dnsbl->{misc}{blzone}:$dnsbl->{misc}{blzone}:$dnsbl->{misc}{bladmin}::$soa\n";
+  print "\&$dnsbl->{misc}{blzone}:127.0.0.1::3600\n";
   foreach (sort ipcmp keys %iplist) {
     next if $iplist{$_} == -1; # whitelisted IP or block
@@ -104 +103 @@
     my ($o1,$o2,$o3,$o4) = (/^(\d+)\.([\d*]+)(?:\.([\d*]+)(?:\.([\d*]+))?)?$/);
     print "+".(defined($o4) ? "$o4." : '').(defined($o3) ? "$o3." : '').(defined($o2) ? "$o2." : '').
-        "$o1.".($dnsbl->{misc}{blzone} ? $dnsbl->{misc}{blzone} : 'spamhosts.company.dnsbl').":127.$entry:".
-        ($dnsbl->{misc}{ttl} ? $dnsbl->{misc}{ttl} : '900')."::\n";
+        "$o1.$dnsbl->{misc}{blzone}:127.$entry:$dnsbl->{misc}{ttl}::\n";
   }
 }