svn commit: r1885917 - /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm

[jh...@apache.org]

Author: jhardin
Date: Tue Jan 26 17:58:45 2021
New Revision: 1885917

URL: http://svn.apache.org/viewvc?rev=1885917&view=rev
Log:
Bug 7831 - code cleanup

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm?rev=1885917&r1=1885916&r2=1885917&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm Tue Jan 26 17:58:45 2021
@@ -721,10 +721,7 @@ sub _check_dkim_signed_by {
       next if $minimum_key_bits && $sig->{_spamassassin_key_size} &&
               $sig->{_spamassassin_key_size} < $minimum_key_bits;
     }
-    my $sdid = $sig->domain;
-    if (defined $sig->identity) {
-      ($sdid) = $sig->identity =~ /\@(\S+)/;
-    }
+    my ($sdid) = (defined $sig->identity)? $sig->identity =~ /\@(\S+)/ : ($sig->domain);
     next if !defined $sdid;  # a signature with a missing required tag 'd' or 'i' ?
     $sdid = lc $sdid;
     if ($must_be_author_domain_signature) {
@@ -923,10 +920,7 @@ sub _check_dkim_signature {
       push(@valid_signatures, $signature)  if $valid && !$expired;
 
       # check if we have a potential Author Domain Signature, valid or not
-      my $d = $signature->domain;
-      if (defined $signature->identity) {
-        ($d) = $signature->identity =~ /\@(\S+)/;
-      }
+      my ($d) = (defined $signature->identity)? $signature->identity =~ /\@(\S+)/ : ($signature->domain);
       if (!defined $d) {
         # can be undefined on a broken signature with missing required tags
       } else {
@@ -1278,10 +1272,7 @@ sub _wlcheck_list {
       }
     }
 
-    my $sdid = $signature->domain;
-    if (defined $signature->identity) {
-      ($sdid) = $signature->identity =~ /\@(\S+)/;
-    }
+    my ($sdid) = (defined $signature->identity)? $signature->identity =~ /\@(\S+)/ : ($signature->domain);
     $sdid = lc $sdid  if defined $sdid;
 
     my %tried_authors;