source: trunk/dnsbl/delist-ip

Last change on this file was 67, checked in by Kris Deugau, 7 years ago

/trunk/dnsbl

Review and update copyright dates on DNSBL.pm, DNSBLweb.pm, browse.cgi,

delist-ip, dnsbl.cgi, and export-dnsbl. Also add a version requirement
on DNSBL.pm in any callers.

Update browse.cgi with limited search and some operational-sanity boundaries

instead of blindly barfing out the entire dataset, requiring code changes
to view only a subset of data.

  • Property svn:executable set to *
  • Property svn:keywords set to Date Rev Author Id
File size: 2.6 KB
RevLine 
[32]1#!/usr/bin/perl
2# Delist an IP
[40]3##
4# $Id: delist-ip 67 2018-01-09 23:12:13Z kdeugau $
[67]5# Copyright 2011, 2012, 2018 Kris Deugau <kdeugau@deepnet.cx>
[40]6#
7# This program is free software: you can redistribute it and/or modify
8# it under the terms of the GNU General Public License as published by
9# the Free Software Foundation, either version 3 of the License, or
10# (at your option) any later version.
11#
12# This program is distributed in the hope that it will be useful,
13# but WITHOUT ANY WARRANTY; without even the implied warranty of
14# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15# GNU General Public License for more details.
16#
17# You should have received a copy of the GNU General Public License
18# along with this program. If not, see <http://www.gnu.org/licenses/>.
19##
[32]20
21use strict;
22use warnings;
23use DBI;
24
[67]25use DNSBL 2.2;
[32]26
27my $dnsbl = new DNSBL;
28
29# default DB info - all other settings should be loaded from the DB.
30my $dbhost = "localhost";
31my $dbname = "dnsbl";
32my $dbuser = "dnsbl";
33my $dbpass = "spambgone";
34
35die "Usage: delist-ip <list> <IP>\n".
36 " <list> should be the DNSBL you want to remove the IP from\n"
37 if !$ARGV[1];
38my $cfgname = shift @ARGV;
39
40# Load a config ref containing DB host, name, user, and pass info based on
41# from the server name + full script web path. This allows us to host
42# multiple instances without having to duplicate the code.
43# This file is a Perl fragment to be processed inline.
44if (-e "/etc/dnsbl/$cfgname.conf") {
45 my $cfg = `cat /etc/dnsbl/$cfgname.conf`;
46 ($cfg) = ($cfg =~ /^(.+)$/s); # avoid warnings, failures, and general nastiness with taint mode
47 eval $cfg;
48}
49
50my $dbh = $dnsbl->connect($dbhost, $dbname, $dbuser, $dbpass);
51
52my %config;
53my $sth = $dbh->prepare("SELECT key,value FROM misc");
54$sth->execute;
55while (my ($key,$value) = $sth->fetchrow_array) {
56 $config{$key} = $value;
57}
58
59my $removeme = $ARGV[0];
60
[67]61$sth = $dbh->prepare("SELECT ip,count,s4list,added,exclude FROM iplist WHERE ip=?");
[32]62$sth->execute($removeme);
[67]63my ($ip,$count,$s4list,$added,$exclude) = $sth->fetchrow_array;
[32]64
65die "IP $removeme not found. Exiting.\n" if !$ip;
66
67# need to do the next in a single transaction
68local $dbh->{AutoCommit} = 0;
69local $dbh->{RaiseError} = 1;
70eval {
[67]71 $sth = $dbh->prepare("INSERT INTO waslisted (ip,count,s4list,origadded,exclude) VALUES (?,?,?,?,?)");
72 $sth->execute($ip,$count,$s4list,$added,$exclude);
[32]73 $sth = $dbh->prepare("DELETE FROM iplist WHERE ip=?");
74 $sth->execute($ip);
[40]75 $dbh->do("UPDATE blocks SET ipcount=ipcount-1 WHERE block >> ?", undef, ($ip));
[32]76 $dbh->commit;
77};
78if ($@) {
79 my $msg = $@;
80 eval { $dbh->rollback; };
81 print "Failed to move record from iplist to waslisted: $msg\n";
82}
Note: See TracBrowser for help on using the repository browser.