Changeset 54 for trunk

Timestamp:

12/11/14 17:22:28 (10 years ago)

Author:

Kris Deugau

Message:

/trunk/dnsbl

Extend the number of layers/depth from 3 to 7 internally. Note that only

5 are exposed in the "add" UI.

Add support to extract the CIDR range when a WHOIS lookup gives a non-CIDR

range.

Fix tracking of "seen" IPs creating the browse display.
Add the new DNSBLweb.pm to the Makefile MANIFEST, and bump the version in

the Makefile

Location:

trunk/dnsbl

Files:

• DNSBL.pm (modified) (1 diff)
• DNSBLweb.pm (modified) (3 diffs)
• Makefile (modified) (1 diff)
• dnsbl.cgi (modified) (3 diffs)

trunk/dnsbl/DNSBL.pm

@@ -272 +272 @@
 
 
+# take an arbitrary IP range and an IP, and return the CIDR block (if any) the IP is in.
+sub range2cidr {
+  my $self = shift;
+  my $rstart = shift;
+  my $rend = shift;
+  my $ip = shift;
+
+  $rstart = new NetAddr::IP $rstart;
+  $rend = new NetAddr::IP $rend;
+  # Basic algoithm:  Set the mask on the IP, and see if both $rstart and $rend
+  # are within the range defined by that IP/mask.  Continue making the mask
+  # larger until success.
+
+  my $mask;
+  for ($mask = 32; $mask > 0; $mask--) {
+    my $ip = NetAddr::IP->new("$ip/$mask");
+    if (NetAddr::IP->new($ip->network->addr)   >= $rstart    &&
+        NetAddr::IP->new($ip->broadcast->addr) <= $rend) {
+      next;
+    } else {
+      $mask++;
+      last;
+    }
+  }
+  my $realnet = NetAddr::IP->new("$ip/$mask")->network;
+
+  return "$realnet";
+} # end range2cidr()
+
+
 # add a block.  requires the orgid
 ##fixme needs error handling

trunk/dnsbl/DNSBLweb.pm

@@ -40 +40 @@
 
   my %args = @_;
+  $args{ipseen} = \%ipseen if !defined($args{ipseen});
   my $pblock = $args{block} || '0/0';
   my $ip;  
@@ -68 +69 @@
     $tmpl->param(ocomment => $ocomments) if $ocomments;
     $tmpl->param(indent => '  'x$lvl);
-    $tmpl->param(subs => DNSBLweb::retlvl($dbh, $dnsbl, $lvl+1, block => $block, ip => $ip));
+    $tmpl->param(subs => DNSBLweb::retlvl($dbh, $dnsbl, $lvl+1, block => $block, ip => $ip, ipseen => $args{ipseen}));
     $sthiplist->execute($block);
     my @iprows;
     while (my @data4 = $sthiplist->fetchrow_array) {
-      next if $ipseen{$data4[0]};
+      next if $args{ipseen}->{$data4[0]};
       my %iprow;
       $iprow{ip} = $data4[0];
@@ -79 +80 @@
 #       ip        | count | s4list |             added
       push @iprows, \%iprow;
-      $ipseen{$data4[0]} = 1;
+      $args{ipseen}->{$data4[0]} = 1;
     }
     $tmpl->param(iplist => \@iprows);

trunk/dnsbl/Makefile

@@ -9 +9 @@
 MANIFEST = \
         browse.cgi check-iplist.pl delist-ip export-dnsbl index.shtml Makefile \
-        dnsbl.cgi DNSBL.pm dnsbl.sql templates/ addparents.sql setparents.pl \
+        dnsbl.cgi DNSBL.pm DNSBLweb.pm dnsbl.sql templates/ addparents.sql setparents.pl \
         COPYING sa-dnsbl-example.cf
 
 PKGNAME=dnsbl
-VERSION=0.2.2
+VERSION=0.3.0
 
 all:

trunk/dnsbl/dnsbl.cgi

@@ -41 +41 @@
 
 my $dnsbl = new DNSBL;
