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 2019/08/01 15:37:50 UTC
svn commit: r1864160 - in /spamassassin/trunk/rulesrc/sandbox:
fredt/99_zFVGT_FakeReply.cf jhardin/20_misc_testing.cf jm/20_basic.cf
Author: hege
Date: Thu Aug 1 15:37:49 2019
New Revision: 1864160
URL: http://svn.apache.org/viewvc?rev=1864160&view=rev
Log:
Bug 7580 - Proposal: Clean up some 'merged duplicates' rules
Modified:
spamassassin/trunk/rulesrc/sandbox/fredt/99_zFVGT_FakeReply.cf
spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf
spamassassin/trunk/rulesrc/sandbox/jm/20_basic.cf
Modified: spamassassin/trunk/rulesrc/sandbox/fredt/99_zFVGT_FakeReply.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/fredt/99_zFVGT_FakeReply.cf?rev=1864160&r1=1864159&r2=1864160&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/fredt/99_zFVGT_FakeReply.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/fredt/99_zFVGT_FakeReply.cf Thu Aug 1 15:37:49 2019
@@ -15,13 +15,12 @@ header __XM_FORTE X-Mailer =~ /^Forte
header __XM_MHE X-Mailer =~ /^mh-e \d/
header __XM_SQRLMAIL X-Mailer =~ /^SquirrelMail/
header __XM_SYLPHEED X-Mailer =~ /^Sylpheed/
-header __XM_THEBAT X-Mailer =~ /^The Bat!/
header __XM_VM X-Mailer =~ /^VM \d/
header __XM_XIMEVOL X-Mailer =~ /^Ximian Evolution/
header __UA_KMAIL User-Agent =~ /^KMail/
header __UA_MOZ5 User-Agent =~ /^Mozilla\/5/
header __UA_OPERA7 User-Agent =~ /^Opera7/
-meta __BOTH_INR_AND_REF (__XM_BALSA || __XM_CALYPSO || __XM_FORTE || __XM_MHE || __XM_SQRLMAIL || __XM_SYLPHEED || __XM_THEBAT || __XM_VM || __XM_XIMEVOL || __UA_KMAIL || __UA_MOZ5 || __UA_OPERA7)
+meta __BOTH_INR_AND_REF (__XM_BALSA || __XM_CALYPSO || __XM_FORTE || __XM_MHE || __XM_SQRLMAIL || __XM_SYLPHEED || __THEBAT_MUA || __XM_VM || __XM_XIMEVOL || __UA_KMAIL || __UA_MOZ5 || __UA_OPERA7)
meta NICE_REPLY_A (__SUBJ_RE && !__MISSING_REPLY && !__MISSING_REF && __BOTH_INR_AND_REF)
describe NICE_REPLY_A Looks like a legit relpy (A)
Modified: spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf?rev=1864160&r1=1864159&r2=1864160&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf Thu Aug 1 15:37:49 2019
@@ -231,7 +231,7 @@ describe FROM_MISSP_TO_UNDISC Fro
# meta __FROM_MISSP_DKIM 0
#endif
-meta __FROM_MISSP_REPLYTO __FROM_RUNON && __REPLYTO_EXISTS
+meta __FROM_MISSP_REPLYTO __FROM_RUNON && __HAS_REPLY_TO
meta FROM_MISSP_REPLYTO __FROM_MISSP_REPLYTO && !__NOT_SPOOFED && !__RCD_RDNS_MTA_MESSY && !__TO___LOWER && !__COMMENT_EXISTS && !__UNSUB_LINK && !__MIME_QP && !__CTYPE_MULTIPART_ALT && !__JM_REACTOR_DATE && !__PLING_QUERY
describe FROM_MISSP_REPLYTO From misspaced, has Reply-To
score FROM_MISSP_REPLYTO 2.500 # limit
@@ -1191,7 +1191,7 @@ score SUBJ_ATTENTION 0.500 #
header __IRS_FM_NAME From:name =~ /internal\srevenue\sservice/i
header __IRS_FM_DOM From:addr =~ /\birs\.gov$/
header __IRS_RCVD_DOM X-Spam-Relays-External =~ / rdns=\S+\birs\.gov /
-meta __IRS_SPOOF (__IRS_FM_NAME || __IRS_FM_DOM) && !__IRS_RCVD_DOM && __REPLYTO_EXISTS
+meta __IRS_SPOOF (__IRS_FM_NAME || __IRS_FM_DOM) && !__IRS_RCVD_DOM && __HAS_REPLY_TO
meta IRS_SPOOF __IRS_SPOOF
describe IRS_SPOOF Claims to be IRS, but not from IRS domain
score IRS_SPOOF 2.00 # limit
@@ -1202,7 +1202,7 @@ header __FBI_FM_DOM From:ad
header __FBI_RCVD_DOM X-Spam-Relays-External =~ / rdns=\S+\bfbi\.gov /
body __FBI_BODY_SHOUT_1 /^FEDERAL BUREAU OF INVESTIGATIONS?\b/
rawbody __FBI_BODY_SHOUT_2 /^FEDERAL BUREAU OF INVESTIGATIONS?\b/m
-meta __FBI_SPOOF (__FBI_FM_NAME || __FBI_FM_DOM || __FBI_BODY_SHOUT_1 || __FBI_BODY_SHOUT_2) && !__FBI_RCVD_DOM && __REPLYTO_EXISTS
+meta __FBI_SPOOF (__FBI_FM_NAME || __FBI_FM_DOM || __FBI_BODY_SHOUT_1 || __FBI_BODY_SHOUT_2) && !__FBI_RCVD_DOM && __HAS_REPLY_TO
meta FBI_SPOOF __FBI_SPOOF
describe FBI_SPOOF Claims to be FBI, but not from FBI domain
score FBI_SPOOF 2.00 # limit
@@ -2315,7 +2315,7 @@ tflags BOGUS_MSM_HDRS
#meta __BOGUS_MSM_PRIO __HAS_MSMAIL_PRI && __HDR_ORDER_FTSDMCXXXX
#meta __BOGUS_MSM_PRIO_MINFP __BOGUS_MSM_PRIO && !__BOGUS_MSM_HDRS && !__MSGID_NOFQDN2 && !__ANY_OUTLOOK_MUA && !__RCD_RDNS_MAIL_MESSY
-meta __MSM_PRIO_REPTO __HAS_MSMAIL_PRI && __REPLYTO_EXISTS && __SUBJ_SHORT
+meta __MSM_PRIO_REPTO __HAS_MSMAIL_PRI && __HAS_REPLY_TO && __SUBJ_SHORT
meta MSM_PRIO_REPTO __MSM_PRIO_REPTO && !__ENV_AND_HDR_FROM_MATCH
describe MSM_PRIO_REPTO MSMail priority header + Reply-to + short subject
score MSM_PRIO_REPTO 2.500 # limit
Modified: spamassassin/trunk/rulesrc/sandbox/jm/20_basic.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/jm/20_basic.cf?rev=1864160&r1=1864159&r2=1864160&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/jm/20_basic.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/jm/20_basic.cf Thu Aug 1 15:37:49 2019
@@ -302,8 +302,7 @@ describe JM_REACTOR_MAILER Header patter
# 'Just got a report about a false negative, which was caught by
# ACommercialSpamFilter by using a rule which had high "points" given to the
# mail because it has contained a reply-to but neither To nor Cc.'
-header __REPLYTO_EXISTS exists:Reply-To
-meta REPLYTO_WITHOUT_TO_CC (__REPLYTO_EXISTS && !__TOCC_EXISTS)
+meta REPLYTO_WITHOUT_TO_CC (__HAS_REPLY_TO && !__TOCC_EXISTS)
# thanks to Suresh for these tips
# header FAKE_OUTBLAZE_RCVD_168 X-Spam-Relays-External =~ /^[^\]]+168city\./