You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2011/05/28 20:53:02 UTC

svn commit: r1128753 - in /spamassassin/trunk: rules/20_head_tests.cf rulesrc/sandbox/emailed/00_FVGT_File001.cf

Author: hege
Date: Sat May 28 18:53:01 2011
New Revision: 1128753

URL: http://svn.apache.org/viewvc?rev=1128753&view=rev
Log:
Bug 6353: Fix FH_FROMEML_NOTLD, add MISSING_FROM

Modified:
    spamassassin/trunk/rules/20_head_tests.cf
    spamassassin/trunk/rulesrc/sandbox/emailed/00_FVGT_File001.cf

Modified: spamassassin/trunk/rules/20_head_tests.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_head_tests.cf?rev=1128753&r1=1128752&r2=1128753&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_head_tests.cf (original)
+++ spamassassin/trunk/rules/20_head_tests.cf Sat May 28 18:53:01 2011
@@ -270,6 +270,11 @@ header __HAS_SUBJECT		exists:Subject
 meta MISSING_SUBJECT		!__HAS_SUBJECT
 describe MISSING_SUBJECT	Missing Subject: header
 
+# bug 6353
+header __HAS_FROM		exists:From
+meta MISSING_FROM		!__HAS_FROM
+describe MISSING_FROM		Missing From: header
+
 # bug 6149: avoid common .jp false positives
 header __GAPPY_SUBJECT		Subject =~ /\b(?:[a-z]([-_. =~\/:,*!\@\#\$\%\^&+;\"\'<>\\])\1{0,2}){4}/i
 meta GAPPY_SUBJECT              (__GAPPY_SUBJECT && !__ISO_2022_JP_DELIM)

Modified: spamassassin/trunk/rulesrc/sandbox/emailed/00_FVGT_File001.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/emailed/00_FVGT_File001.cf?rev=1128753&r1=1128752&r2=1128753&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/emailed/00_FVGT_File001.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/emailed/00_FVGT_File001.cf Sat May 28 18:53:01 2011
@@ -1954,7 +1954,8 @@ describe FH_FROM_CASH           From nam
 #counts   FH_FROM_CASH             113s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06
 
 
-header   FH_FROMEML_NOTLD       From:addr !~ /\./ [if-unset: foo@bar.com]
+# Bug 6353
+header   FH_FROMEML_NOTLD       From:addr !~ /\@[^@]+\.(?:[a-z]{2,}|xn--[a-z0-9]+(?:-[a-z0-9]*)?)$/i [if-unset: foo@bar.com]
 describe FH_FROMEML_NOTLD       E-mail address doesn't have TLD (.com, etc.)
 ##score    FH_FROMEML_NOTLD     2.268
 #counts   FH_FROMEML_NOTLD         104s/0h of 32518 corpus (23261s/9257h FVGT) 11/14/06