Mailing List Archive

Author: jm
Date: Fri Jan 5 05:26:39 2007
New Revision: 493029

URL: http://svn.apache.org/viewvc?view=rev&rev=493029
Log:
bug 5273: add _LASTEXTERNALIP_, _LASTEXTERNALRDNS_, _LASTEXTERNALHELO_ markup tags, to allow adding the connecting IP/HELO as markup to message headers

Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?view=diff&rev=493029&r1=493028&r2=493029
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Fri Jan 5 05:26:39 2007
@@ -2540,6 +2540,12 @@
'X-Spam-Relays-Internal' pseudo-header)
_RELAYSEXTERNAL_ relays used and deemed to be external (see the
'X-Spam-Relays-External' pseudo-header)
+ _LASTEXTERNALIP_ IP address of client in the external-to-internal
+ SMTP handover
+ _LASTEXTERNALRDNS_ reverse-DNS of client in the external-to-internal
+ SMTP handover
+ _LASTEXTERNALHELO_ HELO string used by client in the external-to-internal
+ SMTP handover
_AUTOLEARN_ autolearn status ("ham", "no", "spam", "disabled",
"failed", "unavailable")
_TESTS(,)_ tests hit separated by "," (or other separator)

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm?view=diff&rev=493029&r1=493028&r2=493029
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm Fri Jan 5 05:26:39 2007
@@ -1166,6 +1166,21 @@
"127.0.0.1";
},

+ LASTEXTERNALIP => sub {
+ my $lasthop = $self->{relays_external}->[0];
+ return $lasthop ? $lasthop->{ip} : '';
+ },
+
+ LASTEXTERNALRDNS => sub {
+ my $lasthop = $self->{relays_external}->[0];
+ return $lasthop ? $lasthop->{rdns} : '';
+ },
+
+ LASTEXTERNALHELO => sub {
+ my $lasthop = $self->{relays_external}->[0];
+ return $lasthop ? $lasthop->{helo} : '';
+ },
+
CONTACTADDRESS => sub { $self->{conf}->{report_contact}; },

BAYES => sub {