Changeset 77

Timestamp:

09/10/25 12:22:02 (4 days ago)

Author:

Kris Deugau

Message:

/trunk/dnsbl

Finally unpack the subtle SQL tweaks from production that kept excluded
blocks from setting bitmask values, and properly handle setting and
unsetting the per-IP exclusion flag

File:

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

trunk/dnsbl/DNSBL.pm

@@ -242 +242 @@
   my $rep = shift;
   my $exclude = shift || 'n';
+  $exclude = 'y' if $exclude eq 'on';
   my $sth;
   my $rows = 0;
@@ -253 +254 @@
         $sth = $dbh->prepare("INSERT INTO iplist (ip,parent,exclude) VALUES ".
                 "(?,(SELECT block FROM blocks WHERE block >> ? ORDER BY level DESC LIMIT 1),?)");
-        $sth->execute($rep,$rep,($exclude ? 'y' : 'n')) or die "couldn't add entry for $rep: ".$dbh->errstr."\n";
+        $sth->execute($rep, $rep, $exclude) or die "couldn't add entry for $rep: ".$dbh->errstr."\n";
       } elsif ($rows == 1) {
         $sth = $dbh->prepare("UPDATE iplist SET count=count+1,".
-                " exclude=".($exclude ? "'y'" : "'n'"). " WHERE ip=?");
+                " exclude = ? WHERE ip = ?");
         $sth->execute($exclude, $rep) or die "couldn't update listing for $rep: ".$dbh->errstr."\n";
       } else {
@@ -265 +266 @@
       my $updsth = $dbh->prepare("UPDATE blocks SET ipcount=(".
         "SELECT count(*) FROM iplist i JOIN blocks b ON b.block=i.parent WHERE i.ip << ? AND i.exclude='n' AND b.exclude='n'".
-        ") WHERE block=?");
+        ") WHERE block = ?");
       while (my ($block) = $sth->fetchrow_array) {
         $updsth->execute($block,$block);
@@ -410 +411 @@
     }
     $sth = $dbh->prepare("UPDATE blocks SET exclude = ?, comments = ?, ipcount = ".
-        "(SELECT count(*) FROM iplist WHERE ip << ? AND exclude='n')".
+        "(SELECT count(*) FROM iplist i JOIN blocks b ON b.block=i.parent WHERE i.ip << ? AND i.exclude='n' AND b.exclude='n')".
         " WHERE block = ?");
     $sth->execute($exclude, $comment, "$block", "$block");
@@ -559 +560 @@
     $sth->execute($container);
     ($bcount,$listme,$bexclude,$listorg) = $sth->fetchrow_array();
+    $bcount = 0 if !$bcount;
     $bitmask |= $bitfields{$level-1} if $bcount >= $autolist{$masklen};
     $bitmask |= $bitfields{"block".($level-1)} if $listme;