Changeset 66 for trunk/dnsbl/DNSBLweb.pm

Timestamp:

01/05/18 18:06:47 (6 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/DNSBLweb.pm (modified) (4 diffs)

trunk/dnsbl/DNSBLweb.pm

@@ -21 +21 @@
 
 package DNSBLweb;
+
+use strict;
+use warnings;
 
 use Exporter;
@@ -56 +59 @@
   my $pblock = $args{block} || '0/0';
 
-  my $basesql = "SELECT b.block,o.orgname,b.listme,o.listme,b.comments,o.comments ".
+  my $basesql = "SELECT b.block,o.orgname,b.listme,o.listme,b.comments,o.comments,b.exclude ".
        "FROM blocks b INNER JOIN orgs o ON b.orgid=o.orgid ".
        "WHERE b.block <<=";
@@ -62 +65 @@
   my $sthiplist = $dbh->prepare("SELECT * FROM iplist WHERE ip <<= ? ORDER BY ip");
   $allsth->execute($pblock,$lvl);
-  while (my ($block,$org,$listmeb,$listmeo,$bcomments,$ocomments) = $allsth->fetchrow_array) {
+  while (my ($block,$org,$listmeb,$listmeo,$bcomments,$ocomments,$bexclude) = $allsth->fetchrow_array) {
     my $tmpl = new HTML::Template(filename => "browse-block.tmpl");
     my $blockcidr = new NetAddr::IP $block;
     $tmpl->param(lvlclass => "lvl$lvl".($dnsbl->autolist_block($block) ? " auto$lvl" : '').
        ( $ipcidr->within($blockcidr) ? ' inhere' : ''));
-
-    $tmpl->param(netclass => ($listmeb ? "b$lvl".'list' : ''));
+    # exclude takes precedence over listme
+    $tmpl->param(netclass => ($bexclude ? 'exclude' : ($listmeb ? "b$lvl".'list' : '')));
     $tmpl->param(net => $block);
     $tmpl->param(orgclass => ($listmeo ? "b$lvl".'org' : ''));
@@ -81 +84 @@
       next if $args{ipseen}->{$data4[0]};
       my %iprow;
+      my @ipclass;
       $iprow{ip} = $data4[0];
       $iprow{ipcount} = $data4[1];
       $iprow{indent} = '  'x$lvl;
-      $iprow{repeater} = 1 if $ip eq $data4[0];
-#       ip        | count | s4list |             added
+      push @ipclass, 'repeater' if $ip eq $data4[0];
+      push @ipclass, 'exclude' if $data4[5];
+      $iprow{ipclass} = join(' ', @ipclass);
+#       ip        | count | s4list |             added             |     parent     | exclude
       push @iprows, \%iprow;
       $args{ipseen}->{$data4[0]} = 1;