You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by fe...@apache.org on 2006/04/28 23:02:36 UTC
svn commit: r398008 - in /spamassassin/rules/branches/3.1: 20_ratware.cf
50_scores.cf
Author: felicity
Date: Fri Apr 28 14:02:35 2006
New Revision: 398008
URL: http://svn.apache.org/viewcvs?rev=398008&view=rev
Log:
merging over changes to the 3.1 rules directory
Modified:
spamassassin/rules/branches/3.1/20_ratware.cf
spamassassin/rules/branches/3.1/50_scores.cf
Modified: spamassassin/rules/branches/3.1/20_ratware.cf
URL: http://svn.apache.org/viewcvs/spamassassin/rules/branches/3.1/20_ratware.cf?rev=398008&r1=398007&r2=398008&view=diff
==============================================================================
--- spamassassin/rules/branches/3.1/20_ratware.cf (original)
+++ spamassassin/rules/branches/3.1/20_ratware.cf Fri Apr 28 14:02:35 2006
@@ -127,7 +127,10 @@
describe FORGED_MUA_THEBAT_CS Mail pretending to be from The Bat! (charset)
describe FORGED_MUA_THEBAT_BOUN Mail pretending to be from The Bat! (boundary)
-meta FORGED_OUTLOOK_HTML (__ANY_OUTLOOK_MUA && MIME_HTML_ONLY)
+# bug 4649: bulk mail sent via Yahoo! often looks forged, even when it is not
+header __YAHOO_BULK Received =~ /from \[\S+\] by \S+\.(?:groups|scd|dcn)\.yahoo\.com with NNFMP/
+
+meta FORGED_OUTLOOK_HTML (!__YAHOO_BULK && __ANY_OUTLOOK_MUA && MIME_HTML_ONLY)
describe FORGED_OUTLOOK_HTML Outlook can't send HTML message only
# bug 2525: FORGED_IMS_HTML fp'ing because new IMS *DOES* use text/html
@@ -135,7 +138,7 @@
# after that to get away with it.
header __IMS_HTML_BUILDS X-Mailer =~ /^Internet Mail Service .(?:[6789]\.|5\.[6789]|5\.5\.(?:[3456789]|2[789]|26[6789]|265[6789]))/
header __IMS_HTML_RCVD Received =~ /\bby \S+ with Internet Mail Service .(?:[6789]\.|5\.[6789]|5\.5\.(?:[3456789]|2[789]|26[6789]|265[6789]))/
-meta FORGED_IMS_HTML (__IMS_MUA && MIME_HTML_ONLY && !(__IMS_HTML_BUILDS && __IMS_HTML_RCVD))
+meta FORGED_IMS_HTML (!__YAHOO_BULK && __IMS_MUA && MIME_HTML_ONLY && !(__IMS_HTML_BUILDS && __IMS_HTML_RCVD))
describe FORGED_IMS_HTML IMS can't send HTML message only
meta FORGED_THEBAT_HTML (__THEBAT_MUA_V1 && MIME_HTML_ONLY)
@@ -197,10 +200,10 @@
meta FORGED_AOL_TAGS (__ANY_AOL_MUA && __MIME_HTML && !__TAG_EXISTS_HTML)
describe FORGED_AOL_TAGS AOL mailers can't send HTML in this format
-meta FORGED_IMS_TAGS (__ANY_IMS_MUA && __MIME_HTML && !(__TAG_EXISTS_HTML && __TAG_EXISTS_HEAD && __TAG_EXISTS_META && __TAG_EXISTS_BODY))
+meta FORGED_IMS_TAGS (!__YAHOO_BULK && __ANY_IMS_MUA && __MIME_HTML && !(__TAG_EXISTS_HTML && __TAG_EXISTS_HEAD && __TAG_EXISTS_META && __TAG_EXISTS_BODY))
describe FORGED_IMS_TAGS IMS mailers can't send HTML in this format
-meta FORGED_OUTLOOK_TAGS (__ANY_OUTLOOK_MUA && __MIME_HTML && !(__TAG_EXISTS_HTML && __TAG_EXISTS_HEAD && __TAG_EXISTS_META && __TAG_EXISTS_BODY))
+meta FORGED_OUTLOOK_TAGS (!__YAHOO_BULK && __ANY_OUTLOOK_MUA && __MIME_HTML && !(__TAG_EXISTS_HTML && __TAG_EXISTS_HEAD && __TAG_EXISTS_META && __TAG_EXISTS_BODY))
describe FORGED_OUTLOOK_TAGS Outlook can't send HTML in this format
# Send-Safe ratware (idea from Alan Curry)
Modified: spamassassin/rules/branches/3.1/50_scores.cf
URL: http://svn.apache.org/viewcvs/spamassassin/rules/branches/3.1/50_scores.cf?rev=398008&r1=398007&r2=398008&view=diff
==============================================================================
--- spamassassin/rules/branches/3.1/50_scores.cf (original)
+++ spamassassin/rules/branches/3.1/50_scores.cf Fri Apr 28 14:02:35 2006
@@ -683,6 +683,12 @@
score SUBJECT_IN_BLACKLIST 100
endif # Mail::SpamAssassin::Plugin::WhiteListSubject
+ifplugin Mail::SpamAssassin::Plugin::DKIM
+score USER_IN_DKIM_WHITELIST -100.000
+score USER_IN_DEF_DKIM_WL -7.500
+score ENV_AND_HDR_DKIM_MATCH -7.500
+endif # Mail::SpamAssassin::Plugin::DKIM
+
ifplugin Mail::SpamAssassin::Plugin::SPF
score USER_IN_SPF_WHITELIST -100.000
score USER_IN_DEF_SPF_WL -7.500
@@ -705,6 +711,15 @@
# CompleteWhois: http://www.completewhois.com/
score RCVD_IN_WHOIS_HIJACKED 0 1.0 0 1.0
+
+# DKIM
+ifplugin Mail::SpamAssassin::Plugin::DKIM
+score DKIM_POLICY_SIGNALL 0.001
+score DKIM_POLICY_SIGNSOME 0.001
+score DKIM_POLICY_TESTING 0.001
+score DKIM_SIGNED 0.001
+score DKIM_VERIFIED -0.001
+endif # Mail::SpamAssassin::Plugin::DKIM
# DomainKeys
ifplugin Mail::SpamAssassin::Plugin::DomainKeys