Changeset 29

Timestamp:

12/20/10 16:14:17 (14 years ago)

Author:

Kris Deugau

Message:

/trunk/dnsbl

Add islisted()
Add waslisted table in SQL def
Indicate block status on adding an IP to an existing block
Fix for scripts-not-at-webroot
Tweak for scrolling "blocks in this registrar block" list
Load more config from DB on export

Location:

trunk/dnsbl

Files:

• DNSBL.pm (modified) (1 diff)
• dnsbl.cgi (modified) (1 diff)
• dnsbl.sql (modified) (1 diff)
• export-dnsbl (modified) (3 diffs)
• index.shtml (modified) (1 diff)
• templates/dbreport.tmpl (modified) (1 diff)
• templates/dnsbl.css (modified) (1 diff)
• templates/report.tmpl (modified) (2 diffs)

trunk/dnsbl/DNSBL.pm

@@ -260 +260 @@
 
 
+# Get info about whether a block, IP or org is listed
+# Returns ?
+sub islisted {
+  my $self = shift;
+  my $entity = shift;
+
+  my $sth;
+
+  if ($entity =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/) {
+    # looking for IP
+
+    $sth = $dbh->prepare("SELECT ip,s4list FROM iplist WHERE ip=?");
+    $sth->execute($entity);
+    my @ret = $sth->fetchrow_array;
+    return @ret if @ret;
+
+  } elsif ($entity =~ m|^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/(\d+)$|) {
+    # block
+
+    my $masklen = $1;
+
+    $sth = $dbh->prepare("SELECT block,listme FROM blocks WHERE block=?");
+    $sth->execute($entity);
+    my ($block,$listme) = $sth->fetchrow_array;
+
+    return if !$block;
+
+    $sth = $dbh->prepare("SELECT count(*) FROM iplist WHERE ip << ?");
+    $sth->execute($entity);
+    my ($bcount) = $sth->fetchrow_array;
+    my @ret = ( ($bcount >= $autolist{$masklen}), $listme);
+    return @ret;
+
+  } else {
+    # org
+
+    $sth = $dbh->prepare("SELECT orgid,listme FROM orgs WHERE orgname=?");
+    $sth->execute($entity);
+    my ($orgid,$listme) = $sth->fetchrow_array;
+    return $listme if $orgid;
+
+  }
+
+  return undef;
+
+} # end islisted()
+
+
 # whee! Recursion is Fun!
 # Call ourself to dig down through the layers of blocks from registar-allocation

trunk/dnsbl/dnsbl.cgi

@@ -81 +81 @@
     my ($block,$org) = $dnsbl->getcontainer($webvar{ip},$i);
     if ($block) {
+      my ($bcl,$bal) = $dnsbl->islisted($block);
+      $page->param("autob$i" => $bcl);
+      $page->param("listb$i" => $bal);
+      my ($ol) = $dnsbl->islisted($org);
+      $page->param("listorg$i" => $ol);
       $page->param("block$i" => $block);
       $page->param("org$i" => $org);

trunk/dnsbl/dnsbl.sql

@@ -67 +67 @@
 );
 
+
+-- for tracking IPs that get removed from listing
+-- note we don't want a PK on IP as with iplist, since we may end up removing an IP more than once.  :/
+
+CREATE TABLE waslisted (
+    ip inet NOT NULL,
+    count integer DEFAULT 1,
+    s4list boolean DEFAULT false,
+    origadded timestamp with time zone DEFAULT now(),
+    delisted timestamp with time zone DEFAULT now()
+);
 
 --

trunk/dnsbl/export-dnsbl

@@ -35 +35 @@
 my $dbh = $dnsbl->connect($dbhost, $dbname, $dbuser, $dbpass);
 
+my %config;
+my $sth = $dbh->prepare("SELECT key,value FROM misc");
+$sth->execute;
+while (my ($key,$value) = $sth->fetchrow_array) {
+  $config{$key} = $value;
+}
+
 my %iplist;
 my $ipref = \%iplist;
