svn commit: r149186 - in spamassassin/trunk/rules: 20_ratware.cf 20_uri_tests.cf 70_testing.cf

[qu...@apache.org]

Author: quinlan
Date: Sun Jan 30 15:51:55 2005
New Revision: 149186

URL: http://svn.apache.org/viewcvs?view=rev&rev=149186
Log:
bug 2513: Reply-To: rules for suspicious quotes
bug 3896: promote last URI test

Modified:
    spamassassin/trunk/rules/20_ratware.cf
    spamassassin/trunk/rules/20_uri_tests.cf
    spamassassin/trunk/rules/70_testing.cf

Modified: spamassassin/trunk/rules/20_ratware.cf
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/20_ratware.cf?view=diff&r1=149185&r2=149186
==============================================================================
--- spamassassin/trunk/rules/20_ratware.cf (original)
+++ spamassassin/trunk/rules/20_ratware.cf Sun Jan 30 15:51:55 2005
@@ -140,6 +140,28 @@
 meta FORGED_THEBAT_HTML		(__THEBAT_MUA_V1 && MIME_HTML_ONLY)
 describe FORGED_THEBAT_HTML	The Bat! can't send HTML message only
 
+# bug 2513
+header __REPTO_OVERQUOTE	Reply-To =~ /"[\w. -]+"\s*\</
+meta REPTO_OVERQUOTE_THEBAT	__REPTO_OVERQUOTE && __THEBAT_MUA
+describe REPTO_OVERQUOTE_THEBAT	The Bat! doesn't do quoting like this
+
+# bug 2513
+header __REPTO_QUOTE		Reply-To =~ /".*"\s*\</
+meta REPTO_QUOTE_AOL		__REPTO_QUOTE && __AOL_MUA
+describe REPTO_QUOTE_AOL	AOL doesn't do quoting like this
+
+meta REPTO_QUOTE_IMS		__REPTO_QUOTE && __IMS_MUA
+describe REPTO_QUOTE_IMS	IMS doesn't do quoting like this
+
+meta REPTO_QUOTE_MSN		__REPTO_QUOTE && (__FROM_MSN_COM || __AT_MSN_MSGID)
+describe REPTO_QUOTE_MSN	MSN doesn't do quoting like this
+
+meta REPTO_QUOTE_QUALCOMM	__REPTO_QUOTE && __ANY_QUALCOMM_MUA
+describe REPTO_QUOTE_QUALCOMM	Qualcomm/Eudora doesn't do quoting like this
+
+meta REPTO_QUOTE_YAHOO		__REPTO_QUOTE && (__FROM_YAHOO_COM || __AT_YAHOO_MSGID)
+describe REPTO_QUOTE_YAHOO	Yahoo! doesn't do quoting like this
+
 # bug 1561
 # stronger version of USER_AGENT_APPLEMAIL
 # Apple Mail doesn't send text/html at all (unless it's an attachment)

Modified: spamassassin/trunk/rules/20_uri_tests.cf
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/20_uri_tests.cf?view=diff&r1=149185&r2=149186
==============================================================================
--- spamassassin/trunk/rules/20_uri_tests.cf (original)
+++ spamassassin/trunk/rules/20_uri_tests.cf Sun Jan 30 15:51:55 2005
@@ -155,3 +155,6 @@
 
 uri URI_NO_WWW_BIZ_CGI	/^(?:https?:\/\/)?[^\/]+(?<!\/www)\.[^.]{7,}\.biz\/(?=\S{15,})\S*\?/i
 describe URI_NO_WWW_BIZ_CGI	CGI in .biz TLD other than third-level "www"
+
+uri URI_NO_WWW_ANY_CGI	/^(?:https?:\/\/)?[^\/]+(?<!\/www)\.[^.]{3,}\.[^.]{3,}\.(?!biz|info)[a-z]{2,4}\/\?\S{14,}/i
+describe URI_NO_WWW_ANY_CGI	CGI with long hostname other fourth-level "www"

