You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by ma...@apache.org on 2009/06/06 01:48:20 UTC

svn commit: r782170 - in /spamassassin/rules/trunk/sandbox/maddoc: 99_ach_rules.cf 99_doc_test.cf

Author: maddoc
Date: Fri Jun  5 23:48:20 2009
New Revision: 782170

URL: http://svn.apache.org/viewvc?rev=782170&view=rev
Log:
Doc Testing Rules

Removed:
    spamassassin/rules/trunk/sandbox/maddoc/99_ach_rules.cf
Modified:
    spamassassin/rules/trunk/sandbox/maddoc/99_doc_test.cf

Modified: spamassassin/rules/trunk/sandbox/maddoc/99_doc_test.cf
URL: http://svn.apache.org/viewvc/spamassassin/rules/trunk/sandbox/maddoc/99_doc_test.cf?rev=782170&r1=782169&r2=782170&view=diff
==============================================================================
--- spamassassin/rules/trunk/sandbox/maddoc/99_doc_test.cf (original)
+++ spamassassin/rules/trunk/sandbox/maddoc/99_doc_test.cf Fri Jun  5 23:48:20 2009
@@ -82,23 +82,17 @@
 meta	FSL_FREEMAIL_2 (__HAS_REPLY_TO && __REPLY_FREEMAIL && __FROM_FREEMAIL)
 score	FSL_FREEMAIL_2 0.001
 
-header	FSL_HELO_BARE_IP_1	X-Spam-Relays-Untrusted =~ /^[^\]]+ helo=\d+\.\d+\.\d+\.\d+ /i
-score	FSL_HELO_BARE_IP_1	0.001
+header  FSL_HELO_BARE_IP_1      X-Spam-Relays-External =~ /^[^\]]+ helo=\d+\.\d+\.\d+\.\d+ /i
+score   FSL_HELO_BARE_IP_1      0.001
 
-header  FSL_HELO_BARE_IP_2      X-Spam-Relays-Trusted =~ /^[^\]]+ helo=\d+\.\d+\.\d+\.\d+ /i
-score   FSL_HELO_BARE_IP_2      0.001
+header	FSL_HELO_BARE_IP_2	X-Spam-Relays-External =~ /\bhelo=\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b/i
+score	FSL_HELO_BARE_IP_2	0.001
 
-header  FSL_HELO_BARE_IP_3      X-Spam-Relays-External =~ /^[^\]]+ helo=\d+\.\d+\.\d+\.\d+ /i
-score   FSL_HELO_BARE_IP_3      0.001
+header  FSL_HELO_NON_FQDN_1     X-Spam-Relays-External =~ /^[^\]]+ helo=[a-zA-Z0-9-_]+ /i
+score   FSL_HELO_NON_FQDN_1     0.001
 
-header	FSL_HELO_NON_FQDN_1	X-Spam-Relays-Untrusted =~ /^[^\]]+ helo=[a-zA-Z0-9-_]+ /i
-score	FSL_HELO_NON_FQDN_1	0.001
-
-header  FSL_HELO_NON_FQDN_2     X-Spam-Relays-Trusted =~ /^[^\]]+ helo=[a-zA-Z0-9-_]+ /i
-score   FSL_HELO_NON_FQDN_2     0.001
-
-header  FSL_HELO_NON_FQDN_3     X-Spam-Relays-External =~ /^[^\]]+ helo=[a-zA-Z0-9-_]+ /i
-score   FSL_HELO_NON_FQDN_3     0.001
+header	FSL_HELO_NON_FQDN_2	X-Spam-Relays-External =~ /\bhelo=[a-zA-Z0-9-_]+\b/i
+score	FSL_HELO_NON_FQDN_2	0.001
 
 header	FSL_FAKE_HOTMAIL_RVCD	X-Spam-Relays-External =~ /mx[1234]\.hotmail\.com/
 score	FSL_FAKE_HOTMAIL_RCVD	0.001
@@ -106,8 +100,37 @@
 header	FSL_FAKE_YAHOO_RCVD	X-Spam-Relays-External =~ /mx\.mail\.yahoo.com/
 score   FSL_FAKE_YAHOO_RCVD	0.001
 
-uri	FSL_SPAMWARE_STRING_1	/{\S+}/
+header	FSL_FAKE_GMAIL_RCVD	X-Spam-Relays-External =~ /gmail-smtp-in\.l\.google\.com/
+score	FSL_FAKE_GMAIL_RCVD	0.001
+
+uri	FSL_SPAMWARE_STRING_1	/\{\S+\}/
 score	FSL_SPAMWARE_STRING_1	5.0
 
 header	FSL_RCVD_USER		Received =~ /\bUser\b/i
 score   FSL_RCVD_USER		0.001
+
+header	FSL_HELO_LITERAL	X-Spam-Relays-External =~ /\bhelo=\[\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\]\b/i
+score	FSL_HELO_LITERAL	0.001
+
+header	FSL_HELO_UNKNOWN	X-Spam-Relays-External =~ /\bhelo=unkown\b/i
+score	FSL_HELO_UNKNOWN	0.001
+
+header	FSL_HELO_HOME		X-Spam-Relays-External =~ /\bhelo=\S+\.home\b/i
+score	FSL_HELO_HOME		0.001
+
+header	FSL_HELO_SETUP		X-Spam-Relays-External =~ /\bhelo=\S+\.setup\b/i
+score	FSL_HELO_SETUP		0.001
+
+header	FSL_HELO_FIREWALL	X-Spam-Relays-External =~ /\bhelo=\S+\.firewall\b/i
+score	FSL_HELO_FIREWALL	0.001
+
+header	FSL_HELO_DEVICE		X-Spam-Relays-External =~ /\bhelo=(?:(?:dsl)?device|speedtouch)\.lan\b/i
+score	FSL_HELO_DEVICE		0.001
+
+header	FSL_HELO_FAKE		X-Spam-Relays-External =~ /\bhelo=(?:yandex.ru|(?:hotmail|gmail|google|yahoo|msn|microsoft)\.c
+om)\b/i
+score	FSL_HELO_FAKE		0.001
+
+# Testing
+header	FSL_FAKE_RCVD		Received =~ /^from \S+ by \S+; \S+, \d+ \S+ \d{4} \d+:\d+:\d+ \+\d+$/
+score	FSL_FAKE_RCVD		0.001