Changeset 92


Ignore:
Timestamp:
09/16/25 15:56:31 (9 hours ago)
Author:
Kris Deugau
Message:

/trunk/dnsbl

Convert per-script %config to module-based loader stub in DNSBL::new()

Location:
trunk/dnsbl
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/dnsbl/DNSBL.pm

    r77 r92  
    206206  while (my ($masklen,$ipcount) = $sth->fetchrow_array) {
    207207    $autolist{$masklen} = $ipcount;
     208  }
     209  my $sth = $dbh->prepare("SELECT key,value FROM misc");
     210  $sth->execute;
     211  while (my ($key,$value) = $sth->fetchrow_array) {
     212    $self->{misc}{$key} = $value;
    208213  }
    209214  return $dbh;

  • trunk/dnsbl/browse.cgi

    r73 r92  
    6767$ENV{HTML_TEMPLATE_ROOT} = $templatedir;
    6868
    69 my %config;
    70 my $sth = $dbh->prepare("SELECT key,value FROM misc");
    71 $sth->execute;
    72 while (my ($key,$value) = $sth->fetchrow_array) {
    73   $config{$key} = $value;
    74 }
    75 
    7669# basic validation so we don't try to look up something ridiculous
    7770if ($webvar{block}) {
    … …  
    8376  my $template = HTML::Template->new(filename => "browse.tmpl");
    8477
    85   $template->param(pgtitle => $config{pgtitle}) if defined($config{pgtitle});
    86   $template->param(pgcomment => $config{pgcomment}) if defined($config{pgcomment});
     78  $template->param(pgtitle => $dnsbl->{misc}{pgtitle}) if defined($dnsbl->{misc}{pgtitle});
     79  $template->param(pgcomment => $dnsbl->{misc}{pgcomment}) if defined($dnsbl->{misc}{pgcomment});
    8780
    8881  my $out;
    … …  
    10194<html>
    10295<head>
    103 <title>$config{pgtitle}</title>
     96<title>$dnsbl->{misc}{pgtitle}</title>
    10497<body>
    105 $config{pgcomment}<br>
     98$dnsbl->{misc}{pgcomment}<br>
    10699);
    107100  if ($webvar{block}) {

  • trunk/dnsbl/delist-ip

    r73 r92  
    3737$dnsbl->connect;
    3838
    39 my %config;
    40 my $sth = $dbh->prepare("SELECT key,value FROM misc");
    41 $sth->execute;
    42 while (my ($key,$value) = $sth->fetchrow_array) {
    43   $config{$key} = $value;
    44 }
    45 
    4639my $removeme = $ARGV[0];
    4740

  • trunk/dnsbl/dnsbl.cgi

    r78 r92  
    7272$ENV{HTML_TEMPLATE_ROOT} = $templatedir;
    7373
    74 my %config;
    75 my $sth = $dbh->prepare("SELECT key,value FROM misc");
    76 $sth->execute;
    77 while (my ($key,$value) = $sth->fetchrow_array) {
    78   $config{$key} = $value;
    79 }
    80 
    8174# decide which page to spit out...
    8275if (!$webvar{page}) {
    … …  
    8679}
    8780
    88 $page->param(pgtitle => $config{pgtitle}) if defined($config{pgtitle});
    89 $page->param(pgcomment => $config{pgcomment}) if defined($config{pgcomment});
     81$page->param(pgtitle => $dnsbl->{misc}{pgtitle}) if defined($dnsbl->{misc}{pgtitle});
     82$page->param(pgcomment => $dnsbl->{misc}{pgcomment}) if defined($dnsbl->{misc}{pgcomment});
    9083
    9184if ($webvar{page} eq 'report') {

  • trunk/dnsbl/export-dnsbl

    r75 r92  
    3535$dnsbl->connect;
    3636
    37 my %config;
    38 my $sth = $dbh->prepare("SELECT key,value FROM misc");
    39 $sth->execute;
    40 while (my ($key,$value) = $sth->fetchrow_array) {
    41   $config{$key} = $value;
    42 }
    43 
    4437my %iplist;
    4538my $ipref = \%iplist;
    … …  
    5649if ($mode eq 'cidr') {
    5750  # SOA, NS records.  Maybe dnscache needs them?
    58   print "\$SOA 900 ".($config{blzone} ? $config{blzone} : 'company.dnsbl')." ".
    59         ($config{bladmin} ? $config{bladmin} : 'systems.company.com')." 0 1200 600 600 900\n".
     51  print "\$SOA 900 ".($dnsbl->{misc}{blzone} ? $dnsbl->{misc}{blzone} : 'company.dnsbl')." ".
     52        ($dnsbl->{misc}{bladmin} ? $dnsbl->{misc}{bladmin} : 'systems.company.com')." 0 1200 600 600 900\n".
    6053        "\$NS 3600 127.0.0.1\n".
    61         "\$TTL ".($config{ttl} ? $config{ttl} : '900')."\n";
     54        "\$TTL ".($dnsbl->{misc}{ttl} ? $dnsbl->{misc}{ttl} : '900')."\n";
    6255
    6356  # more or less raw CIDR block-and-IP info.  rbldnsd format for convenience.
    … …  
    8477    my $out = "$_:127.$entry:".
    8578        ($iplist{$_} & 2 ?
    86                 ($config{iplisted} ? $config{iplisted} : '$ relayed a reported spam') :
    87                 ($config{blocklisted} ? $config{blocklisted} : 'Netblock listed on one or more criteria')
     79                ($dnsbl->{misc}{iplisted} ? $dnsbl->{misc}{iplisted} : '$ relayed a reported spam') :
     80                ($dnsbl->{misc}{blocklisted} ? $dnsbl->{misc}{blocklisted} : 'Netblock listed on one or more criteria')
    8881        )."\n";
    8982    $out =~ s/:ENTITY:/$_/;
    … …  
    111104    my ($o1,$o2,$o3,$o4) = (/^(\d+)\.([\d*]+)(?:\.([\d*]+)(?:\.([\d*]+))?)?$/);
    112105    print "+".(defined($o4) ? "$o4." : '').(defined($o3) ? "$o3." : '').(defined($o2) ? "$o2." : '').
    113         "$o1.".($config{blzone} ? $config{blzone} : 'spamhosts.company.dnsbl').":127.$entry:".
    114         ($config{ttl} ? $config{ttl} : '900').":::\n";
     106        "$o1.".($dnsbl->{misc}{blzone} ? $dnsbl->{misc}{blzone} : 'spamhosts.company.dnsbl').":127.$entry:".
     107        ($dnsbl->{misc}{ttl} ? $dnsbl->{misc}{ttl} : '900')."::\n";
    115108  }
    116109}
Note: See TracChangeset for help on using the changeset viewer.