@@ -51 +58 @@
 if ($mode eq 'cidr') {
   # SOA, NS records.  Maybe dnscache needs them?
-  print "\$SOA 900 company.dnsbl systems.company.com 0 1200 600 600 900\n".
+  print "\$SOA 900 ".($config{blzone} ? $config{blzone} : 'company').".dnsbl systems.company.com 0 1200 600 600 900\n".
         "\$NS 3600 127.0.0.1\n".
         "\$TTL 900\n";
@@ -58 +65 @@
   foreach (sort ipcmp keys %iplist) {
     print "$_:127.0.0.$iplist{$_}:".
-        ($iplist{$_} & 2 ? '$ relayed a reported spam' : 'Netblock listed on one or more criteria')."\n";
+        ($iplist{$_} & 2 ? 
+                ($config{iplisted} ? $config{iplisted} : '$ relayed a reported spam') :
+                ($config{blocklisted} ? $config{blocklisted} : 'Netblock listed on one or more criteria')
+        )."\n";
   }
 } else {

trunk/dnsbl/index.shtml

@@ -1 @@
-<!--#include virtual="/dnsbl.cgi" -->
+<!--#include virtual="dnsbl.cgi" -->
+

trunk/dnsbl/templates/dbreport.tmpl

@@ -18 +18 @@
 <TMPL_IF NAME=browsebits>
 <td valign=top>
+<div class="scroll780">
 <TMPL_VAR NAME=browsebits>
+</div>
 </td>
 </TMPL_IF>

trunk/dnsbl/templates/dnsbl.css

@@ -85 +85 @@
   font-weight: bold;
 }
+.scroll780 {
+  border: 2px solid #0000ff;
+  height: 780px;
+  width: 800px;
+  overflow: auto;
+}

trunk/dnsbl/templates/report.tmpl

@@ -15 +15 @@
 
 <tr><td nowrap>Registrar delegation</td></tr>
-<tr>
-<td>Netblock:</td>
+<tr<TMPL_IF autob0> class="auto0"</TMPL_IF>>
+<td><span class="<TMPL_IF listb0>b0list</TMPL_IF>">Netblock:</span></td>
 <td colspan=2><input name=block0 value="<TMPL_VAR block0>" size=40></td>
 </tr>
-<tr>
-<td>Org/Person:</td>
+<tr<TMPL_IF autob0> class="auto0"</TMPL_IF>>
+<td><span class="<TMPL_IF listorg0>b0org</TMPL_IF>">Org/Person:</span></td>
 <td colspan=2><input name=org0 value="<TMPL_VAR org0>" size=40></td>
 </tr>
 
 <tr><td>1st subdelegation</td></tr>
-<tr>
-<td>Netblock:</td>
+<tr<TMPL_IF autob1> class="auto1"</TMPL_IF>>
+<td><span class="<TMPL_IF listb1>b1list</TMPL_IF>">Netblock:</span></td>
 <td colspan=2><input name=block1 value="<TMPL_VAR block1>" size=40></td>
 </tr>
-<tr>
-<td>Org/Person:</td>
+<tr<TMPL_IF autob1> class="auto1"</TMPL_IF>>
+<td><span class="<TMPL_IF listorg1>b1org</TMPL_IF>">Org/Person:</span></td>
 <td colspan=2><input name=org1 value="<TMPL_VAR org1>" size=40></td>
 </tr>
 
 <tr><td>2nd subdelegation</td></tr>
-<tr>
-<td>Netblock:</td>
+<tr<TMPL_IF autob2> class="auto2"</TMPL_IF>>
+<td><span class="<TMPL_IF listb2>b2list</TMPL_IF>">Netblock:</span></td>
 <td colspan=2><input name=block2 value="<TMPL_VAR block2>" size=40></td>
 </tr>
-<tr>
-<td>Org/Person:</td>
+<tr<TMPL_IF autob2> class="auto2"</TMPL_IF>>
+<td><span class="<TMPL_IF listorg2>b2org</TMPL_IF>">Org/Person:</span></td>
 <td colspan=2><input name=org2 value="<TMPL_VAR org2>" size=40></td>
 </tr>
@@ -51 +51 @@
 <TMPL_IF NAME=browsebits>
 <td valign=top>
+<div class="scroll780">
 <TMPL_VAR NAME=browsebits>
+</div>
 </td>
 </TMPL_IF>