svn commit: rev 6160 - incubator/spamassassin/trunk/lib/Mail/SpamAssassin

[fe...@apache.org]

Author: felicity
Date: Tue Jan 13 21:39:22 2004
New Revision: 6160

Modified:
   incubator/spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
Log:
bug 2871: fixes for FORGED_YAHOO_RCVD fps


Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm	(original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm	Tue Jan 13 21:39:22 2004
@@ -674,6 +674,11 @@
   if ($from !~ /yahoo\.com$/) { return 0; }
 
   my $rcvd = $self->get ('Received');
+  
+  if ( $self->get("Resent-From") && $self->get("Resent-To") ) {
+    my $xrcvd = $self->get("X-Received");
+    $rcvd = $xrcvd if ( $xrcvd );
+  }
   $rcvd =~ s/\s+/ /gs;		# just spaces, simplify the regexp
 
   # not sure about this
@@ -682,7 +687,7 @@
   if ($self->gated_through_received_hdr_remover()) { return 0; }
 
   if ($rcvd =~ /by web\S+\.mail\.yahoo\.com via HTTP/) { return 0; }
-  if ($rcvd =~ /by smtp\.\S+\.yahoo\.com with SMTP/) { return 0; }
+  if ($rcvd =~ /by smtp\S+\.yahoo\.com with SMTP/) { return 0; }
   if ($rcvd =~
       /from \[$IP_ADDRESS\] by \S+\.(?:groups|grp\.scd)\.yahoo\.com with NNFMP/) {
     return 0;
@@ -699,7 +704,7 @@
   if ($rcvd =~ /\bmailer\d+\.bulk\.scd\.yahoo\.com\b/
                 && $from =~ /\@reply\.yahoo\.com$/) { return 0; }
 
-  if ($rcvd =~ /by \w+\.\w+\.yahoo\.com \(\d+\.\d+\.\d+\/\d+\.\d+\.\d+\) id \w+/) {
+  if ($rcvd =~ /by \w+\.\w+\.yahoo\.com \(\d+\.\d+\.\d+\/\d+\.\d+\.\d+\)(?: with ESMTP)? id \w+/) {
       # possibly sent from "mail this story to a friend"
       return 0;
   }