You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by kh...@apache.org on 2010/04/09 16:45:03 UTC
svn commit: r932438 -
/spamassassin/trunk/rulesrc/sandbox/khopesh/20_bug_6389.cf
Author: khopesh
Date: Fri Apr 9 14:45:03 2010
New Revision: 932438
URL: http://svn.apache.org/viewvc?rev=932438&view=rev
Log:
bug 6389 closed with orig rule stricken. here are some last attempts to clean it, with everything marked 'nopublish'
Modified:
spamassassin/trunk/rulesrc/sandbox/khopesh/20_bug_6389.cf
Modified: spamassassin/trunk/rulesrc/sandbox/khopesh/20_bug_6389.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/khopesh/20_bug_6389.cf?rev=932438&r1=932437&r2=932438&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/khopesh/20_bug_6389.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/khopesh/20_bug_6389.cf Fri Apr 9 14:45:03 2010
@@ -1,10 +1,27 @@
# from two sample FPs posted to bug 6389 (attachment 4721 and attachment 4730)
# just a raw numbers check:
-header __HAS_XMIME_AUTOCONV exists:X-MIME-Autoconverted
+header __HAS_XMIME_AUTOCONV exists:X-MIME-Autoconverted
+tflags __HAS_XMIME_AUTOCONV nice
+
+# John Wilcock's proposed subtitutions for __..._ENCODED_B64 (comment 8)
+header __FROM_1BYTE_B64 From:raw =~ /=\?(?:iso-8859-1?\d|windows-125\d|koi-8r?)\?B\?/i
+header __SUBJ_1BYTE_B64 Subject:raw =~ /=\?(?:iso-8859-1?\d|windows-125\d|koi-8r?)\?B\?/i
# possible fix to bug 6389
header __MIME_QP_TO_8BIT X-MIME-Autoconverted =~ /from quoted-printable to 8bit/
+tflags __MIME_QP_TO_8BIT nice
meta DOS_HIGHBIT_HDRS_BODY_BUG6389 __FROM_NEEDS_MIME && __SUBJECT_ENCODED_B64 && __FROM_ENCODED_B64 && __SUBJECT_NEEDS_MIME && __HIGHBITS && !__MIME_QP_TO_8BIT
+# Daryl O'Shea (DOS) + Adam Katz (KHOP) + John Wilcock version
+meta FROM_SUBJ_BODY_8BIT __FROM_NEEDS_MIME && __SUBJ_1BYTE_B64 && __FROM_1BYTE_B64 && __SUBJECT_NEEDS_MIME && __HIGHBITS && !__MIME_QP_TO_8BIT
+
+# assuming recipients won't also be highbit'd ("highbitten?")
+header __TO_1BYTE_B64 To:raw =~ /=\?(?:iso-8859-1?\d|windows-125\d|koi-8r?)\?B\?/i
+meta FROM_SUBJ_NOTO_BODY_8BIT __FROM_NEEDS_MIME && __SUBJ_1BYTE_B64 && __FROM_1BYTE_B64 && __SUBJECT_NEEDS_MIME && __HIGHBITS && !__MIME_QP_TO_8BIT && !__TO_1BYTE_B64
+
+# bug 6389 was closed with the rule removed as unfixable. still, let's watch.
+tflags DOS_HIGHBIT_HDRS_BODY_BUG6389 nopublish
+tflags FROM_SUBJ_BODY_8BIT nopublish
+tflags FROM_SUBJ_NOTO_BODY_8BIT nopublish