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/20 20:01:36 UTC
svn commit: rev 20167 - incubator/spamassassin/trunk/rules
Author: quinlan
Date: Thu May 20 11:01:35 2004
New Revision: 20167
Modified:
incubator/spamassassin/trunk/rules/70_testing.cf
Log:
add some T_MSGID_CAPS* variants (bug 3399)
remove T_HEXOCTDWORD* due to poor results (bug 3403)
Modified: incubator/spamassassin/trunk/rules/70_testing.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/70_testing.cf (original)
+++ incubator/spamassassin/trunk/rules/70_testing.cf Thu May 20 11:01:35 2004
@@ -269,15 +269,9 @@
describe T_CT_BOUND_DDNUM Content-Type header has boundary in ratware form
# bug 3399
-header T_MSGID_CAPS Message-ID =~ /<[A-Z]+\@[a-z]+\.[a-z]{2,4}>/
-header T_MSGID_CAPS2 Message-ID =~ /<[A-Z]+\@(?!mailcity\.com)[a-z]+\.[a-z]{2,4}>/
-header T_MSGID_CAPS3 Message-ID =~ /^\s*<?[A-Z]+\@(?!mailcity\.com)/
-
-# bug 3403: not decoded, as we're explicitly searching for the encoded
-# version catches all versions of IP obfuscation mentioned here:
-# http://www.pc-help.org/obscure.htm
-uri T_HEXOCTDWORD_U m{(?:h|%68|%48)(?:t|%74|%54)(?:t|%74|%54)(?:p|%70|%50)(?:s|%73|%53)?(?::|%3a)(?:/|%2f){0,2}(?:(?:(?!\@|%40|\?).)+(?:\@|%40))*(?!123\.456\.789\.(?:999|012)|(?:2[0-4][0-9]|25[0-5]|[01]?[0-9][0-9]?)(?:$|\.(?:2[0-4][0-9]|25[0-5]|[01]?[0-9][0-9]?)(?:$|\.(?:2[0-4][0-9]|25[0-5]|[01]?[0-9][0-9]?)(?:$|\.(?:2[0-4][0-9]|25[0-5]|[01]?[0-9][0-9]?)))))(?:(?:%3[0-9]|\d)+|(?:0|%30)(?:x|%[57]8)(?:%(?:3[0-9]|[46][1-6])|[0-9A-Fa-f])+|(?:0|%30)(?:%3[0-9]|[0-7])+)(?:(?:\.|%2e)(?:%3[0-9]|\d)+|(?:0|%30)(?:x|%[57]8)(?:%(?:3[0-9]|[46][1-6])|[0-9A-Fa-f])+|(?:0|%30)(?:%3[0-9]|[0-7])+){0,3}(?:[:\?;&/\\]|%3[abABfF]|%2[6fF]|%5[cC]|$)}i
-describe T_HEXOCTDWORD_U Uses an encoded IP address
-
-rawbody T_HEXOCTDWORD_R m{(?:h|%68|%48)(?:t|%74|%54)(?:t|%74|%54)(?:p|%70|%50)(?:s|%73|%53)?(?::|%3a)(?:/|%2f){0,2}(?:(?:(?!\@|%40|\?).)+(?:\@|%40))*(?!123\.456\.789\.(?:999|012)|(?:2[0-4][0-9]|25[0-5]|[01]?[0-9][0-9]?)(?:$|\.(?:2[0-4][0-9]|25[0-5]|[01]?[0-9][0-9]?)(?:$|\.(?:2[0-4][0-9]|25[0-5]|[01]?[0-9][0-9]?)(?:$|\.(?:2[0-4][0-9]|25[0-5]|[01]?[0-9][0-9]?)))))(?:(?:%3[0-9]|\d)+|(?:0|%30)(?:x|%[57]8)(?:%(?:3[0-9]|[46][1-6])|[0-9A-Fa-f])+|(?:0|%30)(?:%3[0-9]|[0-7])+)(?:(?:\.|%2e)(?:%3[0-9]|\d)+|(?:0|%30)(?:x|%[57]8)(?:%(?:3[0-9]|[46][1-6])|[0-9A-Fa-f])+|(?:0|%30)(?:%3[0-9]|[0-7])+){0,3}(?:[:\?;&/\\]|%3[abABfF]|%2[6fF]|%5[cC]|$)}i
-describe T_HEXOCTDWORD_R Uses an encoded IP address
+header T_MSGID_CAPS1 Message-ID =~ /<[A-Z]+\@[a-z]+\.[a-z]{2,4}>/
+header T_MSGID_CAPS2 Message-ID =~ /<[A-Z]+\@(?!mailcity\.com)[a-z]+\.[a-z]{2,4}>/
+header T_MSGID_CAPS3 Message-ID =~ /^\s*<?[A-Z]+\@(?!mailcity\.com)/
+header T_MSGID_CAPS4 MESSAGEID =~ /<[A-Z]+\@[a-z]+\.[a-z]{2,4}>/
+header T_MSGID_CAPS5 MESSAGEID =~ /<[A-Z]+\@(?!mailcity\.com)[a-z]+\.[a-z]{2,4}>/
+header T_MSGID_CAPS6 MESSAGEID =~ /^\s*<?[A-Z]+\@(?!mailcity\.com)/