You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jh...@apache.org on 2015/12/09 23:11:00 UTC
svn commit: r1718975 - in /spamassassin/trunk/rulesrc/sandbox/jhardin:
20_MIME_no_text.cf 20_misc_testing.cf
Author: jhardin
Date: Wed Dec 9 22:10:59 2015
New Revision: 1718975
URL: http://svn.apache.org/viewvc?rev=1718975&view=rev
Log:
Bug 7273 - FP on encrypted emails
Modified:
spamassassin/trunk/rulesrc/sandbox/jhardin/20_MIME_no_text.cf
spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf
Modified: spamassassin/trunk/rulesrc/sandbox/jhardin/20_MIME_no_text.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/jhardin/20_MIME_no_text.cf?rev=1718975&r1=1718974&r2=1718975&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/jhardin/20_MIME_no_text.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/jhardin/20_MIME_no_text.cf Wed Dec 9 22:10:59 2015
@@ -13,7 +13,7 @@ ifplugin Mail::SpamAssassin::Plugin::MIM
mimeheader __ANY_TEXT_ATTACH Content-Type =~ /text\/\w+/i
meta __MIME_NO_TEXT (__CTYPE_MULTIPART_ANY && !__ANY_TEXT_ATTACH)
- meta MIME_NO_TEXT __MIME_NO_TEXT && !ALL_TRUSTED && !__MSGID_APPLEMAIL && !__USER_AGENT_APPLEMAIL && !__HAS_IN_REPLY_TO && !__HAS_X_REF && !__HS_SUBJ_RE_FW && !__LCL__ENV_AND_HDR_FROM_MATCH
+ meta MIME_NO_TEXT __MIME_NO_TEXT && !__CT_ENCRYPTED && !ALL_TRUSTED && !__MSGID_APPLEMAIL && !__USER_AGENT_APPLEMAIL && !__HAS_IN_REPLY_TO && !__HAS_X_REF && !__HS_SUBJ_RE_FW && !__LCL__ENV_AND_HDR_FROM_MATCH
score MIME_NO_TEXT 2.00 # limit
describe MIME_NO_TEXT No (properly identified) text body parts
tflags MIME_NO_TEXT publish
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=1718975&r1=1718974&r2=1718975&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf Wed Dec 9 22:10:59 2015
@@ -1003,7 +1003,7 @@ meta GAPPY_HTML __GAP
describe GAPPY_HTML HTML body with much useless whitespace
# Try to improve S/O per bug 6119
-meta TVD_SPACE_RATIO_MINFP __TVD_SPACE_RATIO && !__LCL__ENV_AND_HDR_FROM_MATCH && !__SUBSCRIPTION_INFO && !__RCD_RDNS_MAIL && !__SUBJECT_ENCODED_QP && !__THREADED && !__TO_EQ_FROM_DOM && !__BOTH_INR_AND_REF && !__X_CRON_ENV && !__HAS_THREAD_INDEX && !__HDRS_LCASE_KNOWN && !__ISO_2022_JP_DELIM
+meta TVD_SPACE_RATIO_MINFP __TVD_SPACE_RATIO && !__CT_ENCRYPTED && !__LCL__ENV_AND_HDR_FROM_MATCH && !__SUBSCRIPTION_INFO && !__RCD_RDNS_MAIL && !__SUBJECT_ENCODED_QP && !__THREADED && !__TO_EQ_FROM_DOM && !__BOTH_INR_AND_REF && !__X_CRON_ENV && !__HAS_THREAD_INDEX && !__HDRS_LCASE_KNOWN && !__ISO_2022_JP_DELIM
#tflags TVD_SPACE_RATIO_MINFP nopublish
score TVD_SPACE_RATIO_MINFP 2.750 # limit
@@ -1469,7 +1469,7 @@ header __DATE_LOWER ALL =~ /d
# duplicates __XPRIO
#header __FH_HAS_XPRIORITY exists:X-Priority
-meta XPRIO __XPRIO && !ALL_TRUSTED && !__HAS_ERRORS_TO && !__THREADED && !__RP_MATCHES_RCVD && !__LONGLINE && !__MAIL_LINK && !__COMMENT_EXISTS && !__RCD_RDNS_SMTP
+meta XPRIO __XPRIO && !__CT_ENCRYPTED && !ALL_TRUSTED && !__HAS_ERRORS_TO && !__THREADED && !__RP_MATCHES_RCVD && !__LONGLINE && !__MAIL_LINK && !__COMMENT_EXISTS && !__RCD_RDNS_SMTP
describe XPRIO Has X-Priority header
score XPRIO 2.000 # limit
tflags XPRIO publish
@@ -2053,6 +2053,9 @@ meta __RCVD_RMV_FROM_TWO _
meta __RCVD_RMV_XPRIO __GATED_THROUGH_RCVD_REMOVER && __XPRIO
+#header KHOP_ENCRYPTED_CONTENT Content-Type =~ /^multipart\/(?:x-)?(?:pgp-)?encrypted|application\/(?:x-)?pkcs7-mime/
+header __CT_ENCRYPTED Content-Type =~ /^multipart\/(?:x-)?(?:pgp-)?encrypted|application\/(?:x-)?pkcs7-mime/
+