You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2004/10/04 08:23:25 UTC
svn commit: rev 51868 - in spamassassin/trunk: lib/Mail/SpamAssassin/Message/Metadata t
Author: jm
Date: Sun Oct 3 23:23:25 2004
New Revision: 51868
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
spamassassin/trunk/t/rcvd_parser.t
Log:
bug 3791: add support for XMail Received header formats
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm Sun Oct 3 23:23:25 2004
@@ -429,6 +429,18 @@
if (/\[XMail /) { # bug 3791
# Received: from list.brainbuzz.com (63.146.189.86:23198) by mx1.yourtech.net with [XMail 1.20 ESMTP Server] id <S72E> for <ja...@ellingson.org> from <bo...@list.cramsession.com>; Sat, 18 Sep 2004 23:17:54 -0500
# Received: from list.brainbuzz.com (63.146.189.86:23198) by mx1.yourtech.net (209.32.147.34:25) with [XMail 1.20 ESMTP Server] id <S72E> for <ja...@ellingson.org> from <bo...@list.cramsession.com>; Sat, 18 Sep 2004 23:17:54 -0500
+ if (/^from (\S+) \((${IP_ADDRESS})(?::\d+)?\) by (\S+)(?: \(\S+\)|) with \[XMail/)
+ {
+ $helo = $1; $ip = $2; $by = $3;
+ / id <(\S+)> / and $id = $1;
+ / from <(\S+)>; / and $envfrom = $1;
+ goto enough;
+ }
+ }
+
+ if (/\[XMail /) { # bug 3791
+ # Received: from list.brainbuzz.com (63.146.189.86:23198) by mx1.yourtech.net with [XMail 1.20 ESMTP Server] id <S72E> for <ja...@ellingson.org> from <bo...@list.cramsession.com>; Sat, 18 Sep 2004 23:17:54 -0500
+ # Received: from list.brainbuzz.com (63.146.189.86:23198) by mx1.yourtech.net (209.32.147.34:25) with [XMail 1.20 ESMTP Server] id <S72E> for <ja...@ellingson.org> from <bo...@list.cramsession.com>; Sat, 18 Sep 2004 23:17:54 -0500
if (/^from (\S+) \((${IP_ADDRESS})(?::\d+|)\) by (\S+)(?: \(\S+\)|) with \[XMail/)
{
$helo = $1; $ip = $2; $by = $3;
Modified: spamassassin/trunk/t/rcvd_parser.t
==============================================================================
--- spamassassin/trunk/t/rcvd_parser.t (original)
+++ spamassassin/trunk/t/rcvd_parser.t Sun Oct 3 23:23:25 2004
@@ -454,6 +454,18 @@
},
q{
+Received: from list.brainbuzz.com (63.146.189.86:23198)
+ by mx1.yourtech.net with [XMail 1.20 ESMTP Server]
+ id <S72E> for <jj...@obfuscatedellingson.org> from <bo...@list.obfuscatedzzzzzzz.com>; Sat, 18 Sep 2004 23:17:54 -0500
+
+},
+q{
+
+[ ip=63.146.189.86 rdns= helo=list.brainbuzz.com by=mx1.yourtech.net ident= envfrom=bounce-cscommunity-11965901@list.obfuscatedzzzzzzz.com id=S72E ]
+
+},
+q{
+
Received: from pop.vip.sc5.yahoo.com [216.136.173.10]
by localhost with POP3 (fetchmail-5.9.13)
for pppppppppp@hhhhhhhhh.net (single-drop); Sun, 22 Feb 2004 20:46:25 -0600 (CST)