mixandClaude Opus 5.5
6023feb405
test / test (push) Canceled after 0s
The last stage of the 2026-10-12 audit; no cut. Doc drift: architecture.md (the sender check in § OpenDKIM, the limit: row's 48 hours, the inbound log and filter-list routes and who may open them, migrations to 0011 and every table, KitPage as production data, Reload configuration as a restore writes, the panel's roles counted), schema-migrations.md (tables and columns since v2), guide.md (a delivery's lines go at the next prune; INBOUND_JOURNAL_MILTER_SOCKET moved to architecture.md's internal list), development.md (the env guard, the deferral the e2e proves, its fixed sleeps), roadmap.md. Comments say what the code does now; TestBaselineIsTheOnlyMigration is TestChainStartsAtTheBaseline; the milter package doc names its three milters. Dead code gone: view.Facts, dmarc HostedSuggestion and ValidateHostedAddress, app UpdateMode (each with the test that alone kept it), the method checks the method-bound routes made dead; Settings.WithResult calls resultFlash. staticcheck 2026.1 in test.yml on both modules, clean: the e2e package builds without its tests now (a test and two constants moved out of non-test files), three findings fixed. The test moved, TestImageBuildPreservesLogrotateMode, had sat in a non-test file and never run; run, it failed on the entrypoint (docker run without a hostname) and now asks with --entrypoint stat. The test gaps no step named, each closed: follow() with mail.log gone past blindMin and made again; CheckRestore with a manifest that is not JSON; the origin check with a port; every /server/ pattern in web.go through server() and in the routes table (it found GET /server/health/fragment missing from the table - guarded, not tested); L9 as the owner decided it on 2026-10-12, the comment on senderSession.Headers and the test passing an h that holds the earlier messages' From:. Plan stage 6 ticked; roadmap audit row done, 81/81. Tested on the test server: go vet + go test of 27 packages, make e2e (all pass, 513 s) on this tree; staticcheck locally on both modules. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
96 lines
2.6 KiB
Go
96 lines
2.6 KiB
Go
// Package dmarc receives DMARC aggregate reports: Postfix pipes messages here,
|
|
// gzip/XML is parsed, and summaries land in SQLite for the panel.
|
|
package dmarc
|
|
|
|
import (
|
|
"sort"
|
|
"strings"
|
|
|
|
"github.com/mixeme/selfpost/internal/dnscheck"
|
|
"github.com/mixeme/selfpost/internal/postfix"
|
|
"github.com/mixeme/selfpost/internal/store"
|
|
)
|
|
|
|
// Maps is the Postfix manager surface the DMARC service needs.
|
|
type Maps interface {
|
|
RebuildDMARCMaps(cfg postfix.DMARCMapsConfig) error
|
|
}
|
|
|
|
// Service coordinates DMARC ingest allow-lists across SQLite and Postfix.
|
|
type Service struct {
|
|
store *store.Store
|
|
maps Maps
|
|
hostname string
|
|
enabled bool
|
|
}
|
|
|
|
// NewService builds the DMARC ingest service.
|
|
func NewService(st *store.Store, maps Maps, hostname string, enabled bool) *Service {
|
|
return &Service{store: st, maps: maps, hostname: strings.ToLower(strings.TrimSpace(hostname)), enabled: enabled}
|
|
}
|
|
|
|
// Enabled reports whether DMARC ingest is active in this deployment.
|
|
func (s *Service) Enabled() bool { return s.enabled }
|
|
|
|
// Resync rebuilds the Postfix allow-list and transport maps from SQLite.
|
|
func (s *Service) Resync() error {
|
|
if !s.enabled {
|
|
return s.maps.RebuildDMARCMaps(postfix.DMARCMapsConfig{})
|
|
}
|
|
addrs, err := s.AllowedRecipients()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
domains := recipientDomains(addrs)
|
|
return s.maps.RebuildDMARCMaps(postfix.DMARCMapsConfig{
|
|
Recipients: addrs,
|
|
Domains: domains,
|
|
})
|
|
}
|
|
|
|
// AllowedRecipients returns every address Postfix may accept for DMARC ingest.
|
|
func (s *Service) AllowedRecipients() ([]string, error) {
|
|
if !s.enabled || s.hostname == "" {
|
|
return nil, nil
|
|
}
|
|
seen := make(map[string]bool)
|
|
var out []string
|
|
add := func(addr string) {
|
|
addr = strings.ToLower(strings.TrimSpace(addr))
|
|
if addr == "" || !IsHostedOnHostname(addr, s.hostname) || seen[addr] {
|
|
return
|
|
}
|
|
seen[addr] = true
|
|
out = append(out, addr)
|
|
}
|
|
// Only what a domain has chosen is open: its report address opens the
|
|
// mailbox it names, if that is on this host. There is no mailbox for the
|
|
// server as a whole.
|
|
domains, err := s.store.ListDomains()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
for _, d := range domains {
|
|
// add keeps only addresses on this host, so a domain reporting elsewhere
|
|
// (or nowhere) opens nothing here.
|
|
add(d.DMARCRua)
|
|
}
|
|
sort.Strings(out)
|
|
return out, nil
|
|
}
|
|
|
|
func recipientDomains(addrs []string) []string {
|
|
seen := make(map[string]bool)
|
|
var out []string
|
|
for _, addr := range addrs {
|
|
d := dnscheck.EmailDomain(addr)
|
|
if d == "" || seen[d] {
|
|
continue
|
|
}
|
|
seen[d] = true
|
|
out = append(out, d)
|
|
}
|
|
sort.Strings(out)
|
|
return out
|
|
}
|