From 2fcee1b8857c8c2a991d22fd30bfe0a41f271c88 Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Wed, 25 Mar 2026 11:29:36 +0700
Subject: [PATCH] Return nil from spam analyzers when primary headers are
 missing

Bug: https://github.com/happyDomain/happydeliver/issues/11
---
 pkg/analyzer/rspamd.go       | 7 +++++++
 pkg/analyzer/spamassassin.go | 8 ++++++++
 2 files changed, 15 insertions(+)

diff --git a/pkg/analyzer/rspamd.go b/pkg/analyzer/rspamd.go
index f3f548b..3fed81d 100644
--- a/pkg/analyzer/rspamd.go
+++ b/pkg/analyzer/rspamd.go
@@ -51,6 +51,13 @@ func (a *RspamdAnalyzer) AnalyzeRspamd(email *EmailMessage) *api.RspamdResult {
 		return nil
 	}
 
+	// Require at least X-Spamd-Result or X-Rspamd-Score to produce a meaningful report
+	_, hasSpamdResult := headers["X-Spamd-Result"]
+	_, hasRspamdScore := headers["X-Rspamd-Score"]
+	if !hasSpamdResult && !hasRspamdScore {
+		return nil
+	}
+
 	result := &api.RspamdResult{
 		Symbols: make(map[string]api.RspamdSymbol),
 	}
diff --git a/pkg/analyzer/spamassassin.go b/pkg/analyzer/spamassassin.go
index 7964af2..d6ae961 100644
--- a/pkg/analyzer/spamassassin.go
+++ b/pkg/analyzer/spamassassin.go
@@ -45,6 +45,14 @@ func (a *SpamAssassinAnalyzer) AnalyzeSpamAssassin(email *EmailMessage) *api.Spa
 		return nil
 	}
 
+	// Require at least X-Spam-Status, X-Spam-Score, or X-Spam-Flag to produce a meaningful report
+	_, hasStatus := headers["X-Spam-Status"]
+	_, hasScore := headers["X-Spam-Score"]
+	_, hasFlag := headers["X-Spam-Flag"]
+	if !hasStatus && !hasScore && !hasFlag {
+		return nil
+	}
+
 	result := &api.SpamAssassinResult{
 		TestDetails: make(map[string]api.SpamTestDetail),
 	}