| [32] | 1 | #!/usr/bin/perl | 
|---|
|  | 2 | # Delist an IP | 
|---|
| [40] | 3 | ## | 
|---|
|  | 4 | # $Id: delist-ip 92 2025-09-16 19:56:31Z kdeugau $ | 
|---|
| [73] | 5 | # Copyright 2011,2012,2018,2025 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 |  | 
|---|
|  | 21 | use strict; | 
|---|
|  | 22 | use warnings; | 
|---|
|  | 23 | use DBI; | 
|---|
|  | 24 |  | 
|---|
| [73] | 25 | # push "the directory the script is in" into @INC | 
|---|
|  | 26 | use FindBin; | 
|---|
|  | 27 | use lib "$FindBin::RealBin/"; | 
|---|
| [32] | 28 |  | 
|---|
| [73] | 29 | use DNSBL 3.0; | 
|---|
| [32] | 30 |  | 
|---|
|  | 31 | die "Usage: delist-ip <list> <IP>\n". | 
|---|
|  | 32 | "  <list> should be the DNSBL you want to remove the IP from\n" | 
|---|
|  | 33 | if !$ARGV[1]; | 
|---|
|  | 34 | my $cfgname = shift @ARGV; | 
|---|
|  | 35 |  | 
|---|
| [73] | 36 | my $dnsbl = new DNSBL (configfile => "/etc/dnsbl/$cfgname.conf"); | 
|---|
|  | 37 | $dnsbl->connect; | 
|---|
| [32] | 38 |  | 
|---|
|  | 39 | my $removeme = $ARGV[0]; | 
|---|
|  | 40 |  | 
|---|
| [67] | 41 | $sth = $dbh->prepare("SELECT ip,count,s4list,added,exclude FROM iplist WHERE ip=?"); | 
|---|
| [32] | 42 | $sth->execute($removeme); | 
|---|
| [67] | 43 | my ($ip,$count,$s4list,$added,$exclude) = $sth->fetchrow_array; | 
|---|
| [32] | 44 |  | 
|---|
|  | 45 | die "IP $removeme not found.  Exiting.\n" if !$ip; | 
|---|
|  | 46 |  | 
|---|
|  | 47 | # need to do the next in a single transaction | 
|---|
|  | 48 | local $dbh->{AutoCommit} = 0; | 
|---|
|  | 49 | local $dbh->{RaiseError} = 1; | 
|---|
|  | 50 | eval { | 
|---|
| [67] | 51 | $sth = $dbh->prepare("INSERT INTO waslisted (ip,count,s4list,origadded,exclude) VALUES (?,?,?,?,?)"); | 
|---|
|  | 52 | $sth->execute($ip,$count,$s4list,$added,$exclude); | 
|---|
| [32] | 53 | $sth = $dbh->prepare("DELETE FROM iplist WHERE ip=?"); | 
|---|
|  | 54 | $sth->execute($ip); | 
|---|
| [40] | 55 | $dbh->do("UPDATE blocks SET ipcount=ipcount-1 WHERE block >> ?", undef, ($ip)); | 
|---|
| [32] | 56 | $dbh->commit; | 
|---|
|  | 57 | }; | 
|---|
|  | 58 | if ($@) { | 
|---|
|  | 59 | my $msg = $@; | 
|---|
|  | 60 | eval { $dbh->rollback; }; | 
|---|
|  | 61 | print "Failed to move record from iplist to waslisted: $msg\n"; | 
|---|
|  | 62 | } | 
|---|