happyDomain/happyDeliver
2
0
Fork 0
Code Issues 10 Pull requests 5 Projects Releases Packages Wiki Activity Actions

Return nil from spam analyzers when primary headers are missing

Browse source 
Bug: https://github.com/happyDomain/happydeliver/issues/11
This commit is contained in:
nemunaire 2026-03-25 11:29:36 +07:00
commit 2fcee1b885
2 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pkg/analyzer/rspamd.go
View file

@ -51,6 +51,13 @@ func (a *RspamdAnalyzer) AnalyzeRspamd(email *EmailMessage) *api.RspamdResult {
return nil 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{ result := &api.RspamdResult{
Symbols: make(map[string]api.RspamdSymbol), Symbols: make(map[string]api.RspamdSymbol),
} }

8
pkg/analyzer/spamassassin.go
View file

@ -45,6 +45,14 @@ func (a *SpamAssassinAnalyzer) AnalyzeSpamAssassin(email *EmailMessage) *api.Spa
return nil 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{ result := &api.SpamAssassinResult{
TestDetails: make(map[string]api.SpamTestDetail), TestDetails: make(map[string]api.SpamTestDetail),
} }