Changeset 86

Timestamp:

09/11/25 17:57:24 (3 days ago)

Author:

Kris Deugau

Message:

/trunk/uribl

Move the %config blurb inside the module so it's not splattered across all
the scripts

Location:

trunk/uribl

Files:

• URIdb.pm (modified) (2 diffs)
• export-uridb (modified) (2 diffs)
• import-cur.pl (modified) (1 diff)
• uridb.cgi (modified) (2 diffs)

trunk/uribl/URIdb.pm

@@ -128 +128 @@
         })
         or die "database inaccessible: ".$DBI::errstr;
-#  my $sth = $dbh->prepare("SELECT masklen,ipcount FROM autolist");
-#  $sth->execute;
-#  while (my ($masklen,$ipcount) = $sth->fetchrow_array) {
-#    $autolist{$masklen} = $ipcount;
-#  }
+  my $sth = $dbh->prepare("SELECT key,value FROM misc");
+  $sth->execute;
+  while (my ($key,$value) = $sth->fetchrow_array) {
+    $self->{misc}{$key} = $value;
+  }
+  $self->{misc}{blzone} = 'uribl.company.com' if !$self->{misc}{blzone};
   return $dbh;
 }
@@ -186 +187 @@
   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.dnsbl $bladmin 0 1200 600 600 900\n".
+        "\$NS 3600 127.0.0.1\n".
+        "\$TTL $blttl\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");

trunk/uribl/export-uridb

@@ -29 +29 @@
 use URIdb 2.0;
 
-my $uridb = new URIdb;
-
 die "Usage: export-uridb <list> [type]\n"
         if !$ARGV[0];
@@ -42 +40 @@
 $uridb->connect;
 
-my %config;
-my $sth = $dbh->prepare("SELECT key,value FROM misc");
-$sth->execute;
-while (my ($key,$value) = $sth->fetchrow_array) {
-  $config{$key} = $value;
-}
-
-print "\$SOA 900 ".($config{blzone} ? $config{blzone} : 'uri').".dnsbl systems.company.com 0 1200 600 600 900\n".
-        "\$NS 3600 127.0.0.1\n".
-        "\$TTL 900\n";
-
 $uridb->export($mode,*STDOUT);

trunk/uribl/import-cur.pl

@@ -37 +37 @@
 
 my $datesth = $dbh->prepare("UPDATE urilist SET added=? WHERE uri=?");
-
-my %config;
-my $sth = $dbh->prepare("SELECT key,value FROM misc");
-$sth->execute;
-while (my ($key,$value) = $sth->fetchrow_array) {
-  $config{$key} = $value;
-}
-$config{blzone} = 'uribl.company.com' if !$config{blzone};
 
 my @months = ('null','Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec');

trunk/uribl/uridb.cgi

@@ -74 +74 @@
 $ENV{HTML_TEMPLATE_ROOT} = $templatedir;
 
-my %config;
-my $sth = $dbh->prepare("SELECT key,value FROM misc");
-$sth->execute;
-while (my ($key,$value) = $sth->fetchrow_array) {
-  $config{$key} = $value;
-}
-
 # decide which page to spit out...
 if (!$webvar{page}) {
@@ -88 +81 @@
 }
 
-$page->param(pgtitle => $config{pgtitle}) if defined($config{pgtitle});
-$page->param(pgcomment => $config{pgcomment}) if defined($config{pgcomment});
+$page->param(pgtitle => $uridb->{cfg}{pgtitle}) if defined($uridb->{cfg}{pgtitle});
+$page->param(pgcomment => $uridb->{cfg}{pgcomment}) if defined($uridb->{cfg}{pgcomment});
 $page->param(cgiself => $cgiself);