Changeset 7 for trunk/dnsbl/dnsbl.cgi

Timestamp:

09/22/09 14:49:44 (15 years ago)

Author:

Kris Deugau

Message:

/trunk/dnsbl

export-dnsbl

• Spit out SOA and NS records for rbldns/cidr output, Just In Case

browse.cgi:

• Show comments for listme(block) and listme(org) ratings

dnsbl.cgi

• Show registrar-parent browse detail on IPs submitted for listing. Copied most of browse.cgi code into dnsbl.cgi - this should really be split out

templates/report.tmpl

• Added space for browse list data, added reference to CSS for browse listings

templates/browse.tmpl

• Split out CSS for browse formatting into separate file instead of inline <style> header tag

templates/dnsbl.css

• CSS for browse data

File:

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

trunk/dnsbl/dnsbl.cgi

@@ -21 +21 @@
 my $dnsbl = new DNSBL;
 
-$dnsbl->connect;
+my $dbh = $dnsbl->connect;
 
 print "Content-type: text/html\n\n";
@@ -39 +39 @@
   my $count = $dnsbl->ipexists($webvar{ip});
   $page->param(nreports => $count) if $count;
+  $page->param(browsebits => browse($dbh,$webvar{ip}));
   for (my $i=0; $i<3; $i++) {
     my ($block,$org) = $dnsbl->getcontainer($webvar{ip},$i);
@@ -84 +85 @@
 }
 print $page->output;
+
+exit 0;
+
+
+
+## extra subs.  should probably put this in a module somehow to share with browse.cgi
+
+sub browse {
+  my $dbh = shift;
+  my $ip = shift;
+
+  my $basesql = "SELECT b.block,o.orgname,b.listme,o.listme,b.comments,o.comments ".
+        "FROM blocks b INNER JOIN orgs o ON b.orgid=o.orgid ".
+        "WHERE b.block ";
+
+  my $sth0 = $dbh->prepare($basesql." >> ? AND b.level=0 ORDER BY block");
+  my $sth1 = $dbh->prepare($basesql." <<= ? AND b.level=1 ORDER BY block");
+  my $sth2 = $dbh->prepare($basesql." <<= ? AND b.level=2 ORDER BY block");
+  my $sthiplist = $dbh->prepare("select * from iplist where ip <<= ? order by ip");
+
+  my %ipseen;
+  my $out = '';
+
+  $sth0->execute($ip);
+  while (my ($block0,$org0,$listmeb0,$listmeo0,$bcomments0,$ocomments0) = $sth0->fetchrow_array) {
+    $out .= "<div class=\"lvl0".($dnsbl->autolist_block($block0) ? ' auto0"' : '"').
+        "><span".($listmeb0 ? ' class=b0list' : '').">$block0".
+        ($listmeb0 ? " ($bcomments0)" : '')."</span> ".
+        "<span".($listmeo0 ? ' class=b0org' : '').">$org0".
+        ($listmeo0 ? " ($ocomments0)" : '')."</span>\n";
+    $sth1->execute($block0);
+    if ($sth1->rows > 0) {
+      while (my ($block1,$org1,$listmeb1,$listmeo1,$bcomments1,$ocomments1) = $sth1->fetchrow_array) {
+# lvl 1 div open
+        $out .= "  <div class=\"lvl1".($dnsbl->autolist_block($block1) ? ' auto1"' : '"').
+                "><span".($listmeb1 ? ' class=b1list' : '').">$block1".
+                ($listmeb1 ? " ($bcomments1)" : '')."</span> ".
+                "<span".($listmeo1 ? ' class=b1org' : '').">$org1".
+                ($listmeo1 ? " ($ocomments1)" : '')."</span>\n";
+        $sth2->execute($block1);
+        if ($sth2->rows > 0) {
+          while (my ($block2,$org2,$listmeb2,$listmeo2,$bcomments2,$ocomments2) = $sth2->fetchrow_array) {
+# lvl 2 div open
+            $out .= "    <div class=\"lvl2".($dnsbl->autolist_block($block2) ? ' auto2"' : '"').
+                "><span".($listmeb2 ? ' class=b2list' : '').">$block2".
+                ($listmeb2 ? " ($bcomments2)" : '')."</span> ".
+                "<span".($listmeo2 ? ' class=b2org' : '').">$org2".
+                ($listmeo2 ? " ($ocomments2)" : '')."</span>\n";
+            $sthiplist->execute($block2);
+            $out .= "      <div class=iplist>\n";
+            while (my @data4 = $sthiplist->fetchrow_array) {
+              $out .= "        $data4[0]<br>\n";
+              $ipseen{$data4[0]} = 1;
+            }
+            $out .= "      </div>\n";
+# lvl2 div close
+            $out .= "    </div>\n";
+          }
+        } else {
+          $sthiplist->execute($block1);
+          $out .= "    <div class=iplist>\n";
+          while (my @data4 = $sthiplist->fetchrow_array) {
+            $out .= "      $data4[0]<br>\n";
+            $ipseen{$data4[0]} = 1;
+          }
+          $out .= "    </div>\n";
+        }
+
+        my $sqlalt = "select ip from iplist where ip << ?";
+        my $sthalt = $dbh->prepare($sqlalt);
+        $sthalt->execute($block1);
+        my @newips;
+        while (my @data4 = $sthalt->fetchrow_array) {
+          push @newips, $data4[0] if !$ipseen{$data4[0]};
+          $ipseen{$data4[0]} = 1;
+        }
+        if ($#newips > -1) {
+          $out .= "    <div class=iplist>\n";
+          foreach (@newips) {
+            $out .= "      $_<br>\n";
+          }
+          $out .= "    </div>\n";
+        }
+# lvl 1 div close
+        $out .= "  </div>\n";
+      }
+    } else {
+      $sthiplist->execute($block0);
+      $out .= "  <div class=iplist>\n";
+      while (my @data4 = $sthiplist->fetchrow_array) {
+        $out .= "    $data4[0]<br>\n";
+        $ipseen{$data4[0]} = 1;
+      }
+      $out .= "  </div>\n";
+    }
+
+    my $sqlalt = "select ip from iplist where ip << ?";
+    my $sthalt = $dbh->prepare($sqlalt);
+    $sthalt->execute($block0);
+    my @newips;
+    while (my @data4 = $sthalt->fetchrow_array) {
+      push @newips, $data4[0] if (!$ipseen{$data4[0]});
+    }
+    if ($#newips > -1) {
+      $out .= "  <div class=iplist>\n";
+      foreach (@newips) {
+        $out .= "    $_<br>\n";
+      }
+      $out .= "  </div>\n";
+    }
+
+    $out .= "</div>\n";
+  }
+
+  return $out;
+} # end browse()