source: trunk/dnsbl/delist-ip@ 73

Last change on this file since 73 was 73, checked in by Kris Deugau, 9 days ago

/trunk/dnsbl

The "begin the cleanup from production" cleanup commit

  • Move default DB connect info into DNSBL.pm
  • Move configuration fragment loading into DNSBL.pm
  • Change up configuration fragment to use %siteconfig instead of individual variables
  • Normalize parts of locating the module to at least a "good enough" level
  • if(0) out a chunk of export-dnsbl

Some things may be broken.

  • Property svn:executable set to *
  • Property svn:keywords set to Date Rev Author Id
File size: 2.1 KB
Line 
1#!/usr/bin/perl
2# Delist an IP
3##
4# $Id: delist-ip 73 2025-09-05 20:04:46Z kdeugau $
5# Copyright 2011,2012,2018,2025 Kris Deugau <kdeugau@deepnet.cx>
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##
20
21use strict;
22use warnings;
23use DBI;
24
25# push "the directory the script is in" into @INC
26use FindBin;
27use lib "$FindBin::RealBin/";
28
29use DNSBL 3.0;
30
31die "Usage: delist-ip <list> <IP>\n".
32 " <list> should be the DNSBL you want to remove the IP from\n"
33 if !$ARGV[1];
34my $cfgname = shift @ARGV;
35
36my $dnsbl = new DNSBL (configfile => "/etc/dnsbl/$cfgname.conf");
37$dnsbl->connect;
38
39my %config;
40my $sth = $dbh->prepare("SELECT key,value FROM misc");
41$sth->execute;
42while (my ($key,$value) = $sth->fetchrow_array) {
43 $config{$key} = $value;
44}
45
46my $removeme = $ARGV[0];
47
48$sth = $dbh->prepare("SELECT ip,count,s4list,added,exclude FROM iplist WHERE ip=?");
49$sth->execute($removeme);
50my ($ip,$count,$s4list,$added,$exclude) = $sth->fetchrow_array;
51
52die "IP $removeme not found. Exiting.\n" if !$ip;
53
54# need to do the next in a single transaction
55local $dbh->{AutoCommit} = 0;
56local $dbh->{RaiseError} = 1;
57eval {
58 $sth = $dbh->prepare("INSERT INTO waslisted (ip,count,s4list,origadded,exclude) VALUES (?,?,?,?,?)");
59 $sth->execute($ip,$count,$s4list,$added,$exclude);
60 $sth = $dbh->prepare("DELETE FROM iplist WHERE ip=?");
61 $sth->execute($ip);
62 $dbh->do("UPDATE blocks SET ipcount=ipcount-1 WHERE block >> ?", undef, ($ip));
63 $dbh->commit;
64};
65if ($@) {
66 my $msg = $@;
67 eval { $dbh->rollback; };
68 print "Failed to move record from iplist to waslisted: $msg\n";
69}
Note: See TracBrowser for help on using the repository browser.