You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by fe...@apache.org on 2004/01/14 06:36:19 UTC
svn commit: rev 6159 - incubator/spamassassin/branches/b2_6_0/lib/Mail/SpamAssassin
Author: felicity
Date: Tue Jan 13 21:36:18 2004
New Revision: 6159
Modified:
incubator/spamassassin/branches/b2_6_0/lib/Mail/SpamAssassin/EvalTests.pm
Log:
bug 2871: fixes for some FORGED_YAHOO_RCVD FPs
Modified: incubator/spamassassin/branches/b2_6_0/lib/Mail/SpamAssassin/EvalTests.pm
==============================================================================
--- incubator/spamassassin/branches/b2_6_0/lib/Mail/SpamAssassin/EvalTests.pm (original)
+++ incubator/spamassassin/branches/b2_6_0/lib/Mail/SpamAssassin/EvalTests.pm Tue Jan 13 21:36:18 2004
@@ -609,6 +609,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
@@ -617,7 +622,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;
@@ -634,7 +639,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;
}