mixandClaude Opus 5
23d52bab7c
test / test (push) Has been cancelled
Review pass over the 1.4.0-1.9.1 work. Port 25 no longer inherits main.cf's submission milter chain: smtpd_milters is always overridden on smtp/inet, to the antispam milter or to nothing. Without that, OpenDKIM (strict, tempfail) gated relayed mail during a signing outage, and the journal-milter filed inbound mail into the outbound send log under the sender's domain -- so Deliveries showed other people's mail and a forged From: consumed that domain's level-2 budget. architecture.md already described the intended behaviour; the code now matches. DMARC reports are checked before they are stored: the policy domain must be a configured sending domain, and must match the +tag of a per-domain hosted address. The rua address form is predictable, so anyone able to reach it could file reports under any domain and evict genuine ones through the retention cap. Zip attachments are now decompressed as well as gzip. The auto level-2 ceiling is scaled to the level-1 window before the multiplier is applied; any window other than 3600s shifted the allowance by window/3600. Migration 0010 indexes send_log(app_login, created_at) -- both the per-MAIL FROM rate-limit count and the per-application statistics were scanning the created_at range. e2e now regenerates the Postfix config in-container for all four port-25 flag combinations and requires postfix check to pass; the 1.9.1 crash-loop shipped in 1.4.0 and survived three releases because only the flags-off path was exercised. Migration 0009 stays as shipped -- its conversion branch only fires for a database carrying application-scope allowed_ips from before 1.9.0. The schema reference notes that the old list was permissive and the new column is restrictive; the guide documents the allow-list as a sending control on a fail-open path, not an authentication boundary. Also: gofmt across cmd/ and internal/, unused duplicate validators dropped from internal/web/validate, export no longer swallows store errors. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
50 lines
1.6 KiB
Go
50 lines
1.6 KiB
Go
package dmarc
|
|
|
|
import (
|
|
"strings"
|
|
)
|
|
|
|
// DefaultLocalPart is the mailbox local-part for the panel-wide hosted address.
|
|
const DefaultLocalPart = "dmarc-reports"
|
|
|
|
// HostedReportAddress is the per-domain SelfPost-hosted rua= destination.
|
|
func HostedReportAddress(hostname, domain string) string {
|
|
hostname = strings.ToLower(strings.TrimSpace(hostname))
|
|
domain = strings.ToLower(strings.TrimSpace(domain))
|
|
return DefaultLocalPart + "+" + domain + "@" + hostname
|
|
}
|
|
|
|
// DefaultHostedReportAddress is the settings-level hosted rua= when ingest is on.
|
|
func DefaultHostedReportAddress(hostname string) string {
|
|
return DefaultLocalPart + "@" + strings.ToLower(strings.TrimSpace(hostname))
|
|
}
|
|
|
|
// IsHostedOnHostname reports whether addr is delivered locally on hostname.
|
|
func IsHostedOnHostname(addr, hostname string) bool {
|
|
addr = strings.ToLower(strings.TrimSpace(addr))
|
|
hostname = strings.ToLower(strings.TrimSpace(hostname))
|
|
if hostname == "" || !strings.Contains(addr, "@") {
|
|
return false
|
|
}
|
|
at := strings.LastIndex(addr, "@")
|
|
return addr[at+1:] == hostname
|
|
}
|
|
|
|
// TaggedDomain returns the domain a hosted report address is tagged for
|
|
// (dmarc-reports+<domain>@<hostname> → <domain>), or "" when addr carries no
|
|
// such tag. Used to check a report's claimed domain against the address it
|
|
// actually arrived at.
|
|
func TaggedDomain(addr string) string {
|
|
addr = strings.ToLower(strings.TrimSpace(addr))
|
|
at := strings.LastIndex(addr, "@")
|
|
if at <= 0 {
|
|
return ""
|
|
}
|
|
local := addr[:at]
|
|
plus := strings.Index(local, "+")
|
|
if plus < 0 || local[:plus] != DefaultLocalPart {
|
|
return ""
|
|
}
|
|
return local[plus+1:]
|
|
}
|