Changeset 101 for trunk

Timestamp:

09/24/25 11:01:28 (2 days ago)

Author:

Kris Deugau

Message:

/trunk/uribl

File off most of the rough edges on configuration from the misc table; all
keys now have defaults in the object, overrides happen correctly, and all
keys are filled in to the appropriate places in the output rather than
hardcoding things.

Location:

trunk/uribl

Files:

• Makefile (modified) (1 diff)
• URIdb.pm (modified) (4 diffs)
• uridb.cgi (modified) (2 diffs)

trunk/uribl/Makefile

@@ -7 +7 @@
 
 PKGNAME=uridb
-VERSION=0.2.2
+VERSION=0.2.3
 
 # bloody stupid Debian config puts OS-provided packaged sitelib under

trunk/uribl/URIdb.pm

@@ -72 +72 @@
         dbuser => "dnsbl",
         dbpass => "spambgone",
+        misc => {
+                blzone => "uribl.company.com",
+                altblzone => "uri.dnsbl",
+                bladmin => "systems.company.com",
+                ttl => 600,
+                soa => "600 600 600 600",
+        },
   );
 
@@ -136 +143 @@
   }
   $self->{misc}{blzone} = 'uribl.company.com' if !$self->{misc}{blzone};
+  $self->{misc}{altblzone} = 'uribl.company.com' if !$self->{misc}{altblzone};
   return $dbh;
 }
@@ -192 +200 @@
   my $sth;
 
-##fixme:  should probably rejig this key to point to a FQDN rather than a "something that will get published under .dnsbl"
-  my $blzone = ($self->{misc}{blzone} ? $self->{misc}{blzone} : 'uri.dnsbl');
-  my $bladmin = ($self->{misc}{bladmin} ? $self->{misc}{bladmin} : 'systems.company.com');
-  my $blttl = ($self->{misc}{ttl} ? $self->{misc}{ttl} : '900');
-##fixme:  should probably add some configuration strings for the nameserver value
-
   if ($target eq 'rbldnsd') {
-    print $blfh "\$SOA 900 $blzone $bladmin 0 1200 600 600 900\n".
+    print $blfh "\$SOA 900 $self->{misc}{blzone} $self->{misc}{bladmin} 0 $self->{misc}{soa}\n".
         "\$NS 3600 127.0.0.1\n".
-        "\$TTL $blttl\n";
+        "\$TTL $self->{misc}{ttl}\n";
     print $blfh ":127.0.0.2:Domain found in reported missed-spam, no legitimate root or www content\n";
     $sth = $dbh->prepare("SELECT uri FROM urilist WHERE list=2");
@@ -227 +229 @@
     }
   } elsif ($target eq 'tinydns') {
-    print $blfh "Z$blzone:$blzone:$bladmin::600:600:600:600\n";
-    print $blfh "\&$blzone:127.0.0.1::900\n";
+    my $soa = $self->{misc}{soa};
+    $soa =~ s/\s+/:/g;
+    print $blfh "Z$self->{misc}{blzone}:$self->{misc}{blzone}:$self->{misc}{bladmin}::$soa\n";
+    print $blfh "\&$self->{misc}{blzone}:127.0.0.1::3600\n";
     $sth = $dbh->prepare("SELECT uri FROM urilist WHERE list=2");
     $sth->execute;
     while (my ($uri) = $sth->fetchrow_array) {
-      print $blfh "'$uri.$blzone:Domain found in reported missed-spam, no legitimate root or www content:900::\n".
-        "+$uri.$blzone:127.0.0.2:900::\n";
+      print $blfh "'$uri.$self->{misc}{blzone}:Domain found in reported missed-spam, no legitimate root or www content:$self->{misc}{ttl}::\n".
+        "+$uri.$self->{misc}{blzone}:127.0.0.2:$self->{misc}{ttl}::\n";
     }
     $sth = $dbh->prepare("SELECT uri FROM urilist WHERE list=4");
     $sth->execute;
     while (my ($uri) = $sth->fetchrow_array) {
-      print $blfh "'$uri.$blzone:Domain seen repeatedly in reported missed-spam, some legitimate root or www content:900::\n".
-        "+$uri.$blzone:127.0.0.4:900::\n";
+      print $blfh "'$uri.$self->{misc}{blzone}:Domain seen repeatedly in reported missed-spam, some legitimate root or www content:$self->{misc}{ttl}::\n".
+        "+$uri.$self->{misc}{blzone}:127.0.0.4:$self->{misc}{ttl}::\n";
     }
     $sth = $dbh->prepare("SELECT uri FROM urilist WHERE list=8");
     $sth->execute;
     while (my ($uri) = $sth->fetchrow_array) {
-      print $blfh "'$uri.$blzone:Abused URL-shortener or redirector domain:900::\n".
-        "+$uri.$blzone:127.0.0.8:900::\n";
+      print $blfh "'$uri.$self->{misc}{blzone}:Abused URL-shortener or redirector domain:$self->{misc}{ttl}::\n".
+        "+$uri.$self->{misc}{blzone}:127.0.0.8:$self->{misc}{ttl}::\n";
     }
     $sth = $dbh->prepare("SELECT uri FROM urilist WHERE list=16");
     $sth->execute;
     while (my ($uri) = $sth->fetchrow_array) {
-      print $blfh "'$uri.$blzone:High-risk domain:900::\n".
-        "+$uri.$blzone:127.0.0.16:900::\n";
+      print $blfh "'$uri.$self->{misc}{blzone}:High-risk domain:$self->{misc}{ttl}::\n".
+        "+$uri.$self->{misc}{blzone}:127.0.0.16:$self->{misc}{ttl}::\n";
     }
   } elsif ($target eq 'bind') {

trunk/uribl/uridb.cgi

@@ -103 +103 @@
     ($domain) = split /:/, $domain;
     $domain =~ s/^\+//;
-    $domain =~ s/\.$uridb->{misc}{blzone}//;
+    $domain =~ s/\.$uridb->{misc}{blzone}// if $uridb->{misc}{blzone};
     # and a secondary zone name Just In Case(TM)
-    $domain =~ s/\.$uridb->{misc}{altblzone}//;
+    $domain =~ s/\.$uridb->{misc}{altblzone}// if $uridb->{misc}{altblzone};
     # trim any non-FQDN URI parts
     $domain =~ s{/.+$}{};
@@ -113 +113 @@
     chomp $domain;
     # now, see if it's multilisted
-    if ($domain =~ / on (\w+)\s*$/) {
+    if ($domain =~ / on ([\w-]+)\s*$/) {
       my $sub = $1;
-      #$domain =~ s/ on \w+\s*$//;
+      $domain =~ s/ on [\w-]+\s*$//;
       $domlist[$domcount-1]->{otherlists} .= ",$sub";
       next;