From f0dbc29da4fbbb0bf386d0a545ca3ffb7c0489a9 Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Thu, 30 Oct 2025 10:03:46 +0700
Subject: [PATCH] Handle multiple dkim authentication-results

---
 pkg/analyzer/authentication_dkim.go           |  9 ++-
 .../lib/components/AuthenticationCard.svelte  | 56 ++++++++++---------
 2 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/pkg/analyzer/authentication_dkim.go b/pkg/analyzer/authentication_dkim.go
index 9ce0dd2..9f1774b 100644
--- a/pkg/analyzer/authentication_dkim.go
+++ b/pkg/analyzer/authentication_dkim.go
@@ -97,13 +97,18 @@ func (a *AuthenticationAnalyzer) calculateDKIMScore(results *api.AuthenticationR
 	// Expect at least one passing signature
 	if results.Dkim != nil && len(*results.Dkim) > 0 {
 		hasPass := false
+		hasNonPass := false
 		for _, dkim := range *results.Dkim {
 			if dkim.Result == api.AuthResultResultPass {
 				hasPass = true
-				break
+			} else {
+				hasNonPass = true
 			}
 		}
-		if hasPass {
+		if hasPass && hasNonPass {
+			// Could be better
+			return 90
+		} else if hasPass {
 			return 100
 		} else {
 			// Has DKIM signatures but none passed
diff --git a/web/src/lib/components/AuthenticationCard.svelte b/web/src/lib/components/AuthenticationCard.svelte
index 83e00ab..2db5cbe 100644
--- a/web/src/lib/components/AuthenticationCard.svelte
+++ b/web/src/lib/components/AuthenticationCard.svelte
@@ -147,31 +147,35 @@
 
             <!-- DKIM (Required) -->
             <div class="list-group-item" id="authentication-dkim">
-                <div class="d-flex align-items-start">
-                    {#if authentication.dkim && authentication.dkim.length > 0}
-                        <i class="bi {getAuthResultIcon(authentication.dkim[0].result, true)} {getAuthResultClass(authentication.dkim[0].result, true)} me-2 fs-5"></i>
-                        <div>
-                            <strong>DKIM</strong>
-                            <span class="text-uppercase ms-2 {getAuthResultClass(authentication.dkim[0].result, true)}">
-                                {authentication.dkim[0].result}
-                            </span>
-                            {#if authentication.dkim[0].domain}
-                                <div class="small">
-                                    <strong>Domain:</strong>
-                                    <span class="text-muted">{authentication.dkim[0].domain}</span>
-                                </div>
-                            {/if}
-                            {#if authentication.dkim[0].selector}
-                                <div class="small">
-                                    <strong>Selector:</strong>
-                                    <span class="text-muted">{authentication.dkim[0].selector}</span>
-                                </div>
-                            {/if}
-                            {#if authentication.dkim[0].details}
-                                <pre class="p-2 mb-0 {$theme === 'light' ? 'bg-light' : 'bg-secondary'} text-muted small" style="white-space: pre-wrap">{authentication.dkim[0].details}</pre>
-                            {/if}
+                {#if authentication.dkim && authentication.dkim.length > 0}
+                    {#each authentication.dkim as dkim, i}
+                        <div class="d-flex align-items-start" class:mt-3={i > 0}>
+                            <i class="bi {getAuthResultIcon(dkim.result, true)} {getAuthResultClass(dkim.result, true)} me-2 fs-5"></i>
+                            <div>
+                                <strong>DKIM{authentication.dkim.length > 1 ? ` #${i + 1}` : ''}</strong>
+                                <span class="text-uppercase ms-2 {getAuthResultClass(dkim.result, true)}">
+                                    {dkim.result}
+                                </span>
+                                {#if dkim.domain}
+                                    <div class="small">
+                                        <strong>Domain:</strong>
+                                        <span class="text-muted">{dkim.domain}</span>
+                                    </div>
+                                {/if}
+                                {#if dkim.selector}
+                                    <div class="small">
+                                        <strong>Selector:</strong>
+                                        <span class="text-muted">{dkim.selector}</span>
+                                    </div>
+                                {/if}
+                                {#if dkim.details}
+                                    <pre class="p-2 mb-0 {$theme === 'light' ? 'bg-light' : 'bg-secondary'} text-muted small" style="white-space: pre-wrap">{dkim.details}</pre>
+                                {/if}
+                            </div>
                         </div>
-                    {:else}
+                    {/each}
+                {:else}
+                    <div class="d-flex align-items-start">
                         <i class="bi {getAuthResultIcon('missing', true)} {getAuthResultClass('missing', true)} me-2 fs-5"></i>
                         <div>
                             <strong>DKIM</strong>
@@ -180,8 +184,8 @@
                             </span>
                             <div class="text-muted small">DKIM signature is required for proper email authentication</div>
                         </div>
-                    {/if}
-                </div>
+                    </div>
+                {/if}
             </div>
 
             <!-- X-Google-DKIM (Optional) -->