[1.3.0] Security and quality after 1.2.5: domain-admin send-log authorization, fail-closed sign-in and application delete, level-2 rate-limit race fix, restore Resync, expanded tests, operator docs, release CI, and OFL for IBM Plex. Upgrading from 1.2.x is a tag bump; no migration. Added: - licence: the SIL Open Font License 1.1 text now travels with the IBM Plex - docs: agreed roadmap item **queue-retries** — show this Postfix's retry Security: - The independent security review of the send-log authorization and Fixed: - test (e2e): send-log status scrapers follow the badge markup in - security (panel): the Deliveries list is scoped to a domain administrator's - mail (level-2 rate limit): the ceiling is no longer overshot by messages that - panel (sign-in): a session that cannot be written to the database no longer - panel (applications): deleting an application removes its SASL credentials … (2 more in CHANGELOG) Changed: - docs: operator and as-built docs aligned with the code after a full - docs: [guide.md](docs/guide.md) reorganised into **Installation**, **Instance - docs: the 2026-08-13 full-tree review plan is complete — every phase (P0–P7) - licence: [NOTICE](NOTICE) tells modifiers to update `SourceURL` in - ci: the release image is published only for a **published** GitHub Release … (9 more in CHANGELOG) [1.3.1] Retry policy in the panel, persistent Postfix queue, and self-contained full backups. Mail queue and delivery history show this Postfix's first retry, backoff cap, and queue lifetime. Deferred mail survives container recreate. Full backups now archive `data/`, compose, `.env`, and `certs/`; the archive layout breaks 1.3.0 flat backups (unpack those with `tar xzf backup.tar.gz -C ./data` as before). Upgrading from 1.3.0 is a tag bump; no schema migration. Added: - Mail queue and a delivery's history show this Postfix's retry policy - docs: **Plan checklists** in [development.md](docs/development.md) — format, - docs: **Implementation checklists** with model routing in - docs: roadmap candidates **send-log-retention** (panel Settings for delivery - Postfix queue under `/data/postfix/queue` — deferred and active mail survive … (1 more in CHANGELOG) Changed: - **Breaking:** full-backup archive layout — paths are prefixed with `data/`; - docs: operator guide, architecture, security, and backup UI updated for - docs: HTML mockups for a full panel UI refresh Changed: - docs: panel UI mockups after review — Status restored to live readings - docs: panel UI design system and mockups rebuilt as separate pages - docs: panel UI mockups — add-domain sits in the list card (Domains and Fixed: - ci (GHCR): per-arch package tags (`X.Y.Z-amd64`, `X.Y.Z-arm64`) are dropped Squashed CHANGELOG sections: [1.3.0], [1.3.1]. Full detail: CHANGELOG.md (1.3.0, 1.3.1).
171 lines
6.2 KiB
Go
171 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"
|
|
"os/exec"
|
|
"path/filepath"
|
|
"sort"
|
|
"strings"
|
|
)
|
|
|
|
// 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)
|
|
}
|
|
|
|
// 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 address == "" || login == "" {
|
|
return fmt.Errorf("postfix: empty address or login")
|
|
}
|
|
if strings.ContainsAny(address, " \t\r\n,:\\") {
|
|
return fmt.Errorf("postfix: unsafe character in address %q", address)
|
|
}
|
|
if strings.ContainsAny(login, " \t\r\n,:@\\") {
|
|
return fmt.Errorf("postfix: unsafe character in login %q", login)
|
|
}
|
|
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 {
|
|
cmd := exec.Command("supervisorctl",
|
|
"-c", "/etc/supervisor/supervisord.conf",
|
|
"start", "postfix-reload")
|
|
out, err := cmd.CombinedOutput()
|
|
if err != nil {
|
|
// A reload already in flight is not a failure: that pending run reloads
|
|
// Postfix after our file is in place (the file is written before this).
|
|
if strings.Contains(string(out), "already started") {
|
|
return nil
|
|
}
|
|
return fmt.Errorf("reload postfix via supervisor: %w: %s", err, strings.TrimSpace(string(out)))
|
|
}
|
|
return nil
|
|
}
|