Changeset 25 for trunk/dnsbl/dnsbl.cgi

Timestamp:

09/03/10 15:18:51 (14 years ago)

Author:

Kris Deugau

Message:

/trunk/dnsbl

Changes across the board to support multi-instance without code changes.
DB config is now loaded from a fragment in /etc/dnsbl, and the DB in turn
contains the autolist thresholds and some visual sugar for the web
interface so you know which DB you're dealing with.

File:

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

trunk/dnsbl/dnsbl.cgi

@@ -24 +24 @@
 print "Content-type: text/html\n\n";
 
-my $dbh = $dnsbl->connect;
+# default DB info - all other settings should be loaded from the DB.
+my $dbhost = "localhost";
+my $dbname = "dnsbl";
+my $dbuser = "dnsbl";
+my $dbpass = "spambgone";
+
+# Load a config ref containing DB host, name, user, and pass info based on
+# from the server name + full script web path.  This allows us to host
+# multiple instances without having to duplicate the code.
+# This file is a Perl fragment to be processed inline.
+my $cfgname = $ENV{SERVER_NAME}.$ENV{SCRIPT_NAME};
+$cfgname =~ s|[./-]|_|g;
+$cfgname =~ s|_dnsbl_cgi||;
+if (-e "/etc/dnsbl/$cfgname.conf") {
+  my $cfg = `cat /etc/dnsbl/$cfgname.conf`;
+  ($cfg) = ($cfg =~ /^(.+)$/s);         # avoid warnings, failures, and general nastiness with taint mode
+  eval $cfg;
+}
+
+my $dbh = $dnsbl->connect($dbhost, $dbname, $dbuser, $dbpass);
 
 my $page;
-my $templatedir = "templates";
+my $templatedir = $ENV{SCRIPT_FILENAME};
+$templatedir =~ s/dnsbl\.cgi//;
+$templatedir .= "templates";
+$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}) {
-  $page = HTML::Template->new(filename => "$templatedir/index.tmpl");
+  $page = HTML::Template->new(filename => "index.tmpl");
 } else {
-  $page = HTML::Template->new(filename => "$templatedir/$webvar{page}.tmpl");
-}
+  $page = HTML::Template->new(filename => "$webvar{page}.tmpl");
+}
+
+$page->param(pgtitle => $config{pgtitle}) if defined($config{pgtitle});
+$page->param(pgcomment => $config{pgcomment}) if defined($config{pgcomment});
 
 if ($webvar{page} eq 'report') {
@@ -92 +124 @@
   $page->param(browsebits => browse($dbh,$webvar{ip}));
 }
+
 print $page->output;