harden DXCIDR from router/proxy html measges

That end ip in the badip files because of some local network
problem. Examples include storing an HTML error message saying
something like "could not access this URL" in one or more of the
files instead of just leaving them empty.

diff --git a/Changes b/Changes
index 9a50216528927fcef327ba7afae3e2129dc6ad64..6639a0b9f15497d1e934f2c35101f814418062e7 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,7 @@
+01Feb23=======================================================================
+1. Harden DXCIDR (badip stuff) against format errors in downloaded badip files
+   downloaded using wget from the crontab. If these problems persist PLEASE 
+   TELL me and send me examples of the errors that end up in the badip files.
 30Jan23=======================================================================
 1. Add ip addresses to outgoing PC93 messages
 2. Get rid of (some of?) the uninitialised warnings 

diff --git a/cmd/set/badip.pl b/cmd/set/badip.pl
index 1ed8225adb050de98ac87e7d388860c8785125e6..bfbd89ce505900423736986a449b4d568ff02ce0 100644 (file)
--- a/cmd/set/badip.pl
+++ b/cmd/set/badip.pl
@@ -21,6 +21,10 @@ if ($in[0] =~ /^[_\d\w]+$/) {
 return (1, "set/badip: need [suffix (def: local])] IP, IP-IP or IP/24") unless @in;
 for my $ip (@in) {
        my $r;
+       unless (is_ipaddr($ip)) {
+               push @out, "set/badip: '$ip' is not an ip address, ignored";
+               next;
+       }
        eval{ $r = DXCIDR::find($ip); };
        return (1, "set/badip: $ip $@") if $@;
        if ($r) {
@@ -34,6 +38,10 @@ my $count = @added;
 my $list = join ' ', @in;
 DXCIDR::clean_prep();
 #$DB::single = 1;
-DXCIDR::append($suffix, @added);
-push @out, "set/badip: added $count entries to badip.$suffix : $list" if $count;
+if ($count) {
+       DXCIDR::append($suffix, @added);
+       push @out, "set/badip: added $count entries to badip.$suffix : '$list'";
+} else {
+       push @out, "set/badip: No valid IPs, not updating badip.$suffix with '$list'";
+}
 return (1, @out);

diff --git a/perl/DXCIDR.pm b/perl/DXCIDR.pm
index 821152209a73c6e7cd7353f3bf2b25e8de905d1c..b702d7b899c197f2647dd92da34d2efb3f502396 100644 (file)
--- a/perl/DXCIDR.pm
+++ b/perl/DXCIDR.pm
@@ -38,13 +38,25 @@ sub _read
        $fn .= ".$suffix" if $suffix;
        my $fh = IO::File->new($fn);
        my @out;
+       my $ecount;
+       my $line;
+       
 
        if ($fh) {
                while (<$fh>) {
                        chomp;
+                       ++$line;
                        next if /^\s*\#/;
                        next unless /[\.:]/;
                        next unless $_;
+                       unless (is_ipaddr($_)) {
+                               ++$ecount;
+                               LogDbg('err', qq(DXCIDR: $fn line $line: '$_' not an ip address));
+                               if ($ecount > 10) {
+                                       LogDbg('err', qq(DXCIDR: More than 10 errors in $fn at/after line $line: '$_' - INVALID INPUT FILE));
+                                       return ();
+                               }
+                       }
                        push @out, $_;
                }
                $fh->close;
@@ -58,6 +70,7 @@ sub _load
 {
        my $suffix = shift;
        my @in = _read($suffix);
+       return 0 unless @in;
        return scalar add(@in);
 }
 
@@ -112,6 +125,7 @@ sub add
        
        for my $ip (@_) {
                # protect against stupid or malicious
+               next unless is_ipaddr($ip);
                next if $ip =~ /^127\./;
                next if $ip =~ /^::1$/;
                if ($ip =~ /\./) {