Changeset 11 for trunk

Timestamp:

01/06/10 13:09:31 (14 years ago)

Author:

Kris Deugau

Message:

/trunk/dnsbl

Report errors adding a netblock (commonly a range in WHOIS that's not

a single CIDR block)

Location:

trunk/dnsbl

Files:

• DNSBL.pm (modified) (1 diff)
• dnsbl.cgi (modified) (5 diffs)
• templates/dbreport.tmpl (modified) (1 diff)

trunk/dnsbl/DNSBL.pm

@@ -206 +206 @@
   my $block = new NetAddr::IP "$blockin";       # need this to clean up messes like ranges.  sigh.
 
+  return "$blockin not a single CIDR range" if !$block;
+
   local $dbh->{AutoCommit} = 1; # force autocommit
 
   my $sth = $dbh->prepare("INSERT INTO blocks (block,orgid,level) VALUES (?,?,?)");
   $sth->execute("$block",$orgid,$level);
+  return $sth->errstr if $sth->err;
   # nb: no need to return anything, since the CIDR block is the key
 }

trunk/dnsbl/dnsbl.cgi

@@ -48 +48 @@
   }
 } elsif ($webvar{page} eq 'dbreport') {
+  my $err = '';
   my $count = $dnsbl->report($webvar{ip});
   my $org0id = $dnsbl->orgexists($webvar{org0});
@@ -55 +56 @@
   }
   if (!$dnsbl->blockexists($webvar{block0})) {
-    $dnsbl->addblock($webvar{block0}, $org0id, 0);
+    my $ret = $dnsbl->addblock($webvar{block0}, $org0id, 0);
+    $err .= "error adding $webvar{block0}: $ret<br>\n" if $ret;
     $page->param(block0 => $webvar{block0});
   }
@@ -66 +68 @@
     }
     if (!$dnsbl->blockexists($webvar{block1})) {
-      $dnsbl->addblock($webvar{block1}, $org1id, 1);
+      my $ret = $dnsbl->addblock($webvar{block1}, $org1id, 1);
+      $err .= "error adding $webvar{block1}: $ret<br>\n" if $ret;
       $page->param(block1 => $webvar{block1});
     }
@@ -76 +79 @@
       }
       if (!$dnsbl->blockexists($webvar{block2})) {
-        $dnsbl->addblock($webvar{block2}, $org2id, 2);
+        my $ret = $dnsbl->addblock($webvar{block2}, $org2id, 2);
+        $err .= "error adding $webvar{block2}: $ret<br>\n" if $ret;
         $page->param(block2 => $webvar{block2});
       }
@@ -83 +87 @@
 
   $page->param(ip => $webvar{ip});
+  $page->param(err => $err);
 }
 print $page->output;

trunk/dnsbl/templates/dbreport.tmpl

@@ -11 +11 @@
 <TMPL_IF org2><br>added <TMPL_VAR NAME=org2></TMPL_IF>
 <TMPL_IF block2><br>added level 2 block <TMPL_VAR NAME=block2></TMPL_IF>
+<TMPL_IF err><hr><TMPL_VAR NAME=err></TMPL_IF>
 <hr><a href="/">Back</a>
 </body>