Review pass over `1.4.0`…`1.9.1`: port 25 no longer shares the submission milter chain, DMARC reports are validated before they are stored, and the auto rate limit is correct for a non-default level-1 window. Schema migration `0010` (index only). Upgrading is a tag bump. Added: - SQLite migration `0010_send_log_app_login_index.sql` — - DMARC aggregate reports are accepted as **zip** as well as gzip or plain XML - e2e: `checkPort25ConfigCombinations` regenerates the Postfix configuration Changed: - README hero line and a **Positioning** block in `docs/product.md` record the Fixed: - The setup account's password is hashed at bcrypt cost `12` like every other - Login/setup rate limiter: protecting blocked buckets from eviction is now - `postqueue -p` output is bounded to 4 MiB (the timeout alone left the size of - [schema-migrations.md](docs/schema-migrations.md): the schema section was - postqueue reader is now time-bounded: `postqueue -p` runs under a 5-second … (11 more in CHANGELOG) Changed: - [roadmap.md](docs/roadmap.md) now carries everything the 2026-08-19 code - Extracted `internal/configsafe` — the empty-value and forbidden-character - Build, deploy and migration comments no longer cite the archived - Dropped the `parseDomainRateLimitForm` / `parseAppRateLimitForm` pass-through - Extracted shared helpers: `internal/atomicfile` (atomic temp-write+rename) and … (7 more in CHANGELOG) Removed: - Unused legacy asset `docs/assets/icon.png` (superseded by the four brand SVGs - Plan documents for already-shipped features: `domain-stats-auto-ratelimit`, Full detail: CHANGELOG.md (1.9.2).
167 lines
6.2 KiB
Go
167 lines
6.2 KiB
Go
// Package postfix owns the Postfix configuration files the panel edits at
|
|
// runtime and the privileged reload that applies them (architecture.md § Mail
|
|
// path, security.md): the smtpd_sender_login_maps table binding each
|
|
// application's SASL login to the sender addresses it may use, plus the relay
|
|
// configuration in main.cf.
|
|
package postfix
|
|
|
|
import (
|
|
"fmt"
|
|
"path/filepath"
|
|
"sort"
|
|
"strings"
|
|
|
|
"github.com/mixeme/selfpost/internal/configsafe"
|
|
"github.com/mixeme/selfpost/internal/supervisor"
|
|
)
|
|
|
|
// Postfix manages the on-disk Postfix state the panel is responsible for. After
|
|
// rewriting a map it asks Postfix to reload.
|
|
type Postfix struct {
|
|
senderLoginMapsPath string
|
|
|
|
// reload asks the running Postfix to re-read its configuration. It is a
|
|
// field so tests can substitute a no-op; the default drives supervisord.
|
|
reload func() error
|
|
}
|
|
|
|
// New builds a manager rooted at dir (typically /data/postfix), the same layout
|
|
// entrypoint.sh prepares. The default reload path signals Postfix through
|
|
// supervisord.
|
|
func New(dir string) *Postfix {
|
|
return &Postfix{
|
|
senderLoginMapsPath: filepath.Join(dir, "sender_login_maps"),
|
|
reload: reloadViaSupervisor,
|
|
}
|
|
}
|
|
|
|
// SenderLoginMapsPath is the absolute path of the generated map, so main.cf
|
|
// can point smtpd_sender_login_maps at it.
|
|
func (p *Postfix) SenderLoginMapsPath() string {
|
|
return p.senderLoginMapsPath
|
|
}
|
|
|
|
// Binding is one sender-address → login pair (architecture.md § Mail path).
|
|
// Address is either a domain wildcard "@example.com" or a specific address
|
|
// "alerts@example.com".
|
|
type Binding struct {
|
|
Address string
|
|
Login string
|
|
}
|
|
|
|
// RebuildSenderLoginMaps regenerates the sender_login_maps file from the full
|
|
// set of bindings and reloads Postfix (architecture.md § Mail path). Full
|
|
// regeneration (rather than incremental edits) keeps the file a pure function
|
|
// of the registry, so add, edit and delete share one idempotent path. The file
|
|
// is written atomically before the reload.
|
|
//
|
|
// Several applications may be authorised for the same address (many-to-one,
|
|
// architecture.md § Mail path) — their logins are merged onto a single line as
|
|
// a comma-separated list, which is how Postfix expects multiple owners of one
|
|
// sender.
|
|
func (p *Postfix) RebuildSenderLoginMaps(bindings []Binding) error {
|
|
content, err := renderSenderLoginMaps(bindings)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if err := writeFileAtomic(p.senderLoginMapsPath, content, 0o640); err != nil {
|
|
return err
|
|
}
|
|
return p.reload()
|
|
}
|
|
|
|
// Reload asks Postfix to re-read its configuration without regenerating any
|
|
// file. It backs the panel's manual reload button (architecture.md § Panel
|
|
// HTTP surface).
|
|
func (p *Postfix) Reload() error {
|
|
return p.reload()
|
|
}
|
|
|
|
// SetReloadHook replaces how configuration is applied after a rebuild. Tests
|
|
// that cannot reach supervisord use this to verify file regeneration alone.
|
|
func (p *Postfix) SetReloadHook(fn func() error) {
|
|
if fn != nil {
|
|
p.reload = fn
|
|
}
|
|
}
|
|
|
|
// renderSenderLoginMaps builds the sender_login_maps file contents. Keys are
|
|
// sorted for deterministic output and the logins under each key are sorted and
|
|
// de-duplicated. Every address and login is re-checked for injection safety
|
|
// before being written (security.md) — upstream validation already guarantees
|
|
// this, but the writer refuses to emit anything unsafe as a hard backstop.
|
|
func renderSenderLoginMaps(bindings []Binding) ([]byte, error) {
|
|
byAddr := make(map[string][]string)
|
|
order := make([]string, 0)
|
|
for _, b := range bindings {
|
|
if err := assertMapSafe(b.Address, b.Login); err != nil {
|
|
return nil, err
|
|
}
|
|
if _, seen := byAddr[b.Address]; !seen {
|
|
order = append(order, b.Address)
|
|
}
|
|
byAddr[b.Address] = appendUnique(byAddr[b.Address], b.Login)
|
|
}
|
|
sort.Strings(order)
|
|
|
|
var sb strings.Builder
|
|
for _, addr := range order {
|
|
logins := byAddr[addr]
|
|
sort.Strings(logins)
|
|
// texthash format: <key><whitespace><value>. A comma-separated value lists
|
|
// every login permitted to use this sender (architecture.md § Mail path).
|
|
fmt.Fprintf(&sb, "%s %s\n", addr, strings.Join(logins, ","))
|
|
}
|
|
return []byte(sb.String()), nil
|
|
}
|
|
|
|
func appendUnique(list []string, v string) []string {
|
|
for _, x := range list {
|
|
if x == v {
|
|
return list
|
|
}
|
|
}
|
|
return append(list, v)
|
|
}
|
|
|
|
// What may never reach a sender-map line: whitespace and the newline that would
|
|
// end it, the comma that separates values, the colon a lookup key cannot carry,
|
|
// and the backslash. A login additionally may not carry "@" — that would make it
|
|
// look like an address.
|
|
const (
|
|
senderMapAddressForbidden = " \t\r\n,:\\"
|
|
senderMapLoginForbidden = " \t\r\n,:@\\"
|
|
)
|
|
|
|
// assertMapSafe rejects any address/login value that could break out of a single
|
|
// map line or inject a directive. Addresses are validated to a strict whitelist
|
|
// (letters, digits, '@', '.', '-', '_', '+') and logins to an even stricter one
|
|
// upstream (security.md); this is defence in depth against a validation gap ever
|
|
// letting whitespace, a newline or a comma (the value separator) through into
|
|
// the file (security.md).
|
|
func assertMapSafe(address, login string) error {
|
|
if err := configsafe.Token("address", address, senderMapAddressForbidden); err != nil {
|
|
return fmt.Errorf("postfix: %w", err)
|
|
}
|
|
if err := configsafe.Token("login", login, senderMapLoginForbidden); err != nil {
|
|
return fmt.Errorf("postfix: %w", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// reloadViaSupervisor asks supervisord (PID 1, running as root) to run the
|
|
// one-shot `postfix-reload` program, which executes the canonical `postfix
|
|
// reload` and re-reads main.cf/master.cf and the lookup tables they reference.
|
|
// The panel runs unprivileged: it cannot run `postfix reload` itself, and it
|
|
// cannot signal the Postfix master directly because `postfix start-fg` forks a
|
|
// separate master whose PID supervisord does not track (a SIGHUP to the
|
|
// supervised process would never reach it). Going through supervisord's
|
|
// group-accessible control socket runs the reload as root without any panel
|
|
// privilege (architecture.md § Mail path, security.md).
|
|
//
|
|
// Arguments are fixed literals — no user input is interpolated into the command,
|
|
// and it never goes through a shell (security.md).
|
|
func reloadViaSupervisor() error {
|
|
return supervisor.Start("postfix-reload")
|
|
}
|