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 2019/07/21 15:49:38 UTC
svn commit: r1863527 - in /spamassassin:
branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm
trunk/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm
Author: hege
Date: Sun Jul 21 15:49:38 2019
New Revision: 1863527
URL: http://svn.apache.org/viewvc?rev=1863527&view=rev
Log:
Simplify settings tags a bit
Modified:
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm?rev=1863527&r1=1863526&r2=1863527&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm Sun Jul 21 15:49:38 2019
@@ -226,6 +226,7 @@ sub get_country {
sub extract_metadata {
my ($self, $opts) = @_;
+ my $pms = $opts->{permsgstatus};
my $db;
my $dbv6;
@@ -329,7 +330,6 @@ sub extract_metadata {
}
if (!$db) {
- $self->{relaycountry_disabled} = 1;
return 1;
}
@@ -373,46 +373,22 @@ sub extract_metadata {
my $ccstr = join(' ', @cc_untrusted);
$msg->put_metadata("X-Relay-Countries", $ccstr);
dbg("metadata: X-Relay-Countries: $ccstr");
+ $pms->set_tag("RELAYCOUNTRY", @cc_untrusted == 1 ? $cc_untrusted[0] : \@cc_untrusted);
$ccstr = join(' ', @cc_external);
$msg->put_metadata("X-Relay-Countries-External", $ccstr);
dbg("metadata: X-Relay-Countries-External: $ccstr");
+ $pms->set_tag("RELAYCOUNTRYEXT", @cc_external == 1 ? $cc_external[0] : \@cc_external);
$ccstr = join(' ', @cc_auth);
$msg->put_metadata("X-Relay-Countries-Auth", $ccstr);
dbg("metadata: X-Relay-Countries-Auth: $ccstr");
+ $pms->set_tag("RELAYCOUNTRYAUTH", @cc_auth == 1 ? $cc_auth[0] : \@cc_auth);
$ccstr = join(' ', @cc_all);
$msg->put_metadata("X-Relay-Countries-All", $ccstr);
dbg("metadata: X-Relay-Countries-All: $ccstr");
-
- return 1;
-}
-
-sub parsed_metadata {
- my ($self, $opts) = @_;
-
- return 1 if $self->{relaycountry_disabled};
-
- my @c_list = split(' ',
- $opts->{permsgstatus}->get_message->get_metadata('X-Relay-Countries'));
- $opts->{permsgstatus}->set_tag("RELAYCOUNTRY",
- @c_list == 1 ? $c_list[0] : \@c_list);
-
- @c_list = split(' ',
- $opts->{permsgstatus}->get_message->get_metadata('X-Relay-Countries-External'));
- $opts->{permsgstatus}->set_tag("RELAYCOUNTRYEXT",
- @c_list == 1 ? $c_list[0] : \@c_list);
-
- @c_list = split(' ',
- $opts->{permsgstatus}->get_message->get_metadata('X-Relay-Countries-Auth'));
- $opts->{permsgstatus}->set_tag("RELAYCOUNTRYAUTH",
- @c_list == 1 ? $c_list[0] : \@c_list);
-
- @c_list = split(' ',
- $opts->{permsgstatus}->get_message->get_metadata('X-Relay-Countries-All'));
- $opts->{permsgstatus}->set_tag("RELAYCOUNTRYALL",
- @c_list == 1 ? $c_list[0] : \@c_list);
+ $pms->set_tag("RELAYCOUNTRYALL", @cc_all == 1 ? $cc_all[0] : \@cc_all);
return 1;
}
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm?rev=1863527&r1=1863526&r2=1863527&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm Sun Jul 21 15:49:38 2019
@@ -92,6 +92,7 @@ sub new {
sub extract_metadata {
my ($self, $opts) = @_;
+ my $pms = $opts->{permsgstatus};
return if $self->{relaycountry_disabled};
@@ -142,46 +143,22 @@ sub extract_metadata {
my $ccstr = join(' ', @cc_untrusted);
$msg->put_metadata("X-Relay-Countries", $ccstr);
dbg("metadata: X-Relay-Countries: $ccstr");
+ $pms->set_tag("RELAYCOUNTRY", @cc_untrusted == 1 ? $cc_untrusted[0] : \@cc_untrusted);
$ccstr = join(' ', @cc_external);
$msg->put_metadata("X-Relay-Countries-External", $ccstr);
dbg("metadata: X-Relay-Countries-External: $ccstr");
+ $pms->set_tag("RELAYCOUNTRYEXT", @cc_external == 1 ? $cc_external[0] : \@cc_external);
$ccstr = join(' ', @cc_auth);
$msg->put_metadata("X-Relay-Countries-Auth", $ccstr);
dbg("metadata: X-Relay-Countries-Auth: $ccstr");
+ $pms->set_tag("RELAYCOUNTRYAUTH", @cc_auth == 1 ? $cc_auth[0] : \@cc_auth);
$ccstr = join(' ', @cc_all);
$msg->put_metadata("X-Relay-Countries-All", $ccstr);
dbg("metadata: X-Relay-Countries-All: $ccstr");
-}
-
-sub parsed_metadata {
- my ($self, $opts) = @_;
-
- return 1 if $self->{relaycountry_disabled};
-
- my @c_list = split(' ',
- $opts->{permsgstatus}->get_message->get_metadata('X-Relay-Countries'));
- $opts->{permsgstatus}->set_tag("RELAYCOUNTRY",
- @c_list == 1 ? $c_list[0] : \@c_list);
-
- @c_list = split(' ',
- $opts->{permsgstatus}->get_message->get_metadata('X-Relay-Countries-External'));
- $opts->{permsgstatus}->set_tag("RELAYCOUNTRYEXT",
- @c_list == 1 ? $c_list[0] : \@c_list);
-
- @c_list = split(' ',
- $opts->{permsgstatus}->get_message->get_metadata('X-Relay-Countries-Auth'));
- $opts->{permsgstatus}->set_tag("RELAYCOUNTRYAUTH",
- @c_list == 1 ? $c_list[0] : \@c_list);
-
- @c_list = split(' ',
- $opts->{permsgstatus}->get_message->get_metadata('X-Relay-Countries-All'));
- $opts->{permsgstatus}->set_tag("RELAYCOUNTRYALL",
- @c_list == 1 ? $c_list[0] : \@c_list);
-
- return 1;
+ $pms->set_tag("RELAYCOUNTRYALL", @cc_all == 1 ? $cc_all[0] : \@cc_all);
}
1;