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:13 UTC
svn commit: rev 51867 - in spamassassin/branches/3.0: lib/Mail/SpamAssassin/Message/Metadata t
Author: jm
Date: Sun Oct 3 23:23:12 2004
New Revision: 51867
Modified:
spamassassin/branches/3.0/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
spamassassin/branches/3.0/t/rcvd_parser.t
Log:
bug 3791: add support for XMail Received header formats
Modified: spamassassin/branches/3.0/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
==============================================================================
--- spamassassin/branches/3.0/lib/Mail/SpamAssassin/Message/Metadata/Received.pm (original)
+++ spamassassin/branches/3.0/lib/Mail/SpamAssassin/Message/Metadata/Received.pm Sun Oct 3 23:23:12 2004
@@ -401,6 +401,18 @@
return;
}
+ 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 (/Exim/) {
# one of the HUGE number of Exim formats :(
# This must be scriptable.
Modified: spamassassin/branches/3.0/t/rcvd_parser.t
==============================================================================
--- spamassassin/branches/3.0/t/rcvd_parser.t (original)
+++ spamassassin/branches/3.0/t/rcvd_parser.t Sun Oct 3 23:23:12 2004
@@ -18,7 +18,7 @@
use lib '.'; use lib 't';
use SATest; sa_t_init("rcvd_parser");
-use Test; BEGIN { plan tests => 30 };
+use Test; BEGIN { plan tests => 31 };
use strict;
@@ -385,6 +385,18 @@
[ ip=128.200.80.6 rdns=smtp3.es.uci.edu helo=smtp3.es.uci.edu by=amgod.boxhost.net ident= envfrom= id=87D0A310091 ] [ ip=128.200.80.22 rdns=rigel.oac.uci.edu helo=rigel.oac.uci.edu by=smtp3.es.uci.edu ident= envfrom= id=i2907ZaF008726 ]
+},
+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{