You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by kh...@apache.org on 2010/01/27 01:00:22 UTC
svn commit: r903506 -
/spamassassin/trunk/rulesrc/sandbox/khopesh/20_bug_6299.cf
Author: khopesh
Date: Wed Jan 27 00:00:21 2010
New Revision: 903506
URL: http://svn.apache.org/viewvc?rev=903506&view=rev
Log:
forgot 100/8, added last-external check, fixed bug in *INVALID rule
Modified:
spamassassin/trunk/rulesrc/sandbox/khopesh/20_bug_6299.cf
Modified: spamassassin/trunk/rulesrc/sandbox/khopesh/20_bug_6299.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/khopesh/20_bug_6299.cf?rev=903506&r1=903505&r2=903506&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/khopesh/20_bug_6299.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/khopesh/20_bug_6299.cf Wed Jan 27 00:00:21 2010
@@ -1,8 +1,9 @@
# includes updates through 2010-01-19 (as last referenced 2010-01-21)
# via http://www.iana.org/assignments/ipv4-address-space/
# updates itemized by date at http://www.cymru.com/Documents/bogon-list.html
-header T_KHOP_RCVD_ILLEGAL_IP X-Spam-Relays-Untrusted =~ / (?:by|ip)=(?:[05]|14|23|3[1679]|4[29]|50|1(?:0[1234567]|7[679]|8[15])|22[3-9]|2[3-9]\d|\d{4,}|[3-9]\d\d)\.\d+\.\d+\.\d+ /
+header T_KHOP_RCVD_ILLEGAL_IP X-Spam-Relays-Untrusted =~ / (?:by|ip)=(?:[05]|14|23|3[1679]|4[29]|50|1(?:0[0-7]|7[679]|8[15])|2(?:2[3-9]|[3-9]\d)|\d{4,}|[3-9]\d\d)\.\d+\.\d+\.\d+ /
describe T_KHOP_RCVD_ILLEGAL_IP Received: contains reserved or unallocated IP
+header T_KHOP_RCVD_ILLEGAL_IP_LE X-Spam-Relays-Untrusted =~ /^[^\]]+ (?:by|ip)=(?:[05]|14|23|3[1679]|4[29]|50|1(?:0[0-7]|7[679]|8[15])|2(?:2[3-9]|[3-5]\d)|\d{4,}|[3-9]\d\d)\.\d+\.\d+\.\d+ /
# TEST-NET addresses are for documentation and examples only
header RCVD_TEST_NET X-Spam-Relays-Untrusted =~ / (?:by|ip)=(?:192\.0\.2|198\.51\.100|203\.0\.113)\.\d+ /
@@ -16,6 +17,6 @@
describe RCVD_LINK_LOCAL Received: uses link-local IP, violating RFC 3927
# NOTE, THIS NEEDS IPv6 HELP
-header T_RCVD_INVALID_IP X-Spam-Relays-Untrusted =~ / (?:by|ip)=(?!(?:(?:\.(?:1?\d?\d|2(?:[0-4]\d|5[0-4])))\.(?:1?\d?\d|2(?:[0-4]\d|5[0-4]))){3} )/
+header T_RCVD_INVALID_IP X-Spam-Relays-Untrusted =~ / (?:by|ip)=(?!(?:(?:1?\d?\d|2(?:[0-4]\d|5[0-4])))(\.(?:1?\d?\d|2(?:[0-4]\d|5[0-4]))){3} )\d/
describe T_RCVD_INVALID_IP Received: contains an invalidly formatted IP