You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by bi...@apache.org on 2018/08/31 23:43:25 UTC
svn commit: r1839797 - in /spamassassin:
branches/3.4/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
Author: billcole
Date: Fri Aug 31 23:43:25 2018
New Revision: 1839797
URL: http://svn.apache.org/viewvc?rev=1839797&view=rev
Log:
skip unparseable Cyrus LMTPA over unix socket Received header
Modified:
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message/Metadata/Received.pm?rev=1839797&r1=1839796&r2=1839797&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message/Metadata/Received.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message/Metadata/Received.pm Fri Aug 31 23:43:25 2018
@@ -1199,6 +1199,11 @@ sub parse_received_line {
# id 18tOsg-0008FX-00; Thu, 13 Mar 2003 09:20:06 +0000
if (/^\S+ by \S+ with local/) { return 0; }
+ # Local unix socket handover from Cyrus, tested with v2.3.14
+ # Received: from testintranator.net.vm ([unix socket])_ by testintranator.net.vm (Cyrus v2.3.14) with LMTPA;_ Tue, 21 Jul 2009 14:34:14 +0200
+ # Attention: Actually the received header is parsed as "testintranator.net.vm ([unix socket]) by testintranator.net.vm (Cyrus v2.3.14) with LMTPA", "from" is ommited.
+ if (/^\S+ \(\[unix socket\]\) by \S+ \(Cyrus v[0-9]*?\.[0-9]*?\.[0-9]*?\) with LMTPA/) { return 0; }
+
# HANDOVERS WE KNOW WE CAN'T DEAL WITH: TCP transmission, but to MTAs that
# just don't log enough info for us to use (ie. no IP address present).
# Note: "return 0" is strongly recommended here, unless you're sure
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm?rev=1839797&r1=1839796&r2=1839797&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm Fri Aug 31 23:43:25 2018
@@ -1199,6 +1199,11 @@ sub parse_received_line {
# id 18tOsg-0008FX-00; Thu, 13 Mar 2003 09:20:06 +0000
if (/^\S+ by \S+ with local/) { return 0; }
+ # Local unix socket handover from Cyrus, tested with v2.3.14
+ # Received: from testintranator.net.vm ([unix socket])_ by testintranator.net.vm (Cyrus v2.3.14) with LMTPA;_ Tue, 21 Jul 2009 14:34:14 +0200
+ # Attention: Actually the received header is parsed as "testintranator.net.vm ([unix socket]) by testintranator.net.vm (Cyrus v2.3.14) with LMTPA", "from" is ommited.
+ if (/^\S+ \(\[unix socket\]\) by \S+ \(Cyrus v[0-9]*?\.[0-9]*?\.[0-9]*?\) with LMTPA/) { return 0; }
+
# HANDOVERS WE KNOW WE CAN'T DEAL WITH: TCP transmission, but to MTAs that
# just don't log enough info for us to use (ie. no IP address present).
# Note: "return 0" is strongly recommended here, unless you're sure