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 2014/11/04 00:17:53 UTC

svn commit: r1636471 - in /spamassassin/trunk/rulesrc/sandbox/jhardin: 20_misc_testing.cf 20_tbird_image_spam.cf

Author: jhardin
Date: Mon Nov  3 23:17:53 2014
New Revision: 1636471

URL: http://svn.apache.org/r1636471
Log:
Add test rule

Modified:
    spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf
    spamassassin/trunk/rulesrc/sandbox/jhardin/20_tbird_image_spam.cf

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=1636471&r1=1636470&r2=1636471&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf Mon Nov  3 23:17:53 2014
@@ -356,15 +356,19 @@ else
 endif
 
 ifplugin Mail::SpamAssassin::Plugin::FreeMail
-  meta         FREEMAIL_DOC_PDF     (__DOC_ATTACH || __PDF_ATTACH) && (FREEMAIL_FROM || FREEMAIL_REPLYTO)
-  describe     FREEMAIL_DOC_PDF     MS document or PDF attachment, from freemail
+  meta         __FREEMAIL_DOC_PDF     (__DOC_ATTACH || __PDF_ATTACH) && (FREEMAIL_FROM || FREEMAIL_REPLYTO)
+  meta         FREEMAIL_DOC_PDF       __FREEMAIL_DOC_PDF
+  describe     FREEMAIL_DOC_PDF       MS document or PDF attachment, from freemail
 
-  meta         FREEMAIL_RVW_ATTCH   (__PLS_REVIEW || __DLND_ATTACH) && FREEMAIL_DOC_PDF
-  describe     FREEMAIL_RVW_ATTCH   Please review attached document, from freemail
+  meta         FREEMAIL_DOC_PDF_BCC   __FREEMAIL_DOC_PDF && __TO_UNDISCLOSED
+  describe     FREEMAIL_DOC_PDF_BCC   MS document or PDF attachment, from freemail, all recipients hidden
+
+  meta         FREEMAIL_RVW_ATTCH     (__PLS_REVIEW || __DLND_ATTACH) && __FREEMAIL_DOC_PDF
+  describe     FREEMAIL_RVW_ATTCH     Please review attached document, from freemail
 endif
 
-meta           EMPTY_RVM_ATTCH      (__PLS_REVIEW || __DLND_ATTACH) && __EMPTY_BODY
-describe       EMPTY_RVM_ATTCH      Please review attached document, empty message
+meta           EMPTY_RVW_ATTCH      (__PLS_REVIEW || __DLND_ATTACH) && __EMPTY_BODY
+describe       EMPTY_RVW_ATTCH      Please review attached document, empty message
 
 body           __END_FUTURE_EMAILS /\b(?:end|stop(?! receiving these (?:alerts|emails))|cease|discontinue|removed?|(?:do(?! not wish to receive [\w\s]{0,20}emails)|would|you(?:'d)?) (?:not (?:wish|want|like|desire)|(?:prefer|wish|want|like|desire) not) to|exclude yourself|fore?go)[- ](?:get |receiv(?:ing|e) |or |(?:a-z{1,30} ){0,4}from )?(?:these|our|(?:any )?(?:future|further)) (?:(?:e|ad)?-?m(?:ail(?:ing)?|es+[age]{3})|alert|PSA|marketing|notice)[- ]?(?:ad|update)?s?\b/i
 ifplugin Mail::SpamAssassin::Plugin::DKIM

Modified: spamassassin/trunk/rulesrc/sandbox/jhardin/20_tbird_image_spam.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/jhardin/20_tbird_image_spam.cf?rev=1636471&r1=1636470&r2=1636471&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/jhardin/20_tbird_image_spam.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/jhardin/20_tbird_image_spam.cf Mon Nov  3 23:17:53 2014
@@ -19,7 +19,7 @@ describe   __FORGED_TBIRD_IMG      Possi
 # Additional meta spotted by Alex Broens.  Still might FP on legit mail with
 # manually typed addresses or undisclosed recipients.
 
-header     __TO_UNDISCLOSED        To =~ /(?:undisclosed-recipients|destinataires inconnus):/i
+header     __TO_UNDISCLOSED        To =~ /\b(?:undisclosed[-\s]recipients|destinataires inconnus)\b/i
 header     __TO_NO_ARROWS_R        To !~ /(?:>$|>,)/
 
 meta       FORGED_TBIRD_IMG_ARROW  __FORGED_TBIRD_IMG && __TO_NO_ARROWS_R && !__TO_UNDISCLOSED