Owner, 2026-10-18: "Оба предложения делаем"; the mockup is c10cd78. The
security audit's M7: Required is Postfix's encrypt level, which checks no
certificate - it keeps the mail from a listener, not from one who answers
in the upstream's place.
- A fourth TLS mode, Verified, stored as Postfix's level secure (migration
0014 rebuilds inbound_transports with the wider CHECK; schema 14) and
written to the TLS policy map like the others. Postfix matches the
certificate against the next hop's name (smtp_tls_secure_cert_match =
nexthop, dot-nexthop, the default; postconf(5)), so Verified is refused
for an upstream given by address (checkSecureHost).
- Postfix's SMTP client trusts Debian's ca-certificates bundle
(smtp_tls_CAfile): Postfix trusts none by default (DEF_SMTP_TLS_CA_FILE
"", DEF_TLS_APPEND_DEF_CA 0). The levels may and encrypt only log the
verdict, so mail to recipients' MX is unchanged.
- The page: the select's fourth option, a help line under it, the lead
"over verified TLS", the list's tag "verified"; Help word for word with
the mockup; guide § Inbound relay, with a posttls-finger command to try
an upstream first.
Tests: TestVerifiedTLSNeedsTheUpstreamsName, TestRenderInboundMapsSecure,
TestUpstreamTLSModeSecure; schema tests at 14. e2e
inbound_upstream_verified_tls: an address refused, a name saved as
"[sink]:25 secure" in tls_policy, the page says verified, the CA file set
and present, and posttls-finger -l secure with it calls the stand's
self-signed port 25 "Untrusted" (the stand has no TLS upstream). make e2e
(65 passed) and go vet + go test (26 packages) on the test server for this
tree. Tried against the live upstream from the 2.14.5 container:
mc-ent.mixfed.ru gives "Verified TLS connection established".
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
218 lines
6.6 KiB
Go
218 lines
6.6 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 (
|
|
"fmt"
|
|
"strings"
|
|
"sync"
|
|
|
|
"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
|
|
|
|
// resyncMu makes a rebuild's read and write one step, as app.Service's
|
|
// (security audit 2026-10-17, W3; the review of stage 1).
|
|
resyncMu sync.Mutex
|
|
}
|
|
|
|
// 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; the
|
|
// other domains forwarded to the same upstream take its TLS mode with it
|
|
// (SetTransportAs, with every domain changeable).
|
|
func (s *Service) SetTransport(id int64, host, portRaw, tlsMode string) error {
|
|
_, err := s.SetTransportAs(id, host, portRaw, tlsMode, func(store.InboundDomain) bool { return true })
|
|
return err
|
|
}
|
|
|
|
// UpstreamShared refuses an upstream another inbound domain forwards to with
|
|
// another TLS mode, when the one saving may not change that domain. Its text
|
|
// is for the log; the panel tells a domain user the mode, not the domain,
|
|
// which is another tenant's (security review of audit stage 4).
|
|
type UpstreamShared struct {
|
|
Upstream string
|
|
Mode string
|
|
Domain string
|
|
}
|
|
|
|
func (e *UpstreamShared) Error() string {
|
|
return fmt.Sprintf("%s is the upstream of %s too, with TLS mode %s", e.Upstream, e.Domain, e.Mode)
|
|
}
|
|
|
|
// SetTransportAs validates and saves the upstream of domain id, then rebuilds
|
|
// the maps. An upstream has one TLS mode: Postfix's TLS policy is keyed by the
|
|
// next hop, not by the domain (smtp_tls_policy_maps; Postfix 3.10.13,
|
|
// 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 (audit 2026-10-12, L5). The other domains
|
|
// forwarded to the upstream with another mode take the new one, when
|
|
// mayChange allows each; one it does not is an *UpstreamShared and nothing is
|
|
// saved. Before, the save was refused, and two domains sharing an upstream
|
|
// could never change its mode (review of audit stage 4). changed is how many
|
|
// other domains took the mode.
|
|
func (s *Service) SetTransportAs(id int64, host, portRaw, tlsMode string, mayChange func(store.InboundDomain) bool) (changed int, err error) {
|
|
if _, err := s.store.GetInboundDomain(id); err != nil {
|
|
return 0, err
|
|
}
|
|
host = normalizeHost(host)
|
|
if err := checkHost(host); err != nil {
|
|
return 0, err
|
|
}
|
|
port, err := parsePort(portRaw)
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
if err := checkTLSMode(tlsMode); err != nil {
|
|
return 0, err
|
|
}
|
|
if err := checkSecureHost(host, tlsMode); err != nil {
|
|
return 0, err
|
|
}
|
|
domains, err := s.store.ListInboundDomains()
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
var others []store.InboundDomain
|
|
for _, d := range domains {
|
|
if d.ID == id || d.Port != port || normalizeHost(d.Host) != host || d.TLSMode == tlsMode {
|
|
continue
|
|
}
|
|
if !mayChange(d) {
|
|
return 0, &UpstreamShared{Upstream: fmt.Sprintf("[%s]:%d", host, port), Mode: d.TLSMode, Domain: d.Name}
|
|
}
|
|
others = append(others, d)
|
|
}
|
|
if err := s.store.UpdateInboundTransport(id, host, port, tlsMode); err != nil {
|
|
return 0, err
|
|
}
|
|
for _, d := range others {
|
|
if err := s.store.UpdateInboundTransport(d.ID, d.Host, d.Port, tlsMode); err != nil {
|
|
return 0, err
|
|
}
|
|
}
|
|
return len(others), s.Resync()
|
|
}
|
|
|
|
// 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 {
|
|
s.resyncMu.Lock()
|
|
defer s.resyncMu.Unlock()
|
|
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
|
|
}
|