You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by qu...@apache.org on 2004/05/01 08:32:14 UTC
svn commit: rev 10475 - in incubator/spamassassin/trunk: lib/Mail/SpamAssassin rules
Author: quinlan
Date: Fri Apr 30 23:32:13 2004
New Revision: 10475
Modified:
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
incubator/spamassassin/trunk/rules/70_testing.cf
Log:
just wait for the results :-)
Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm Fri Apr 30 23:32:13 2004
@@ -623,7 +623,7 @@
return 0;
}
- my $rcvd = $self->{relays_trusted_str}.$self->{relays_untrusted_str};
+ my $rcvd = $self->{relays_trusted_str}."\n".$self->{relays_untrusted_str};
if ($rcvd =~ / rdns=\S*\b${domain} [^\]]*by=\S*\b${domain} /) {
$self->{from_domain_in_received}->{$domain} = 1;
@@ -3312,6 +3312,15 @@
}
}
return 0;
+}
+
+sub check_for_illegal_ip {
+ my ($self) = @_;
+
+ my $rcvd = $self->{relays_trusted_str}."\n".$self->{relays_untrusted_str};
+
+ # (note this might miss some hits if the Received.pm skips any invalid IPs)
+ return ($rcvd && $rcvd =~ /=(?:(?:[01257]|22[3-9]|23[0-9]|24[0-9]|25[0-5])\.\d+\.\d+\.\d+|127\.[1-9]\.\d+\.\d+|127\.0\.[1-9]\.\d+|127\.0\.0\.(?:\d\d+|[2-9]))\b/);
}
###########################################################################
Modified: incubator/spamassassin/trunk/rules/70_testing.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/70_testing.cf (original)
+++ incubator/spamassassin/trunk/rules/70_testing.cf Fri Apr 30 23:32:13 2004
@@ -79,8 +79,11 @@
header T_BAD_MOZILLA_VERSION User-Agent =~ /Mozilla\/5\.0\d\d/
describe T_BAD_MOZILLA_VERSION User-Agent claims to be Mozilla, but is malformed
-header T_RCVD_ILLEGAL_IP Received =~ /[\s\(\[\:\=](?:(?:[01257]|22[3-9]|23[0-9]|24[0-9]|25[0-5])\.\d+\.\d+\.\d+|127\.[1-9]\.\d+\.\d+|127\.0\.[1-9]\.\d+|127\.0\.0\.(?:\d\d+|[2-9]))\b/
-describe T_RCVD_ILLEGAL_IP Received contains illegal IP address
+header T_RCVD_ILLEGAL_IP_1 Received =~ /[\s\(\[\:\=](?:(?:[01257]|22[3-9]|23[0-9]|24[0-9]|25[0-5])\.\d+\.\d+\.\d+|127\.[1-9]\.\d+\.\d+|127\.0\.[1-9]\.\d+|127\.0\.0\.(?:\d\d+|[2-9]))\b/
+describe T_RCVD_ILLEGAL_IP_1 Received contains illegal IP address
+
+header T_RCVD_ILLEGAL_IP_2 eval:check_for_illegal_ip()
+describe T_RCVD_ILLEGAL_IP_2 Received contains illegal IP address
# REIMPLEMENT: ADVERT_CODE tests.
header T_ADVERT_CODE Subject =~ /^[^0-9a-z]*adv(?:ert)?\b/i