test / test (push) Canceled after 0s
M14, M15: queryEach gives each resolver 2 s within the check's context and asks the one that answered last first; an address or PTR lookup not answered is Unknown, an answered mismatch beside it still an error; Checker.Server keeps the last answer's addresses, so SPF does not go Unknown with it. Notifications report faults only, now tested with SPF unknown alone and beside a wrong DKIM. DMARC reports: tests of malformed XML, gzip and zip bombs, a message over the limit, the service's Resync, hosted suggestion and validation. The finding: both limits cut silently and an oversized report failed as damaged; readAtMost refuses it for its size (MaxMessage 10 MiB, moved into IngestMessage). healthReadings replaces map[string]any for Health and Overview. L5: an inbound upstream has one TLS mode - a second domain to the same [host]:port with another mode is refused, naming the first; the TLS policy map holds each next hop once. Tested on the test server: go vet + go test of 25 packages, make e2e (all pass, 631 s) on this tree. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
181 lines
5.2 KiB
Go
181 lines
5.2 KiB
Go
// Package inbound owns backup-MX / relay-forwarder domains: the SQLite
|
|
// registry and the Postfix lookup tables (relay_domains, transport_maps,
|
|
// relay_recipient_maps, smtp_tls_policy_maps). It does not listen on port 25
|
|
// itself — postfix-config.sh does that when INBOUND_RELAY_ENABLE is true.
|
|
package inbound
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"github.com/mixeme/selfpost/internal/postfix"
|
|
"github.com/mixeme/selfpost/internal/store"
|
|
)
|
|
|
|
// Maps is the slice of the Postfix manager the inbound service needs.
|
|
type Maps interface {
|
|
RebuildInboundMaps(routes []postfix.InboundRoute) error
|
|
}
|
|
|
|
// Service coordinates inbound-domain state across SQLite and the Postfix maps.
|
|
type Service struct {
|
|
store *store.Store
|
|
maps Maps
|
|
}
|
|
|
|
// NewService builds the inbound service over the shared store and Postfix maps.
|
|
func NewService(st *store.Store, maps Maps) *Service {
|
|
return &Service{store: st, maps: maps}
|
|
}
|
|
|
|
// List returns every inbound domain.
|
|
func (s *Service) List() ([]store.InboundDomain, error) {
|
|
return s.store.ListInboundDomains()
|
|
}
|
|
|
|
// Get returns one inbound domain by id.
|
|
func (s *Service) Get(id int64) (store.InboundDomain, error) {
|
|
return s.store.GetInboundDomain(id)
|
|
}
|
|
|
|
// Add validates the domain name, inserts it, and rebuilds the maps.
|
|
func (s *Service) Add(name string) (store.InboundDomain, error) {
|
|
name = normalizeDomain(name)
|
|
if err := checkDomain(name); err != nil {
|
|
return store.InboundDomain{}, err
|
|
}
|
|
d, err := s.store.AddInboundDomain(name)
|
|
if err != nil {
|
|
return store.InboundDomain{}, err
|
|
}
|
|
if err := s.Resync(); err != nil {
|
|
_ = s.store.DeleteInboundDomain(d.ID)
|
|
return store.InboundDomain{}, err
|
|
}
|
|
return d, nil
|
|
}
|
|
|
|
// SetTransport validates and saves the upstream, then rebuilds the maps.
|
|
func (s *Service) SetTransport(id int64, host, portRaw, tlsMode string) error {
|
|
if _, err := s.store.GetInboundDomain(id); err != nil {
|
|
return err
|
|
}
|
|
host = normalizeHost(host)
|
|
if err := checkHost(host); err != nil {
|
|
return err
|
|
}
|
|
port, err := parsePort(portRaw)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if err := checkTLSMode(tlsMode); err != nil {
|
|
return err
|
|
}
|
|
if err := s.checkOneTLSModePerUpstream(id, host, port, tlsMode); err != nil {
|
|
return err
|
|
}
|
|
if err := s.store.UpdateInboundTransport(id, host, port, tlsMode); err != nil {
|
|
return err
|
|
}
|
|
return s.Resync()
|
|
}
|
|
|
|
// checkOneTLSModePerUpstream refuses an upstream another inbound domain
|
|
// already forwards to with another TLS mode. Postfix's TLS policy is keyed by
|
|
// the next hop, not by the domain (smtp_tls_policy_maps; Postfix 3.7.11,
|
|
// README_FILES/TLS_README: the key is the verbatim next-hop), so two domains
|
|
// to one [host]:port share one mode: the map held both keys, and the first by
|
|
// domain name won with a warning - the form's choice for the second domain
|
|
// was not what Postfix did (audit 2026-10-12, L5).
|
|
func (s *Service) checkOneTLSModePerUpstream(id int64, host string, port int, tlsMode string) error {
|
|
domains, err := s.store.ListInboundDomains()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
for _, d := range domains {
|
|
if d.ID == id || d.Port != port || normalizeHost(d.Host) != host || d.TLSMode == tlsMode {
|
|
continue
|
|
}
|
|
return invalid("[%s]:%d is already the upstream of %s, with TLS mode %s: an upstream has one TLS mode - choose %s here, or change it on %s first",
|
|
host, port, d.Name, d.TLSMode, d.TLSMode, d.Name)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// SetRecipients validates the mode and, in list mode, every address, then
|
|
// rebuilds the maps.
|
|
func (s *Service) SetRecipients(id int64, mode string, rawAddresses []string) error {
|
|
d, err := s.store.GetInboundDomain(id)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if err := checkRecipientMode(mode); err != nil {
|
|
return err
|
|
}
|
|
var addrs []string
|
|
if mode == store.RecipientModeList {
|
|
addrs, err = parseRecipientAddresses(rawAddresses, d.Name)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
if err := s.store.UpdateInboundRecipients(id, mode, addrs); err != nil {
|
|
return err
|
|
}
|
|
return s.Resync()
|
|
}
|
|
|
|
// Delete removes the domain and rebuilds the maps.
|
|
func (s *Service) Delete(id int64) error {
|
|
if err := s.store.DeleteInboundDomain(id); err != nil {
|
|
return err
|
|
}
|
|
return s.Resync()
|
|
}
|
|
|
|
// Resync rebuilds the inbound Postfix maps from SQLite.
|
|
func (s *Service) Resync() error {
|
|
list, err := s.store.ListInboundDomains()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
routes := make([]postfix.InboundRoute, 0, len(list))
|
|
for _, d := range list {
|
|
full, err := s.store.GetInboundDomain(d.ID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
routes = append(routes, postfix.InboundRoute{
|
|
Domain: full.Name,
|
|
Host: full.Host,
|
|
Port: full.Port,
|
|
TLSMode: full.TLSMode,
|
|
RecipientMode: full.RecipientMode,
|
|
Recipients: full.Recipients,
|
|
})
|
|
}
|
|
return s.maps.RebuildInboundMaps(routes)
|
|
}
|
|
|
|
func parseRecipientAddresses(raw []string, domain string) ([]string, error) {
|
|
seen := make(map[string]bool)
|
|
out := make([]string, 0, len(raw))
|
|
for _, r := range raw {
|
|
addr := strings.ToLower(strings.TrimSpace(r))
|
|
if addr == "" {
|
|
continue
|
|
}
|
|
if err := checkMailbox(addr, domain); err != nil {
|
|
return nil, err
|
|
}
|
|
if seen[addr] {
|
|
continue
|
|
}
|
|
seen[addr] = true
|
|
out = append(out, addr)
|
|
}
|
|
if len(out) == 0 {
|
|
return nil, invalid("listed-recipients mode requires at least one address")
|
|
}
|
|
return out, nil
|
|
}
|