+# here be drag'ns, should theoretically be $DNSBL::maxlvl, but we
+# only have up to level 4 in the report HTML/template
+my $maxlvl = 4
 
 # try to be friendly to non-US-ASCII characters.  Still need to find what
@@ -101 +104 @@
   $page->param(browsebits =>
         DNSBLweb::retlvl($dbh, $dnsbl, 0, ip => $webvar{ip}, block => $dnsbl->getcontainer($webvar{ip},0) ));
-  for (my $i=0; $i<3; $i++) {
+  for (my $i=0; $i <= $maxlvl; $i++) {
     my ($block,$org) = $dnsbl->getcontainer($webvar{ip},$i);
     if ($block) {
@@ -119 +122 @@
 
   my $err = '';
-  my $org0id = $dnsbl->orgexists($webvar{org0});
-  if (!$org0id) {
-    $org0id = $dnsbl->addorg($webvar{org0});
-    $page->param(org0 => $webvar{org0});
+
+  # basic algo:  for each listing level, add the org and block if not already present.
+  # escape the loop if we check a level with no block entered.
+
+  # there are still error checks that should probably be done.  changes in block
+  # level/parenting should also Just Work(TM), rather than requiring setparents.pl
+  # or setparents-full.pl
+  for (my $i = 0; $i <= $maxlvl; $i++) {
+    my $orgn = "org$i";
+    my $blockn = "block$i";
+    my $orgid = $dnsbl->orgexists($webvar{$orgn});
+    if (!$orgid) {
+      $orgid = $dnsbl->addorg($webvar{$orgn});
+      $page->param($orgn => $webvar{$orgn});
+    }
+    if ($webvar{$blockn} =~ /-/) {
+      $err .= "Autofinding CIDR block containing $webvar{ip} for range '$webvar{$blockn}': ";
+      my ($s,$f) = split /[\s-]+/, $webvar{$blockn};
+      my $cidr = $dnsbl->range2cidr($s, $f, $webvar{ip});
+      $err .= "$cidr<br>\n";
+      $webvar{$blockn} = $cidr;
+    }
+    if (!$dnsbl->blockexists($webvar{$blockn})) {
+      my $ret = $dnsbl->addblock($webvar{$blockn}, $orgid, $i);
+      $err .= "error adding $webvar{$blockn}: $ret<br>\n" if $ret;
+      $page->param($blockn => $webvar{$blockn});
+    }
+    last unless $webvar{"block".($i+1)};
   }
-  if (!$dnsbl->blockexists($webvar{block0})) {
-    my $ret = $dnsbl->addblock($webvar{block0}, $org0id, 0);
-    $err .= "error adding $webvar{block0}: $ret<br>\n" if $ret;
-    $page->param(block0 => $webvar{block0});
-  }
-# yes, this is grotty.  PTHBTT!
-  if ($webvar{block1}) {
-    my $org1id = $dnsbl->orgexists($webvar{org1});
-    if (!$org1id) {
-      $org1id = $dnsbl->addorg($webvar{org1});
-      $page->param(org1 => $webvar{org1});
-    }
-    if (!$dnsbl->blockexists($webvar{block1})) {
-      my $ret = $dnsbl->addblock($webvar{block1}, $org1id, 1);
-      $err .= "error adding $webvar{block1}: $ret<br>\n" if $ret;
-      $page->param(block1 => $webvar{block1});
-    }
-    if ($webvar{block2}) {
-      my $org2id = $dnsbl->orgexists($webvar{org2});
-      if (!$org2id) {
-        $org2id = $dnsbl->addorg($webvar{org2});
-        $page->param(org2 => $webvar{org2});
-      }
-      if (!$dnsbl->blockexists($webvar{block2})) {
-        my $ret = $dnsbl->addblock($webvar{block2}, $org2id, 2);
-        $err .= "error adding $webvar{block2}: $ret<br>\n" if $ret;
-        $page->param(block2 => $webvar{block2});
-      }
-    }
-  }
+
   my $count = $dnsbl->report($webvar{ip});