Mailing List Archive

Author: felicity
Date: Tue Dec 5 10:46:00 2006
New Revision: 482735

URL: http://svn.apache.org/viewvc?view=rev&rev=482735
Log:
bug 4459: add another test for: allow 127.0.0.\d+, and look for other illegals

Modified:
spamassassin/rules/trunk/sandbox/felicity/70_other.cf
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayEval.pm

Modified: spamassassin/rules/trunk/sandbox/felicity/70_other.cf
URL: http://svn.apache.org/viewvc/spamassassin/rules/trunk/sandbox/felicity/70_other.cf?view=diff&rev=482735&r1=482734&r2=482735
==============================================================================
--- spamassassin/rules/trunk/sandbox/felicity/70_other.cf (original)
+++ spamassassin/rules/trunk/sandbox/felicity/70_other.cf Tue Dec 5 10:46:00 2006
@@ -320,4 +320,5 @@
# bug 4459: allow 127.0.0.\d+, and look for other illegals
ifplugin Mail::SpamAssassin::Plugin::RelayEval
header RCVD_ILLEGAL_IP2 eval:check_for_illegal_ip2()
+header RCVD_ILLEGAL_IP3 eval:check_for_illegal_ip3()
endif

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayEval.pm?view=diff&rev=482735&r1=482734&r2=482735
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayEval.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayEval.pm Tue Dec 5 10:46:00 2006
@@ -94,6 +94,19 @@
return 0;
}

+sub check_for_illegal_ip3 {
+ my ($self, $pms) = @_;
+
+ foreach my $rcvd ( @{$pms->{relays_untrusted}} ) {
+ # (note this might miss some hits if the Received.pm skips any invalid IPs)
+ foreach my $check ( $rcvd->{ip}, $rcvd->{by} ) {
+ return 1 if ($check =~ /^
+ (?:[01257]|(?!127.0.0.)127|22[3-9]|23[0-9]|24[0-9]|25[0-5])\.\d+\.\d+\.\d+
+ $/x);
+ }
+ }
+ return 0;
+}
sub check_for_illegal_ip2 {
my ($self, $pms) = @_;