svn commit: r155331 - spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm

[fe...@apache.org]

Author: felicity
Date: Fri Feb 25 06:57:00 2005
New Revision: 155331

URL: http://svn.apache.org/viewcvs?view=rev&rev=155331
Log:
fix potential issues with RE matching in 2 eval rules.  for T_RATWARE_EFROM, trim the addr down to just domain, cleans out potential garbage chars/RE issues/etc.

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm?view=diff&r1=155330&r2=155331
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm Fri Feb 25 06:57:00 2005
@@ -3353,7 +3353,7 @@
   my $mid = $self->get('MESSAGEID');
   my $from = $self->get('From');
   if ($mid =~ m/<[A-Z]{28}\.([^>]+?)>/) {
-     if ($from =~ m/\"[^\"]+\"\s*<$1>/) {
+     if ($from =~ m/\"[^\"]+\"\s*<\Q$1\E>/) {
        return 1;
      }
   }
@@ -3383,7 +3383,11 @@
 
   if ($to =~ /^([^@]+)@(.+)$/) {
     my($user,$dom) = ($1,$2);
-    return 1 if ($from =~ /\b$dom.$user@/i);
+    $dom = Mail::SpamAssassin::Util::RegistrarBoundaries::trim_domain($dom);
+    return unless
+        (Mail::SpamAssassin::Util::RegistrarBoundaries::is_domain_valid($dom));
+
+    return 1 if ($from =~ /\b\Q$dom\E.\Q$user\E@/i);
   }
 
   return 0;