svn commit: r1932341 - spamassassin/trunk/lib/Mail/SpamAssassin/Plugin

Author: fkento
Date: Mon Mar 16 17:30:31 2026
New Revision: 1932341

Log:
Fix ARC debug logging: use domain() directly instead of DKIM-style identity extraction

ARC signatures use i= for the instance index, not an email identity
like DKIM. The identity-based domain extraction was returning undef
because there is no @ in the ARC i= value.

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

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ARC.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ARC.pm	Mon Mar 16 13:39:56 2026	(r1932340)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ARC.pm	Mon Mar 16 17:30:31 2026	(r1932341)
@@ -277,9 +277,9 @@ sub _check_signature {
                                $verifier->signatures : $verifier->signature;
     if (would_log("dbg","arc")) {
       foreach my $signature (@$signatures) {
-        dbg("arc: ARC signature i=%s d=%s",
+        dbg("arc: ARC signature d=%s",
           map(!defined $_ ? '(undef)' : $_,
-            $signature->identity, $signature->domain
+            $signature->domain
           )
         );
       }
@@ -328,12 +328,11 @@ sub _check_arc_valid_signature {
       push(@valid_signatures, $signature) if $valid && !$expired;
 
       if (would_log("dbg","arc")) {
-        my ($d) = (defined $signature->identity) ? $signature->identity =~ /\@(\S+)/ : ($signature->domain);
-        $d = defined $d ? lc $d : undef;
-        dbg("arc: %s ARC, i=%s, d=%s, s=%s, a=%s, c=%s, %s",
+        my $d = $signature->domain;
+        dbg("arc: %s ARC, d=%s, s=%s, a=%s, c=%s, %s",
           $info,
           map(!defined $_ ? '(undef)' : $_,
-            $signature->identity, $d, $signature->selector,
+            $d, $signature->selector,
             $signature->algorithm, scalar($signature->canonicalization),
             $signature->result),
         );