You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by qu...@apache.org on 2005/01/21 10:03:05 UTC
svn commit: r125905 - /spamassassin/trunk/rules/20_head_tests.cf /spamassassin/trunk/rules/70_testing.cf
Author: quinlan
Date: Fri Jan 21 01:03:04 2005
New Revision: 125905
URL: http://svn.apache.org/viewcvs?view=rev&rev=125905
Log:
bug 2218: check for gratuitous base64 header encoding
Modified:
spamassassin/trunk/rules/20_head_tests.cf
spamassassin/trunk/rules/70_testing.cf
Modified: spamassassin/trunk/rules/20_head_tests.cf
Url: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/20_head_tests.cf?view=diff&rev=125905&p1=spamassassin/trunk/rules/20_head_tests.cf&r1=125904&p2=spamassassin/trunk/rules/20_head_tests.cf&r2=125905
==============================================================================
--- spamassassin/trunk/rules/20_head_tests.cf (original)
+++ spamassassin/trunk/rules/20_head_tests.cf Fri Jan 21 01:03:04 2005
@@ -253,13 +253,36 @@
# alphabets, but do it in the eval
header SUBJ_ILLEGAL_CHARS eval:check_illegal_chars('Subject','0.00','2')
-describe SUBJ_ILLEGAL_CHARS Subject contains too many raw illegal characters
+describe SUBJ_ILLEGAL_CHARS Subject: has too many raw illegal characters
header FROM_ILLEGAL_CHARS eval:check_illegal_chars('From','0.20','2')
-describe FROM_ILLEGAL_CHARS From contains too many raw illegal characters
+describe FROM_ILLEGAL_CHARS From: has too many raw illegal characters
header HEAD_ILLEGAL_CHARS eval:check_illegal_chars('ALL','0.010','2')
-describe HEAD_ILLEGAL_CHARS Headers contain too many raw illegal characters
+describe HEAD_ILLEGAL_CHARS Headers have too many raw illegal characters
+
+###########################################################################
+# legal characters that are MIME encoded, but don't need to be
+
+header __SUBJECT_NEEDS_MIME Subject =~ /[\x00-\x08\x0b\x0c\x0e-\x1f\x7f-\xff]/
+header __SUBJECT_ENCODED_QP Subject:raw =~ /=\?\S+\?Q\?/i
+header __SUBJECT_ENCODED_B64 Subject:raw =~ /=\?\S+\?B\?/i
+
+meta SUBJECT_EXCESS_QP __SUBJECT_ENCODED_QP && !__SUBJECT_NEEDS_MIME
+describe SUBJECT_EXCESS_QP Subject: quoted-printable encoded unnecessarily
+
+meta SUBJECT_EXCESS_BASE64 __SUBJECT_ENCODED_B64 && !__SUBJECT_NEEDS_MIME
+describe SUBJECT_EXCESS_BASE64 Subject: base64 encoded encoded unnecessarily
+
+header __FROM_NEEDS_MIME From =~ /[\x00-\x08\x0b\x0c\x0e-\x1f\x7f-\xff]/
+header __FROM_ENCODED_QP From:raw =~ /=\?\S+\?Q\?/i
+header __FROM_ENCODED_B64 From:raw =~ /=\?\S+\?B\?/i
+
+meta FROM_EXCESS_QP __FROM_ENCODED_QP && !__FROM_NEEDS_MIME
+describe FROM_EXCESS_QP From: quoted-printable encoded unnecessarily
+
+meta FROM_EXCESS_BASE64 __FROM_ENCODED_B64 && !__FROM_NEEDS_MIME
+describe FROM_EXCESS_BASE64 From: base64 encoded unnecessarily
###########################################################################
# ADV tags in various languages
Modified: spamassassin/trunk/rules/70_testing.cf
Url: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/70_testing.cf?view=diff&rev=125905&p1=spamassassin/trunk/rules/70_testing.cf&r1=125904&p2=spamassassin/trunk/rules/70_testing.cf&r2=125905
==============================================================================
--- spamassassin/trunk/rules/70_testing.cf (original)
+++ spamassassin/trunk/rules/70_testing.cf Fri Jan 21 01:03:04 2005
@@ -322,24 +322,6 @@
meta T_ORANGES_AND_SPAM_3 T_ORANGES_AND_SPAM_POST && !T_ORANGES_AND_SPAM_TELE
meta T_ORANGES_AND_SPAM_4 !T_ORANGES_AND_SPAM_POST && T_ORANGES_AND_SPAM_TELE
-# quick idea
-header __SUBJECT_MIME_ENCODED Subject:raw =~ /=\?\S+\?[BQ]\?/i
-header __SUBJECT_NEEDS_MIME Subject =~ /[\x00-\x08\x0b\x0c\x0e-\x1f\x7f-\xff]/
-meta T_SUBJECT_EXCESS_MIME __SUBJECT_MIME_ENCODED && !__SUBJECT_NEEDS_MIME
-header __SUBJECT_MIME_ENCODED_Q Subject:raw =~ /=\?\S+\?Q\?/i
-header __SUBJECT_MIME_ENCODED_B Subject:raw =~ /=\?\S+\?B\?/i
-meta T_SUBJECT_EXCESS_MIME_Q __SUBJECT_MIME_ENCODED_Q && !__SUBJECT_NEEDS_MIME
-meta T_SUBJECT_EXCESS_MIME_B __SUBJECT_MIME_ENCODED_B && !__SUBJECT_NEEDS_MIME
-
-# quick idea
-header __FROM_MIME_ENCODED From:raw =~ /=\?\S+\?[BQ]\?/i
-header __FROM_NEEDS_MIME From =~ /[\x00-\x08\x0b\x0c\x0e-\x1f\x7f-\xff]/
-meta T_FROM_EXCESS_MIME __FROM_MIME_ENCODED && !__FROM_NEEDS_MIME
-header __FROM_MIME_ENCODED_Q From:raw =~ /=\?\S+\?Q\?/i
-header __FROM_MIME_ENCODED_B From:raw =~ /=\?\S+\?B\?/i
-meta T_FROM_EXCESS_MIME_Q __FROM_MIME_ENCODED_Q && !__FROM_NEEDS_MIME
-meta T_FROM_EXCESS_MIME_B __FROM_MIME_ENCODED_B && !__FROM_NEEDS_MIME
-
# hmmmm...
header T_SUBJECT_MIME_ENCODED_TWICE Subject:raw =~ /=\?\S+\?[BQ]\?.*=\?\S+\?[BQ]\?/i
header __SUBJECT_RAW_LENGTH_60 Subject:raw =~ /.{60}/s