Modified: spamassassin/trunk/rules/70_testing.cf
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/70_testing.cf?view=diff&r1=149185&r2=149186
==============================================================================
--- spamassassin/trunk/rules/70_testing.cf (original)
+++ spamassassin/trunk/rules/70_testing.cf Sun Jan 30 15:51:55 2005
@@ -265,33 +265,6 @@
 meta T_PRIORITY_NO_NAME_BOTH_REF	((__HAS_X_PRIORITY && __HAS_MSMAIL_PRI) && !__HAS_X_MAILER && !__IS_EXCH && !__USER_AGENT && !__HAS_REFERENCES)
 meta T_PRIORITY_NO_NAME_ONE_REF		((__HAS_X_PRIORITY + __HAS_MSMAIL_PRI == 1) && !__HAS_X_MAILER && !__IS_EXCH && !__USER_AGENT && !__HAS_REFERENCES)
 
-# bug 2513
-# try per-MUA rules
-header __REPTO_OVERQUOTE		Reply-To =~ /"[\w. -]+"\s*\</
-meta T_REPTO_OVERQUOTE_THEBAT		__REPTO_OVERQUOTE && __THEBAT_MUA
-#
-header __REPTO_QUOTE			Reply-To =~ /".*"\s*\</
-meta T_REPTO_QUOTE_AOL			__REPTO_QUOTE && __AOL_MUA
-meta T_REPTO_QUOTE_IMS			__REPTO_QUOTE && __IMS_MUA
-meta T_REPTO_QUOTE_MSN1			__REPTO_QUOTE && __FROM_MSN_COM
-meta T_REPTO_QUOTE_MSN2			__REPTO_QUOTE && __AT_MSN_MSGID
-meta T_REPTO_QUOTE_MSN3			__REPTO_QUOTE && (__FROM_MSN_COM || __AT_MSN_MSGID)
-meta T_REPTO_QUOTE_QUALCOMM		__REPTO_QUOTE && __ANY_QUALCOMM_MUA
-meta T_REPTO_QUOTE_THEBAT		__REPTO_QUOTE && __THEBAT_MUA
-meta T_REPTO_QUOTE_YAHOO1		__REPTO_QUOTE && __FROM_YAHOO_COM
-meta T_REPTO_QUOTE_YAHOO2		__REPTO_QUOTE && __AT_YAHOO_MSGID
-meta T_REPTO_QUOTE_YAHOO3		__REPTO_QUOTE && (__FROM_YAHOO_COM || __AT_YAHOO_MSGID)
-
-########################################################################
-
-# bug 3896: URIs in various TLDs, other than 3rd level www
-# baseline
-uri T_URI_NO_WWW_ANY_CGI	/^(?:https?:\/\/)?[^\/]+(?<!\/www)\.[^.]{7,}\.[^.]{7,}\.(?!biz|info)[a-z]{2,4}\/\?\S{14,}/i
-# fourth-level not starting with www, various lengths
-uri T_URI_NO_WWW_ANY_CGI_3	/^(?:https?:\/\/)?[^\/]+(?<!\/www)\.[^.]{3,}\.[^.]{3,}\.(?!biz|info)[a-z]{2,4}\/\?\S{14,}/i
-uri T_URI_NO_WWW_ANY_CGI_5	/^(?:https?:\/\/)?[^\/]+(?<!\/www)\.[^.]{5,}\.[^.]{5,}\.(?!biz|info)[a-z]{2,4}\/\?\S{14,}/i
-uri T_URI_NO_WWW_ANY_CGI_7	/^(?:https?:\/\/)?[^\/]+(?<!\/www)\.[^.]{7,}\.[^.]{7,}\.(?!biz|info)[a-z]{2,4}\/\?\S{14,}/i
-
 ########################################################################
 
 # remove evals if these aren't promoted
@@ -303,3 +276,5 @@
 header __NO_RCVD        exists:Received
 meta T_NO_RCVD        (!__NO_RCVD)
 
+uri T_SCHEME_MIXED_CASE_1	/^(?![a-z]{3,6}:)[A-Za-z]{3,6}:/
+uri T_SCHEME_MIXED_CASE_2	/^(?![a-z]{3,6}:|[A-Z]{3,6})[A-Za-z]{3,6}:/