Changeset 66 for trunk/dnsbl/dnsbl.cgi

Timestamp:

01/05/18 18:06:47 (7 years ago)

Author:

Kris Deugau

Message:

/trunk/dnsbl

Add exclusion flagging and block-comment handling to IP list tools. Exclusion
flags can be set or unset on each submit; netblock comments can be added,
updated, or removed (or at least "set empty") on each submit.

Note this is focused on the CIDR (rbldnsd) export format, and may produce
excitingly weird results with the default "classful"/tinydns mode.

File:

• trunk/dnsbl/dnsbl.cgi (modified) (4 diffs)

trunk/dnsbl/dnsbl.cgi

@@ -62 +62 @@
 my $cfgname = $ENV{SERVER_NAME}.$ENV{REQUEST_URI};
 $cfgname =~ s|[./-]|_|g;
-$cfgname =~ s|_dnsbl_cgi.+||;
+$cfgname =~ s|_dnsbl_cgi.*||;
 $cfgname =~ s|_$||;
 if (-e "/etc/dnsbl/$cfgname.conf") {
@@ -124 +124 @@
   }
 
-  my $count = $dnsbl->ipexists($webvar{ip});
-  $page->param(nreports => $count) if $count;
+  my $ipinfo = $dnsbl->ipexists($webvar{ip});
+  $page->param(nreports => $ipinfo->[0]) if $ipinfo;
+  $page->param(ipexclude => $ipinfo->[1]) if $ipinfo;
+  # extract and list the entire tree the IP is part of
   $page->param(browsebits =>
         DNSBLweb::retlvl($dbh, $dnsbl, 0, ip => $webvar{ip}, block => $dnsbl->getcontainer($webvar{ip},0) ));
   for (my $i=0; $i <= $maxlvl; $i++) {
-    my ($block,$org) = $dnsbl->getcontainer($webvar{ip},$i);
+    my ($block,$comment,$org) = $dnsbl->getcontainer($webvar{ip},$i);
     if ($block) {
-      my ($bcl,$bal) = $dnsbl->islisted($block);
+      $page->param("comment$i" => $comment);
+      my ($bcl,$bal,$bwl) = $dnsbl->islisted($block);
       $page->param("autob$i" => $bcl);
-      $page->param("listb$i" => $bal);
+      $page->param("flag$i" => ($bwl ? 'exclude' : ($bal ? 'b1list' : '')) );
+      $page->param("excl$i" => $bwl);
       my ($ol) = $dnsbl->islisted($org);
       $page->param("listorg$i" => $ol);
@@ -159 +163 @@
     my $orgn = "org$i";
     my $blockn = "block$i";
+    my $commentn = "comment$i";
+    my $excln = "exclude$i";
     $webvar{$orgn} =~ s/^\s*//;
     $webvar{$orgn} =~ s/\s*$//;
     $webvar{$blockn} =~ s/^\s*//;
     $webvar{$blockn} =~ s/\s*$//;
+    $webvar{$commentn} =~ s/^\s*//;
+    $webvar{$commentn} =~ s/\s*$//;
+    $webvar{$excln} =~ s/on/1/;
     my $orgid = $dnsbl->orgexists($webvar{$orgn});
     if (!$orgid) {
@@ -180 +189 @@
     }
     if (!$dnsbl->blockexists($webvar{$blockn})) {
-      my $ret = $dnsbl->addblock($webvar{$blockn}, $orgid, $i);
+      my $ret = $dnsbl->addblock($webvar{$blockn}, $orgid, $i, $webvar{$excln});
       $err .= "error adding $webvar{$blockn}: $ret<br>\n" if $ret;
       $page->param($blockn => $webvar{$blockn});
+    } else {
+      my $ret = $dnsbl->updateblock($webvar{$blockn}, $orgid, $i, $webvar{$excln}, $webvar{$commentn});
+      $err .= "error updating $webvar{$blockn}: $ret<br>\n" if $ret;
     }
     last unless $webvar{"block".($i+1)};
   }
 
-  my $count = $dnsbl->report($webvar{ip});
+  my $count = $dnsbl->report($webvar{ip}, $webvar{excludeip});
 
   $page->param(ip => $webvar{ip});