svn commit: rev 10438 - incubator/spamassassin/trunk/rules

[qu...@apache.org]

Author: quinlan
Date: Thu Apr 29 19:28:40 2004
New Revision: 10438

Modified:
   incubator/spamassassin/trunk/rules/70_testing.cf
Log:
revise RND rules


Modified: incubator/spamassassin/trunk/rules/70_testing.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/70_testing.cf	(original)
+++ incubator/spamassassin/trunk/rules/70_testing.cf	Thu Apr 29 19:28:40 2004
@@ -190,11 +190,6 @@
 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
 
-# a couple to try out
-header T_PC_CUR_DATE_TIME       ALL =~ /%CURRENT_DATE_TIME/
-header T_PC_RND_HEADER          ALL =~ /%RA?ND_[A-Z]/
-body T_PC_RND_BODY              /%RA?ND_[A-Z]/
-
 header T_X_MESSAGE_INFO         X-Message-Info =~ /\+/
 describe T_X_MESSAGE_INFO       Ratware signature (X-Message-Info)
 
@@ -204,42 +199,40 @@
 header T_ADVERT_CODE2	Subject =~ /\w.*\bA\s*D\s*V\b/
 
 # bug 3262
-body T_NO_COST                    /\bno (?:(?:extra|hidden) )?(?:cost|charge)\b/i
+body T_NO_COST			/\bno (?:(?:extra|hidden) )?(?:cost|charge)\b/i
 
 # bug 3268
 body T_REDIRECTOR       eval:check_for_http_redirector()
 describe T_REDIRECTOR	Message has HTTP redirector URI
 
-# bug 2539
-header  __RANDH_1   ALL =~ /[%\#\[\$]RANDOM/i
-header  __RANDH_1B  ALL =~ /[%\#\[\$]RANDOM_CHAR/i
-header  __RANDH_1C  ALL =~ /[%\#\[\$]RANDOM_DATE/i
-header  __RANDH_1D  ALL =~ /[%\#\[\$]RANDOM_LETTER/i
-header  __RANDH_1E  ALL =~ /[%\#\[\$]RANDOM_NUMBER/i
-header  __RANDH_1F  ALL =~ /[%\#\[\$]RANDOM_TEXT/
-header  __RANDH_1G  ALL =~ /[%\#\[\$]RANDOM_TIME/
-header  __RANDH_1H  ALL =~ /[%\#\[\$]RANDOM_WORD/
-header  __RANDH_1I  ALL =~ /[%\#\[\$]RANDOMIZE/
-
-rawbody __RANDR_1   /[%\#\[\$]RANDOM/i
-rawbody __RANDR_1B  /[%\#\[\$]RANDOM_CHAR/i
-rawbody __RANDR_1C  /[%\#\[\$]RANDOM_DATE/i
-rawbody __RANDR_1D  /[%\#\[\$]RANDOM_LETTER/i
-rawbody __RANDR_1E  /[%\#\[\$]RANDOM_NUMBER/i
-rawbody __RANDR_1F  /[%\#\[\$]RANDOM_TEXT/
-rawbody __RANDR_1G  /[%\#\[\$]RANDOM_TIME/
-rawbody __RANDR_1H  /[%\#\[\$]RANDOM_WORD/
-rawbody __RANDR_1I  /[%\#\[\$]RANDOMIZE/
-
-meta  T_SARE_RAND_1   (__RANDH_1  || __RANDR_1)
-meta  T_SARE_RAND_1B  (__RANDH_1B || __RANDR_1B)
-meta  T_SARE_RAND_1C  (__RANDH_1C || __RANDR_1C)
-meta  T_SARE_RAND_1D  (__RANDH_1D || __RANDR_1D)
-meta  T_SARE_RAND_1E  (__RANDH_1E || __RANDR_1E)
-meta  T_SARE_RAND_1F  (__RANDH_1F || __RANDR_1F)
-meta  T_SARE_RAND_1G  (__RANDH_1G || __RANDR_1G)
-meta  T_SARE_RAND_1H  (__RANDH_1H || __RANDR_1H)
-meta  T_SARE_RAND_1I  (__RANDH_1I || __RANDR_1I)
+# a couple to try out
+header T_PC_CUR_DATE_TIME_1	ALL =~ /%CURRENT_DATE_TIME/
+header T_PC_CUR_DATE_TIME_2	ALL =~ /[%\#\[\$]CURRENT_DATE_TIME/
+
+# RAND rules
+header T_PC_RND_HEADER_1	ALL =~ /%RA?ND_[A-Z]/
+body T_PC_RND_BODY_1		/%RA?ND_[A-Z]/
+
+header T_PC_RND_HEADER_2	ALL =~ /[%\#\[\$]RA?ND_[A-Z]/
+body T_PC_RND_BODY_2		/[%\#\[\$]RA?ND_[A-Z]/
+
+header T_PC_RND_HEADER_3	ALL =~ /%RA?ND(?:OM)?_[A-Z]/
+body T_PC_RND_BODY_3		/%RA?ND(?:OM)?_[A-Z]/
+
+header T_PC_RND_HEADER_4	ALL =~ /[%\#\[\$]RA?ND(?:OM)?_[A-Z]/
+body T_PC_RND_BODY_4		/[%\#\[\$]RA?ND(?:OM)?_[A-Z]/
+
+header T_PC_RND_HEADER_5	ALL =~ /%RA?ND_[A-Z]/i
+body T_PC_RND_BODY_5		/%RA?ND_[A-Z]/i
+
+header T_PC_RND_HEADER_6	ALL =~ /[%\#\[\$]RA?ND_[A-Z]/i
+body T_PC_RND_BODY_6		/[%\#\[\$]RA?ND_[A-Z]/i
+
+header T_PC_RND_HEADER_7	ALL =~ /%RA?ND(?:OM)?_[A-Z]/i
+body T_PC_RND_BODY_7		/%RA?ND(?:OM)?_[A-Z]/i
+
+header T_PC_RND_HEADER_8	ALL =~ /[%\#\[\$]RA?ND(?:OM)?_[A-Z]/i
+body T_PC_RND_BODY_8		/[%\#\[\$]RA?ND(?:OM)?_[A-Z]/i
 
 # Matt Kettler's antidrug.cf ruleset.  bug 3009
 # should probably move good ones from here directly into 20_drugs.cf?