You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2018/10/20 02:40:55 UTC
svn commit: r1844382 - in /spamassassin/trunk/rules: 20_head_tests.cf
20_ratware.cf
Author: hege
Date: Sat Oct 20 02:40:55 2018
New Revision: 1844382
URL: http://svn.apache.org/viewvc?rev=1844382&view=rev
Log:
Fix ALL and ALL:raw usages
Modified:
spamassassin/trunk/rules/20_head_tests.cf
spamassassin/trunk/rules/20_ratware.cf
Modified: spamassassin/trunk/rules/20_head_tests.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_head_tests.cf?rev=1844382&r1=1844381&r2=1844382&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_head_tests.cf (original)
+++ spamassassin/trunk/rules/20_head_tests.cf Sat Oct 20 02:40:55 2018
@@ -123,7 +123,7 @@ describe FORGED_MSGID_YAHOO Message-ID i
###########################################################################
-header __MSGID_BEFORE_RECEIVED ALL:raw =~ /^Message-Id:.*^Received:/msi
+header __MSGID_BEFORE_RECEIVED ALL =~ /^Message-Id:.*?^Received:/msi
header __MSGID_BEFORE_OKAY Message-Id =~ /\@[a-z0-9.-]+\.(?:yahoo|wanadoo)(?:\.[a-z]{2,3}){1,2}>/
meta MSGID_FROM_MTA_HEADER (__MSGID_BEFORE_RECEIVED && !__MSGID_BEFORE_OKAY && !__FROM_HOTMAIL_COM)
@@ -166,10 +166,10 @@ test INVALID_DATE ok Thurs, 31 Jul
header INVALID_DATE_TZ_ABSURD Date =~ /[-+](?!(?:0\d|1[0-4])(?:[03]0|[14]5))\d{4}$/
describe INVALID_DATE_TZ_ABSURD Invalid Date: header (timezone does not exist)
-header INVALID_TZ_CST ALL:raw =~ /[+-]\d\d[30]0(?<!-0600|-0500|\+0800|\+0930|\+1030)\s+(?:\bCST\b|\(CST\))/
+header INVALID_TZ_CST ALL =~ /[+-]\d\d[30]0(?<!-0600|-0500|\+0800|\+0930|\+1030)\s+(?:\bCST\b|\(CST\))/
describe INVALID_TZ_CST Invalid date in header (wrong CST timezone)
-header INVALID_TZ_EST ALL:raw =~ /[+-]\d\d[30]0(?<!-0500|-0300|\+1000|\+1100)\s+(?:\bEST\b|\(EST\))/
+header INVALID_TZ_EST ALL =~ /[+-]\d\d[30]0(?<!-0500|-0300|\+1000|\+1100)\s+(?:\bEST\b|\(EST\))/
describe INVALID_TZ_EST Invalid date in header (wrong EST timezone)
@@ -404,7 +404,7 @@ describe FROM_LOCAL_DIGITS From: localpa
header __TOCC_EXISTS exists:ToCc
-header X_PRIORITY_CC ALL:raw =~ /^X-Priority:[^\n]{0,80}^Cc:/msi
+header X_PRIORITY_CC ALL =~ /^X-Priority:[^\n]{0,80}^Cc:/msi
describe X_PRIORITY_CC Cc: after X-Priority: (bulk email fingerprint)
# catch non-RFC2047 compliant messages
Modified: spamassassin/trunk/rules/20_ratware.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_ratware.cf?rev=1844382&r1=1844381&r2=1844382&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_ratware.cf (original)
+++ spamassassin/trunk/rules/20_ratware.cf Sat Oct 20 02:40:55 2018
@@ -264,7 +264,7 @@ describe X_MESSAGE_INFO Bulk email fing
# case-sensitive rule
# only significant rules with no FPs, hit recently, on 2+ corpuses
-header HEADER_SPAM ALL:raw =~ /^(Alternate-Recipient|Antivirus|Approved|Delivery-Notification|Disclose-Recipients|Error-path|Language|Location|Mime-Subversion|Newsletter-ID|PID|Rot|UID|X-BounceTrace|X-CS-IP|X-Company-Address|X-Company-City|X-Company-Country|X-Company-State|X-Company-Zip|X-E(?:[Mm]ail)?|X-Encoding|X-Originating-Company|X-RMD-Text|X-SG4|X-SP-Track-ID|X-Webmail-Time|X-bounce-to):/m
+header HEADER_SPAM ALL =~ /^(Alternate-Recipient|Antivirus|Approved|Delivery-Notification|Disclose-Recipients|Error-path|Language|Location|Mime-Subversion|Newsletter-ID|PID|Rot|UID|X-BounceTrace|X-CS-IP|X-Company-Address|X-Company-City|X-Company-Country|X-Company-State|X-Company-Zip|X-E(?:[Mm]ail)?|X-Encoding|X-Originating-Company|X-RMD-Text|X-SG4|X-SP-Track-ID|X-Webmail-Time|X-bounce-to):/m
describe HEADER_SPAM Bulk email fingerprint (header-based) found
header RATWARE_RCVD_PF Received =~ / \(Postfix\) with ESMTP id [^;]+\; \S+ \d+ \S+ \d+ \d+:\d+:\d+ \S+$/s