You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by gb...@apache.org on 2018/05/18 07:13:02 UTC

svn commit: r1831826 - in /spamassassin: branches/3.4/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm

Author: gbechis
Date: Fri May 18 07:13:02 2018
New Revision: 1831826

URL: http://svn.apache.org/viewvc?rev=1831826&view=rev
Log:
Fix another fp on FORGED_GMAIL_RCVD rule

Modified:
    spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm?rev=1831826&r1=1831825&r2=1831826&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm Fri May 18 07:13:02 2018
@@ -595,11 +595,12 @@ sub check_for_forged_gmail_received_head
   my $received = $pms->get('Received');
 
   if ($xreceived =~ /by 10\.\S+ with SMTP id \S+/) { return 0; }
+  if ($xreceived =~ /by 2002\:a19\:\S+ with SMTP id \S+/) { return 0; }
   if ($received =~ /by smtp\.googlemail\.com with ESMTPSA id \S+/) {
     return 0;
   }
-  if ( (length($xgms) gt GOOGLE_MESSAGE_STATE_LENGTH_MIN) && 
-    (length($xss) gt GOOGLE_SMTP_SOURCE_LENGTH_MIN)) {
+  if ( (length($xgms) lt GOOGLE_MESSAGE_STATE_LENGTH_MIN) && 
+    (length($xss) lt GOOGLE_SMTP_SOURCE_LENGTH_MIN)) {
       return 0;
   }
 

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm?rev=1831826&r1=1831825&r2=1831826&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm Fri May 18 07:13:02 2018
@@ -607,11 +607,13 @@ sub check_for_forged_gmail_received_head
   my $received = $pms->get('Received');
 
   if ($xreceived =~ /by 10\.\S+ with SMTP id \S+/) { return 0; }
+  if ($xreceived =~ /by 2002\:a19\:\S+ with SMTP id \S+/) { return 0; }
   if ($received =~ /by smtp\.googlemail\.com with ESMTPSA id \S+/) {
     return 0;
   }
-  if ( (length($xgms) gt GOOGLE_MESSAGE_STATE_LENGTH_MIN) && 
-    (length($xss) gt GOOGLE_SMTP_SOURCE_LENGTH_MIN)) {
+
+  if ( (length($xgms) lt GOOGLE_MESSAGE_STATE_LENGTH_MIN) && 
+    (length($xss) lt GOOGLE_SMTP_SOURCE_LENGTH_MIN)) {
       return 0;
   }