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 2017/04/16 06:18:27 UTC
svn commit: r1791571 -
/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/DKIM.pm
Author: sidney
Date: Sun Apr 16 06:18:27 2017
New Revision: 1791571
URL: http://svn.apache.org/viewvc?rev=1791571&view=rev
Log:
Merged from trunk - Bug 7285: Make the DKIM selector a tag [from revision 1749299]
Modified:
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/DKIM.pm (contents, props changed)
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/DKIM.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/DKIM.pm?rev=1791571&r1=1791570&r2=1791571&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/DKIM.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/DKIM.pm Sun Apr 16 06:18:27 2017
@@ -99,6 +99,9 @@ header fields, other plugins, etc.:
_DKIMDOMAIN_
Signing Domain Identifier (SDID) (the 'd' tag) from valid signatures;
+ _DKIMSELECTOR_
+ DKIM selector (the 's' tag) from valid signatures;
+
Identities and domains from signatures which failed verification are not
included in these tags. Duplicates are eliminated (e.g. when there are two or
more valid signatures from the same signer, only one copy makes it into a tag).
@@ -923,15 +926,19 @@ sub _check_dkim_signature {
dbg("dkim: signature verification result: %s", uc($sig_res));
# supply values for both tags
- my(%seen1, %seen2, @identity_list, @domain_list);
+ my(%seen1, %seen2, %seen3, @identity_list, @domain_list, @selector_list);
@identity_list = grep(defined $_ && $_ ne '' && !$seen1{$_}++,
map($_->identity, @valid_signatures));
@domain_list = grep(defined $_ && $_ ne '' && !$seen2{$_}++,
map($_->domain, @valid_signatures));
+ @selector_list = grep(defined $_ && $_ ne '' && !$seen3{$_}++,
+ map($_->selector, @valid_signatures));
$pms->set_tag('DKIMIDENTITY',
@identity_list == 1 ? $identity_list[0] : \@identity_list);
$pms->set_tag('DKIMDOMAIN',
@domain_list == 1 ? $domain_list[0] : \@domain_list);
+ $pms->set_tag('DKIMSELECTOR',
+ @selector_list == 1 ? $selector_list[0] : \@selector_list);
} elsif (@signatures) {
$pms->{dkim_signed} = 1;
my $sig = $signatures[0];
Propchange: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/DKIM.pm
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Apr 16 06:18:27 2017
@@ -0,0 +1 @@
+/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm:1749299