You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2020/01/29 21:44:02 UTC
svn commit: r1873341 - in /spamassassin/trunk/lib/Mail/SpamAssassin: Conf.pm
PerMsgStatus.pm
Author: hege
Date: Wed Jan 29 21:44:01 2020
New Revision: 1873341
URL: http://svn.apache.org/viewvc?rev=1873341&view=rev
Log:
Add missing _FIRSTTRUSTEDIP_ _FIRSTTRUSTEDREVIP_ _LASTEXTERNALREVIP_ tags
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?rev=1873341&r1=1873340&r2=1873341&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Wed Jan 29 21:44:01 2020
@@ -4572,8 +4572,14 @@ optional, and the default is shown below
'X-Spam-Relays-Internal' pseudo-header)
_RELAYSEXTERNAL_ relays used and deemed to be external (see the
'X-Spam-Relays-External' pseudo-header)
+ _FIRSTTRUSTEDIP_ IP address of first trusted client (see RELAYSTRUSTED)
+ _FIRSTTRUSTEDREVIP_ IP address of first trusted client (in reversed
+ format suitable for RBL queries)
_LASTEXTERNALIP_ IP address of client in the external-to-internal
SMTP handover
+ _LASTEXTERNALREVIP_ IP address of client in the external-to-internal
+ SMTP handover (in reversed format suitable for RBL
+ queries)
_LASTEXTERNALRDNS_ reverse-DNS of client in the external-to-internal
SMTP handover
_LASTEXTERNALHELO_ HELO string used by client in the external-to-internal
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm?rev=1873341&r1=1873340&r2=1873341&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm Wed Jan 29 21:44:01 2020
@@ -136,12 +136,30 @@ BEGIN {
$pms->{tag_data}->{'REMOTEHOSTADDR'} || "127.0.0.1";
},
+ FIRSTTRUSTEDIP => sub {
+ my $pms = shift;
+ my $lasthop = $pms->{msg}->{metadata}->{relays_trusted}->[-1];
+ $lasthop ? $lasthop->{ip} : '';
+ },
+
+ FIRSTTRUSTEDREVIP => sub {
+ my $pms = shift;
+ my $lasthop = $pms->{msg}->{metadata}->{relays_trusted}->[-1];
+ $lasthop ? reverse_ip_address($lasthop->{ip}) : '';
+ },
+
LASTEXTERNALIP => sub {
my $pms = shift;
my $lasthop = $pms->{msg}->{metadata}->{relays_external}->[0];
$lasthop ? $lasthop->{ip} : '';
},
+ LASTEXTERNALREVIP => sub {
+ my $pms = shift;
+ my $lasthop = $pms->{msg}->{metadata}->{relays_external}->[0];
+ $lasthop ? reverse_ip_address($lasthop->{ip}) : '';
+ },
+
LASTEXTERNALRDNS => sub {
my $pms = shift;
my $lasthop = $pms->{msg}->{metadata}->{relays_external}->[0];