You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by km...@apache.org on 2011/12/10 15:41:53 UTC
svn commit: r1212803 - in /spamassassin/trunk:
lib/Mail/SpamAssassin/Plugin/HeaderEval.pm
rulesrc/sandbox/kmcgrail/20_freemail.cf
Author: kmcgrail
Date: Sat Dec 10 14:41:53 2011
New Revision: 1212803
URL: http://svn.apache.org/viewvc?rev=1212803&view=rev
Log:
Bug 6487 - This is a commit with version encapsulation as this code broke updates in bug 6702. Also implemented small regex change from Mark
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm
spamassassin/trunk/rulesrc/sandbox/kmcgrail/20_freemail.cf
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm?rev=1212803&r1=1212802&r2=1212803&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm Sat Dec 10 14:41:53 2011
@@ -1053,7 +1053,8 @@ sub check_equal_from_domains {
my $envfrom = $pms->get('EnvelopeFrom:addr');
my $fromdomain = '';
- $fromdomain = $1 if ($from =~ /^[^@]+@(.+)$/);
+ #Revised regexp from 6487 comment 3
+ $fromdomain = $1 if $from =~ /\@([^@]*)\z/;
$fromdomain =~ s/^.+\.([^\.]+\.[^\.]+)$/$1/;
return 0 if $fromdomain eq '';
Modified: spamassassin/trunk/rulesrc/sandbox/kmcgrail/20_freemail.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/kmcgrail/20_freemail.cf?rev=1212803&r1=1212802&r2=1212803&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/kmcgrail/20_freemail.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/kmcgrail/20_freemail.cf Sat Dec 10 14:41:53 2011
@@ -24,16 +24,20 @@
###########################################################################
#TESTING OF RULES FOR https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6487
-# DISABLED 12/8 to see if https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6702 is right about rules
ifplugin Mail::SpamAssassin::Plugin::FreeMail
+
+ #This Rule Requires check_equal_from_domains() which only exists in trunk. Otherwise, updates fails.
+
+ if (version >= 3.400000)
-#meta FREEMAIL_FORGED_FROMDOMAIN FREEMAIL_FROM && HEADER_FROM_DIFFERENT_DOMAINS
-#describe FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and EnvelopeFrom freemail headers are different
-#score FREEMAIL_FORGED_FROMDOMAIN 0.25
-
-#header HEADER_FROM_DIFFERENT_DOMAINS eval:check_equal_from_domains()
-#describe HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different
-#score HEADER_FROM_DIFFERENT_DOMAINS 0.25
+ meta FREEMAIL_FORGED_FROMDOMAIN FREEMAIL_FROM && HEADER_FROM_DIFFERENT_DOMAINS
+ describe FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and EnvelopeFrom freemail headers are different
+ score FREEMAIL_FORGED_FROMDOMAIN 0.25
+
+ header HEADER_FROM_DIFFERENT_DOMAINS eval:check_equal_from_domains()
+ describe HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different
+ score HEADER_FROM_DIFFERENT_DOMAINS 0.25
+ endif
endif