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

accept incoming DMARC and TLS reports with reporting addresses containing catchall separator(s)

Browse Source 
Such as "-" when addresses are dmarc-reports@ and tls-reports@.

Existing configuration files can have these combinations. We don't allow them
to be created through the webadmin interface, as this is a likely source of
confusion about how addresses will be matched. We already didn't allow regular
addresses containing catchall separators.
This commit is contained in:
Mechiel Lukkien
2025-04-18 12:34:07 +02:00
parent 4eddf5885d
commit 794ef75d17
11 changed files with 175 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mox-/config.go
View File

@ -1747,6 +1747,8 @@ func prepareDynamicConfig(ctx context.Context, log mlog.Log, dynamicPath string,
if _, ok := c.Accounts[dmarc.Account]; !ok {
addDomainErrorf("DMARC account %q does not exist", dmarc.Account)
}
// Note: For backwards compabilitiy, DMARC reporting localparts can contain catchall separators.
lp, err := smtp.ParseLocalpart(dmarc.Localpart)
if err != nil {
addDomainErrorf("invalid DMARC localpart %q: %s", dmarc.Localpart, err)
@ -1760,9 +1762,13 @@ func prepareDynamicConfig(ctx context.Context, log mlog.Log, dynamicPath string,
addrdom, err = dns.ParseDomain(dmarc.Domain)
if err != nil {
addDomainErrorf("DMARC domain %q: %s", dmarc.Domain, err)
} else if _, ok := c.Domains[addrdom.Name()]; !ok {
} else if adomain, ok := c.Domains[addrdom.Name()]; !ok {
addDomainErrorf("unknown domain %q for DMARC address", addrdom)
} else if !adomain.LocalpartCaseSensitive {
lp = smtp.Localpart(strings.ToLower(string(lp)))
}
} else if !domain.LocalpartCaseSensitive {
lp = smtp.Localpart(strings.ToLower(string(lp)))
}
if addrdom == domain.Domain {
domainHasAddress[addrdom.Name()] = true
@ -1793,6 +1799,8 @@ func prepareDynamicConfig(ctx context.Context, log mlog.Log, dynamicPath string,
if _, ok := c.Accounts[tlsrpt.Account]; !ok {
addDomainErrorf("TLSRPT account %q does not exist", tlsrpt.Account)
}
// Note: For backwards compabilitiy, TLS reporting localparts can contain catchall separators.
lp, err := smtp.ParseLocalpart(tlsrpt.Localpart)
if err != nil {
addDomainErrorf("invalid TLSRPT localpart %q: %s", tlsrpt.Localpart, err)
@ -1807,9 +1815,13 @@ func prepareDynamicConfig(ctx context.Context, log mlog.Log, dynamicPath string,
addrdom, err = dns.ParseDomain(tlsrpt.Domain)
if err != nil {
addDomainErrorf("TLSRPT domain %q: %s", tlsrpt.Domain, err)
} else if _, ok := c.Domains[addrdom.Name()]; !ok {
} else if adomain, ok := c.Domains[addrdom.Name()]; !ok {
addDomainErrorf("unknown domain %q for TLSRPT address", tlsrpt.Domain)
} else if !adomain.LocalpartCaseSensitive {
lp = smtp.Localpart(strings.ToLower(string(lp)))
}
} else if !domain.LocalpartCaseSensitive {
lp = smtp.Localpart(strings.ToLower(string(lp)))
}
if addrdom == domain.Domain {
domainHasAddress[addrdom.Name()] = true