Changeset 3 for trunk

Timestamp:

09/09/09 15:18:13 (15 years ago)

Author:

Kris Deugau

Message:

/trunk/dnsbl

Fix another behavioural bug in export - don't export all classful entries

in a CIDR block if that block isn't OOB or volume-listed itself

Irrelevant test-case selections added in browse.cgi and export-dnsbl
Fix export for rbldnsd by passing the mode to export() on full export
Checkpoint segment of export-dnsbl that may not be needed due to above

Location:

trunk/dnsbl

Files:

• DNSBL.pm (modified) (2 diffs)
• browse.cgi (modified) (1 diff)
• export-dnsbl (modified) (1 diff)

trunk/dnsbl/DNSBL.pm

@@ -297 +297 @@
   $level--;
 
+  # need this for a bunch of things, may as well do it here
+  my ($masklen) = ($container =~ m|/(\d+)$|);
+
 # Snag all parent block "is-it-listed?" data, and stuff it into a single
 # variable we can use later.  Much faster than retrieving this data
 # individually, for each octet iteration.
 
+  my $mycount = 0;
   my $sql = "SELECT count(i.ip),b.block,b.level,b.listme AS oobblock,o.listme AS ooborg ".
         "FROM iplist i INNER JOIN blocks b ON i.ip << b.block INNER JOIN orgs o ON b.orgid = o.orgid ".
         "WHERE b.block >>= ? ".
         "GROUP BY b.block,b.level,b.listme,o.listme ORDER BY b.block";
-
   my $parsth = $dbh->prepare($sql);
   $parsth->execute($container);
@@ -314 +317 @@
     $pdata |= $bitfields{block} if $pblock;
     $pdata |= $bitfields{org} if $porg;
-  }
-
-  if ($mode eq 'cidr') {
-    $listhosts->{$container} |= $pdata if $pdata;
+    $mycount = $pcount if $p eq $container;
+  }
+
+  if ($mode eq 'cidr' || $mode eq 'rbldnsd') {
+    $listhosts->{$container} |= $pdata if $pdata && ($ooborg || $oobblock || ($mycount >= $autolist{$masklen}));
   } else {
-
   # if $cidr->masklen is <= 24, iterate on /24 boundaries for bulk sublisting
   # if $cidr->masklen is <= 16, iterate on /16 boundaries for bulk sublisting
   # if $cidr->masklen is <= 8, iterate on /8 boundaries for bulk sublisting
 
-    my ($masklen) = ($container =~ m|/(\d+)$|);
     if ($pdata) {
       my @blocksubs;

trunk/dnsbl/browse.cgi

@@ -23 +23 @@
         "WHERE b.block <<= ";
 my $sth0 = $dbh->prepare($basesql."'0/0' AND b.level=0 ORDER BY block");
-#my $sth0 = $dbh->prepare($basesql."'174.36.0.0/15' AND b.level=0 ORDER BY block");
+#my $sth0 = $dbh->prepare($basesql."'76.73.0.0/17' AND b.level=0 ORDER BY block");
 my $sth1 = $dbh->prepare($basesql."? AND b.level=1 ORDER BY block");
 my $sth2 = $dbh->prepare($basesql."? AND b.level=2 ORDER BY block");

trunk/dnsbl/export-dnsbl

@@ -19 +19 @@
 my $ipref = \%iplist;
 
-my $mode = $ARGV[0] || 'cidr';
+my $mode = $ARGV[0] || 'tiny';
 
 #$dnsbl->export($ipref,$mode,1,'65.60/18');
 #$dnsbl->export($ipref,$mode,1,'67.136.0.0/14');
 #$dnsbl->export($ipref,$mode,1,'83.76/15');
-#$dnsbl->export($ipref,$mode,1,'95.154.192.0/18');
-$dnsbl->export($ipref);
+#$dnsbl->export($ipref,$mode,1,'76.73.0.0/17');
+#$dnsbl->export($ipref,$mode,1,'174.36.0.0/15');
+$dnsbl->export($ipref,$mode);
 
 ##fixme - mode should pick actual output, not just export mode
 if ($mode eq 'cidr') {
+  # more or less raw CIDR block-and-IP info
   foreach (sort ipcmp keys %iplist) {
-    print "$_\t$iplist{$_}\n";
+    print "$_:127.0.0.$iplist{$_}:".
+        ($iplist{$_} & 2 ? '$ relayed a reported spam' : 'Netblock listed on one or more criteria')."\n";
   }
+} elsif ($mode eq 'rbldnsd') {
+  # need extra cmd args
+  die "need subgroup spec (iplist, cidrlist) as well\n" if !$ARGV[1];
+  if ($ARGV[1] eq 'iplist') {
+    foreach (sort ipcmp keys %iplist) {
+      print "$_:127.0.0.$iplist{$_}:\$ relayed a reported spam\n" if $iplist{$_} & 2;
+    }
+  } elsif ($ARGV[1] eq 'cidrlist') {
+    foreach (sort ipcmp keys %iplist) {
+      print "$_:127.0.0.$iplist{$_}:Netblock listed on one or more criteria\n" if ! ($iplist{$_} & 2);
+    }
+  }
+  # no output if second arg is unknown.
 } else {
   foreach (sort ipcmp keys %iplist) {