[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).
136 lines
4.2 KiB
Go
136 lines
4.2 KiB
Go
package postfix
|
|
|
|
import (
|
|
"fmt"
|
|
"log"
|
|
"os/exec"
|
|
"strings"
|
|
"time"
|
|
)
|
|
|
|
// RetryPolicy is this Postfix's deferred-mail retry timings, as postconf
|
|
// reports them. The panel loads it once at HTTP start (architecture.md) and
|
|
// never re-reads it for a request.
|
|
type RetryPolicy struct {
|
|
QueueRunDelay time.Duration
|
|
MinimalBackoff time.Duration
|
|
MaximalBackoff time.Duration
|
|
MaximalQueueLifetime time.Duration
|
|
BounceQueueLifetime time.Duration
|
|
DelayWarningTime time.Duration
|
|
// FromDefaults is true when postconf could not be read and the compiled-in
|
|
// Postfix 3.x values were substituted. The Mail queue card shows a muted
|
|
// note in that case so an operator who overrode the parameters is not
|
|
// silently shown the stock numbers.
|
|
FromDefaults bool
|
|
}
|
|
|
|
// DefaultRetryPolicy is Postfix 3.x compiled-in values for the six parameters
|
|
// build/postfix-config.sh does not set. Used when postconf is missing (unit
|
|
// tests, a binary outside the container) so the panel still starts.
|
|
func DefaultRetryPolicy() RetryPolicy {
|
|
return RetryPolicy{
|
|
QueueRunDelay: 300 * time.Second,
|
|
MinimalBackoff: 300 * time.Second,
|
|
MaximalBackoff: 4000 * time.Second,
|
|
MaximalQueueLifetime: 5 * 24 * time.Hour,
|
|
BounceQueueLifetime: 5 * 24 * time.Hour,
|
|
DelayWarningTime: 0,
|
|
FromDefaults: true,
|
|
}
|
|
}
|
|
|
|
// retryConfKeys is the fixed argv tail for `postconf -h`. Order matches the
|
|
// fields of RetryPolicy. No user input is interpolated (security.md).
|
|
var retryConfKeys = []string{
|
|
"queue_run_delay",
|
|
"minimal_backoff_time",
|
|
"maximal_backoff_time",
|
|
"maximal_queue_lifetime",
|
|
"bounce_queue_lifetime",
|
|
"delay_warning_time",
|
|
}
|
|
|
|
// readRetryConf runs `postconf -h` for the retry-policy keys. Tests replace it
|
|
// the same way logtail stubs queueIDs.
|
|
var readRetryConf = postconfRetryValues
|
|
|
|
func postconfRetryValues() ([]string, error) {
|
|
// Fixed argv, no user input — same pattern as Queue (security.md).
|
|
cmd := exec.Command("postconf", "-h",
|
|
"queue_run_delay",
|
|
"minimal_backoff_time",
|
|
"maximal_backoff_time",
|
|
"maximal_queue_lifetime",
|
|
"bounce_queue_lifetime",
|
|
"delay_warning_time",
|
|
)
|
|
out, err := cmd.CombinedOutput()
|
|
if err != nil {
|
|
return nil, fmt.Errorf("postconf -h: %w: %s", err, strings.TrimSpace(string(out)))
|
|
}
|
|
lines := strings.Split(strings.TrimSpace(string(out)), "\n")
|
|
if len(lines) != len(retryConfKeys) {
|
|
return nil, fmt.Errorf("postconf -h: got %d values, want %d", len(lines), len(retryConfKeys))
|
|
}
|
|
for i := range lines {
|
|
lines[i] = strings.TrimSpace(lines[i])
|
|
}
|
|
return lines, nil
|
|
}
|
|
|
|
// LoadRetryPolicy reads the effective Postfix retry parameters. On any failure
|
|
// it logs a warning and returns DefaultRetryPolicy; the HTTP role must not
|
|
// refuse to start because postconf is absent.
|
|
func LoadRetryPolicy() RetryPolicy {
|
|
lines, err := readRetryConf()
|
|
if err != nil {
|
|
log.Printf("postfix: retry policy: %v; using compiled-in defaults", err)
|
|
return DefaultRetryPolicy()
|
|
}
|
|
p, err := parseRetryPolicy(lines)
|
|
if err != nil {
|
|
log.Printf("postfix: retry policy: %v; using compiled-in defaults", err)
|
|
return DefaultRetryPolicy()
|
|
}
|
|
return p
|
|
}
|
|
|
|
func parseRetryPolicy(lines []string) (RetryPolicy, error) {
|
|
if len(lines) != len(retryConfKeys) {
|
|
return RetryPolicy{}, fmt.Errorf("got %d values, want %d", len(lines), len(retryConfKeys))
|
|
}
|
|
var durs [6]time.Duration
|
|
for i, line := range lines {
|
|
d, err := ParseDuration(line)
|
|
if err != nil {
|
|
return RetryPolicy{}, fmt.Errorf("%s: %w", retryConfKeys[i], err)
|
|
}
|
|
durs[i] = d
|
|
}
|
|
return RetryPolicy{
|
|
QueueRunDelay: durs[0],
|
|
MinimalBackoff: durs[1],
|
|
MaximalBackoff: durs[2],
|
|
MaximalQueueLifetime: durs[3],
|
|
BounceQueueLifetime: durs[4],
|
|
DelayWarningTime: durs[5],
|
|
}, nil
|
|
}
|
|
|
|
// FirstRetry is the human string for the first deferred retry (minimal
|
|
// backoff), shared by the Mail queue card and delivery history.
|
|
func (p RetryPolicy) FirstRetry() string {
|
|
return FormatDuration(p.MinimalBackoff)
|
|
}
|
|
|
|
// BackoffCap is the human string for maximal_backoff_time.
|
|
func (p RetryPolicy) BackoffCap() string {
|
|
return FormatDuration(p.MaximalBackoff)
|
|
}
|
|
|
|
// QueueLifetime is the human string for maximal_queue_lifetime.
|
|
func (p RetryPolicy) QueueLifetime() string {
|
|
return FormatDuration(p.MaximalQueueLifetime)
|
|
}
|