infrastructure/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2025-07-03 09:48:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix not adding duplicate domains to the list of "verified dkim domains" for incoming messages

Browse Source
This commit is contained in:
Mechiel Lukkien 2023-09-11 11:37:45 +02:00
parent cb1b133e28
commit a5006a9090
No known key found for this signature in database
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
smtpserver/server.go
View File

@ -2124,16 +2124,16 @@ func (c *conn) deliver(ctx context.Context, recvHdrFor func(string) string, msgW
// Prepare for analyzing content, calculating reputation. // Prepare for analyzing content, calculating reputation.
ipmasked1, ipmasked2, ipmasked3 := ipmasked(c.remoteIP) ipmasked1, ipmasked2, ipmasked3 := ipmasked(c.remoteIP)
var verifiedDKIMDomains []string var verifiedDKIMDomains []string
dkimSeen := map[string]bool{}
for _, r := range dkimResults { for _, r := range dkimResults {
// A message can have multiple signatures for the same identity. For example when // A message can have multiple signatures for the same identity. For example when
// signing the message multiple times with different algorithms (rsa and ed25519). // signing the message multiple times with different algorithms (rsa and ed25519).
seen := map[string]bool{}
if r.Status != dkim.StatusPass { if r.Status != dkim.StatusPass {
continue continue
} }
d := r.Sig.Domain.Name() d := r.Sig.Domain.Name()
if !seen[d] { if !dkimSeen[d] {
seen[d] = true dkimSeen[d] = true
verifiedDKIMDomains = append(verifiedDKIMDomains, d) verifiedDKIMDomains = append(verifiedDKIMDomains, d)
} }
} }