Changeset 3 for trunk/dnsbl/DNSBL.pm

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

File:

• trunk/dnsbl/DNSBL.pm (modified) (2 diffs)

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;