Follows the design and guard commits before it. Written by Sonnet,
reviewed by Opus.
The report address
- Baseline: users.dmarc_default_mode, users.dmarc_default_address and
domains.dmarc_rua_user_id are gone. domains.dmarc_rua alone says
where reports go: '' is no reports (a new domain), the address
SelfPost derives for the domain is the hosted choice (while hosted
reports are on), anything else is a typed address.
- Removed: the user default and its store functions, a domain
following a user, keep / inherit, followCreator, POST /account/dmarc
with its handler, the DMARC box of Account, the user-delete item
about domains losing their address.
- Domain settings offers the three choices; beside the typed address a
"Use my e-mail" button fills in the profile e-mail (panel.js: one
generic data-fill hook; absent without a profile e-mail; it fills,
it does not save).
- The DMARC record's note names the address and no user. This closes
L4 of the security review.
- Domain export / import carries the address as a plain string.
- The ingest allow-list is the generic mailbox plus each domain's
address on this host; the generic mailbox is always open now.
- dev/migrate1x (not in the tree): a 1.x domain that inherited the
instance default gets that address as its own, so no published rua=
changes.
Row actions
- row_action partial (RowAction: Label, Post, Confirm, Danger);
panel.css has the mockup's three rules. A row of the Applications
table is Edit, New password, Delete; the confirmation texts are the
ones the application page's head uses. Both roles, with the checks
of the application page.
Tests cover: a new domain has no reports; each choice saved and shown
selected; hosted refused when hosted reports are off; a bad address
refused with what was typed kept; an untouched save changes nothing in
each state; the fill button with and without a profile e-mail; deleting
a user leaves every domain's address; the row's forms, targets and
confirmations for both roles and a 404 for a stranger.
Known: if hosted reports are switched off later, a stored hosted address
reads as a typed one. docs/guide.md still describes the old choices -
the documentation step.
Evidence
- docs/assets/panel-redesign/evidence/account.png,
out-domain-settings.png, out-domain.png, user-delete.png, help.png:
1440 px wide, headless Edge, real templates served locally with
their fixtures - NOT from the container.
- panel/audit.js on out-domain, out-domain-settings, account, help,
components and user-delete at 1440 and 1280: 1420 texts checked,
problems: [].
- In a browser: the fill button sets the field and does not submit;
the row buttons have the font, size and colour of the Edit link,
Delete the red of the other delete links; data-confirm fires on
both. Hover and focus states were not observed.
- go test -count=1 ./internal/web/... ./internal/store/...
./internal/dmarc/... ./internal/app/... ./internal/inbound/...
./cmd/panel: ok (ten packages; dev/migrate1x also ok).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
116 lines
3.2 KiB
Go
116 lines
3.2 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 (
|
|
"fmt"
|
|
"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)
|
|
}
|
|
// The instance's generic mailbox is always open: it is the address the
|
|
// guide tells a fresh install to publish. A domain's own report address
|
|
// opens the mailbox it names, if that is on this host.
|
|
add(DefaultHostedReportAddress(s.hostname))
|
|
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
|
|
}
|
|
|
|
// HostedSuggestion returns the address the panel should suggest for a domain.
|
|
func (s *Service) HostedSuggestion(domain string) string {
|
|
return HostedReportAddress(s.hostname, domain)
|
|
}
|
|
|
|
// DefaultHostedSuggestion is the settings-level hosted address.
|
|
func (s *Service) DefaultHostedSuggestion() string {
|
|
return DefaultHostedReportAddress(s.hostname)
|
|
}
|
|
|
|
// ValidateHostedAddress ensures addr is on this hostname before saving.
|
|
func (s *Service) ValidateHostedAddress(addr string) error {
|
|
if !IsHostedOnHostname(addr, s.hostname) {
|
|
return fmt.Errorf("hosted report address must be on %s", s.hostname)
|
|
}
|
|
return nil
|
|
}
|