You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by si...@apache.org on 2005/11/23 20:20:20 UTC
svn commit: r348521 - in /spamassassin/branches/3.1:
lib/Mail/SpamAssassin/Message/Metadata/Received.pm t/rcvd_parser.t
Author: sidney
Date: Wed Nov 23 11:20:14 2005
New Revision: 348521
URL: http://svn.apache.org/viewcvs?rev=348521&view=rev
Log:
bug4627: Fix a case in Received header parsing
Modified:
spamassassin/branches/3.1/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
spamassassin/branches/3.1/t/rcvd_parser.t
Modified: spamassassin/branches/3.1/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
URL: http://svn.apache.org/viewcvs/spamassassin/branches/3.1/lib/Mail/SpamAssassin/Message/Metadata/Received.pm?rev=348521&r1=348520&r2=348521&view=diff
==============================================================================
--- spamassassin/branches/3.1/lib/Mail/SpamAssassin/Message/Metadata/Received.pm (original)
+++ spamassassin/branches/3.1/lib/Mail/SpamAssassin/Message/Metadata/Received.pm Wed Nov 23 11:20:14 2005
@@ -935,6 +935,19 @@
}
}
+ # simta: http://rsug.itd.umich.edu/software/simta/
+ # Note the ugly uppercase FROM/BY/ID
+ # Received: FROM hackers.mr.itd.umich.edu (smtp.mail.umich.edu [141.211.14.81])
+ # BY madman.mr.itd.umich.edu ID 434B508E.174A6.13932 ; 11 Oct 2005 01:41:34 -0400
+ # Received: FROM [192.168.1.24] (s233-64-90-216.try.wideopenwest.com [64.233.216.90])
+ # BY hackers.mr.itd.umich.edu ID 434B5051.8CDE5.15436 ; 11 Oct 2005 01:40:33 -0400
+ if (/^FROM (\S+) \((\S+) \[(${IP_ADDRESS})\]\) BY (\S+) (?:ID (\S+) )?/ ) {
+ $mta_looked_up_dns = 1;
+ $helo = $1; $rdns = $2; $ip = $3; $by = $4;
+ $id = $5 if (defined $5);
+ goto enough;
+ }
+
# ------------------------------------------------------------------------
# IGNORED LINES: generally local-to-local or non-TCP/IP handovers
Modified: spamassassin/branches/3.1/t/rcvd_parser.t
URL: http://svn.apache.org/viewcvs/spamassassin/branches/3.1/t/rcvd_parser.t?rev=348521&r1=348520&r2=348521&view=diff
==============================================================================
--- spamassassin/branches/3.1/t/rcvd_parser.t (original)
+++ spamassassin/branches/3.1/t/rcvd_parser.t Wed Nov 23 11:20:14 2005
@@ -18,7 +18,7 @@
use lib '.'; use lib 't';
use SATest; sa_t_init("rcvd_parser");
-use Test; BEGIN { plan tests => 44 };
+use Test; BEGIN { plan tests => 45 };
use strict;
@@ -565,6 +565,18 @@
} => q{
[ ip=1.2.3.4 rdns=my.dns.com helo=gorkcomputer by=mydomain.com ident= envfrom= id=000000DB.43735815.00001E11 auth=LOGIN ]
+
+},
+q{
+
+Received: FROM hackers.mr.itd.umich.edu (smtp.mail.umich.edu [141.211.14.81])
+ BY madman.mr.itd.umich.edu ID 434B508E.174A6.13932 ; 11 Oct 2005 01:41:34 -0400
+Received: FROM [192.168.1.24] (s233-64-90-216.try.wideopenwest.com [64.233.216.90])
+ BY hackers.mr.itd.umich.edu ID 434B5051.8CDE5.15436 ; 11 Oct 2005 01:40:33 -0400
+
+} => q{
+
+ [ ip=141.211.14.81 rdns=smtp.mail.umich.edu helo=hackers.mr.itd.umich.edu by=madman.mr.itd.umich.edu ident= envfrom= id=434B508E.174A6.13932 auth= ] [ ip=64.233.216.90 rdns=s233-64-90-216.try.wideopenwest.com helo=!192.168.1.24! by=hackers.mr.itd.umich.edu ident= envfrom= id=434B5051.8CDE5.15436 auth= ]
}
);