Changeset 29 for trunk/dnsbl/DNSBL.pm

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

File:

• trunk/dnsbl/DNSBL.pm (modified) (1 diff)

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