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/04/30 09:28:53 UTC
svn commit: rev 10447 - incubator/spamassassin/trunk/rules
Author: quinlan
Date: Fri Apr 30 00:28:52 2004
New Revision: 10447
Modified:
incubator/spamassassin/trunk/rules/20_ratware.cf
incubator/spamassassin/trunk/rules/20_uri_tests.cf
incubator/spamassassin/trunk/rules/70_testing.cf
Log:
promote T_X_MESSAGE_INFO to X_MESSAGE_INFO
promote T_REDIRECTOR to URI_REDIRECTOR
Modified: incubator/spamassassin/trunk/rules/20_ratware.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/20_ratware.cf (original)
+++ incubator/spamassassin/trunk/rules/20_ratware.cf Fri Apr 30 00:28:52 2004
@@ -274,3 +274,5 @@
header RCVD_BONUS_SPC_DATE Received =~ /with SMTP; \d\d \S\S\S /
describe RCVD_BONUS_SPC_DATE Bulk email fingerprint (bonus space) found
+header X_MESSAGE_INFO X-Message-Info =~ /\+/
+describe X_MESSAGE_INFO Bulk email fingerprint (X-Message-Info) found
Modified: incubator/spamassassin/trunk/rules/20_uri_tests.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/20_uri_tests.cf (original)
+++ incubator/spamassassin/trunk/rules/20_uri_tests.cf Fri Apr 30 00:28:52 2004
@@ -137,3 +137,7 @@
uri URI_LONG_HOSTNAME /^https?:\/\/[a-z0-9]{25,29}\./i
describe URI_LONG_HOSTNAME Contains a URI with a long hostname
+
+# really a URI rule
+header URI_REDIRECTOR eval:check_for_http_redirector()
+describe URI_REDIRECTOR Message has HTTP redirector URI
Modified: incubator/spamassassin/trunk/rules/70_testing.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/70_testing.cf (original)
+++ incubator/spamassassin/trunk/rules/70_testing.cf Fri Apr 30 00:28:52 2004
@@ -190,9 +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
-header T_X_MESSAGE_INFO X-Message-Info =~ /\+/
-describe T_X_MESSAGE_INFO Ratware signature (X-Message-Info)
-
# REIMPLEMENT: ADVERT_CODE tests.
header T_ADVERT_CODE Subject =~ /^[^0-9a-z]*adv(?:ert)?\b/i
# may need a negative lookahead between in front of first \b for "ADV."
@@ -200,10 +197,6 @@
# bug 3262
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
# a couple to try out
header T_PC_CUR_DATE_TIME_1 ALL =~ /%CURRENT_DATE_TIME/