[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).
185 lines
5.3 KiB
Go
185 lines
5.3 KiB
Go
package store
|
|
|
|
import (
|
|
"database/sql"
|
|
"errors"
|
|
"fmt"
|
|
"time"
|
|
|
|
"modernc.org/sqlite"
|
|
sqlite3 "modernc.org/sqlite/lib"
|
|
)
|
|
|
|
// ErrDomainExists is returned by AddDomain when the domain is already managed.
|
|
var ErrDomainExists = errors.New("domain already exists")
|
|
|
|
// ErrDomainNotFound is returned when a domain id/name does not exist.
|
|
var ErrDomainNotFound = errors.New("domain not found")
|
|
|
|
// Domain is a sending domain managed through the panel (product.md §
|
|
// Multi-domain model). The DKIM key material itself lives on disk under /data;
|
|
// this row records the selector and metadata. AppCount is populated by the
|
|
// listing queries, not stored.
|
|
type Domain struct {
|
|
ID int64
|
|
Name string
|
|
DKIMSelector string
|
|
DMARCRua sql.NullString // NULL = inherit profile; Valid+empty = no reports
|
|
CreatedAt time.Time
|
|
AppCount int
|
|
}
|
|
|
|
// AddDomain inserts a new sending domain. The caller is responsible for having
|
|
// validated name (security.md) before it reaches SQL; the query is parameterised
|
|
// regardless. A duplicate name maps to ErrDomainExists.
|
|
func (s *Store) AddDomain(name, selector string) (Domain, error) {
|
|
now := time.Now().UTC()
|
|
res, err := s.db.Exec(
|
|
"INSERT INTO domains (name, dkim_selector, created_at) VALUES (?, ?, ?)",
|
|
name, selector, now.Format(time.RFC3339),
|
|
)
|
|
if err != nil {
|
|
if isUniqueViolation(err) {
|
|
return Domain{}, ErrDomainExists
|
|
}
|
|
return Domain{}, fmt.Errorf("insert domain: %w", err)
|
|
}
|
|
id, err := res.LastInsertId()
|
|
if err != nil {
|
|
return Domain{}, fmt.Errorf("domain id: %w", err)
|
|
}
|
|
return Domain{ID: id, Name: name, DKIMSelector: selector, CreatedAt: now}, nil
|
|
}
|
|
|
|
// ListDomains returns every domain with its bound-application count (product.md),
|
|
// ordered by name.
|
|
func (s *Store) ListDomains() ([]Domain, error) {
|
|
rows, err := s.db.Query(`
|
|
SELECT d.id, d.name, d.dkim_selector, d.dmarc_rua, d.created_at,
|
|
(SELECT COUNT(*) FROM applications a WHERE a.domain_id = d.id)
|
|
FROM domains d
|
|
ORDER BY d.name`)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("list domains: %w", err)
|
|
}
|
|
defer rows.Close()
|
|
|
|
var out []Domain
|
|
for rows.Next() {
|
|
d, err := scanDomain(rows)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
out = append(out, d)
|
|
}
|
|
return out, rows.Err()
|
|
}
|
|
|
|
// ListDomainsForUser returns domains assigned to userID with application counts,
|
|
// ordered by name.
|
|
func (s *Store) ListDomainsForUser(userID int64) ([]Domain, error) {
|
|
rows, err := s.db.Query(`
|
|
SELECT d.id, d.name, d.dkim_selector, d.dmarc_rua, d.created_at,
|
|
(SELECT COUNT(*) FROM applications a WHERE a.domain_id = d.id)
|
|
FROM domains d
|
|
INNER JOIN user_domains ud ON ud.domain_id = d.id
|
|
WHERE ud.user_id = ?
|
|
ORDER BY d.name`, userID)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("list domains for user: %w", err)
|
|
}
|
|
defer rows.Close()
|
|
|
|
var out []Domain
|
|
for rows.Next() {
|
|
d, err := scanDomain(rows)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
out = append(out, d)
|
|
}
|
|
return out, rows.Err()
|
|
}
|
|
|
|
// GetDomain returns a single domain (with its application count) by id, or
|
|
// ErrDomainNotFound.
|
|
func (s *Store) GetDomain(id int64) (Domain, error) {
|
|
row := s.db.QueryRow(`
|
|
SELECT d.id, d.name, d.dkim_selector, d.dmarc_rua, d.created_at,
|
|
(SELECT COUNT(*) FROM applications a WHERE a.domain_id = d.id)
|
|
FROM domains d
|
|
WHERE d.id = ?`, id)
|
|
d, err := scanDomain(row)
|
|
if errors.Is(err, sql.ErrNoRows) {
|
|
return Domain{}, ErrDomainNotFound
|
|
}
|
|
if err != nil {
|
|
return Domain{}, err
|
|
}
|
|
return d, nil
|
|
}
|
|
|
|
// DeleteDomain removes a domain. Its applications and their address/binding rows
|
|
// go with it via ON DELETE CASCADE (product.md). Returns ErrDomainNotFound if no
|
|
// such row existed.
|
|
func (s *Store) DeleteDomain(id int64) error {
|
|
res, err := s.db.Exec("DELETE FROM domains WHERE id = ?", id)
|
|
if err != nil {
|
|
return fmt.Errorf("delete domain: %w", err)
|
|
}
|
|
n, err := res.RowsAffected()
|
|
if err != nil {
|
|
return fmt.Errorf("delete domain rows: %w", err)
|
|
}
|
|
if n == 0 {
|
|
return ErrDomainNotFound
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// scanRow is the minimal surface shared by *sql.Row and *sql.Rows.
|
|
type scanRow interface {
|
|
Scan(dest ...any) error
|
|
}
|
|
|
|
func scanDomain(r scanRow) (Domain, error) {
|
|
var (
|
|
d Domain
|
|
createdAt string
|
|
)
|
|
if err := r.Scan(&d.ID, &d.Name, &d.DKIMSelector, &d.DMARCRua, &createdAt, &d.AppCount); err != nil {
|
|
return Domain{}, err
|
|
}
|
|
d.CreatedAt, _ = time.Parse(time.RFC3339, createdAt)
|
|
return d, nil
|
|
}
|
|
|
|
// isUniqueViolation reports whether err is a SQLite UNIQUE/PRIMARY-KEY conflict,
|
|
// so callers can turn a duplicate insert into a friendly domain-level error.
|
|
func isUniqueViolation(err error) bool {
|
|
var se *sqlite.Error
|
|
if errors.As(err, &se) {
|
|
code := se.Code()
|
|
return code == sqlite3.SQLITE_CONSTRAINT_UNIQUE || code == sqlite3.SQLITE_CONSTRAINT_PRIMARYKEY
|
|
}
|
|
return false
|
|
}
|
|
|
|
// UpdateDomainDMARCRua sets how this domain resolves its DMARC rua= destination.
|
|
// NULL means inherit the administrator profile; Valid with an empty string means
|
|
// policy-only with no aggregate reports for this domain.
|
|
func (s *Store) UpdateDomainDMARCRua(id int64, rua sql.NullString) error {
|
|
res, err := s.db.Exec("UPDATE domains SET dmarc_rua = ? WHERE id = ?", rua, id)
|
|
if err != nil {
|
|
return fmt.Errorf("update domain dmarc rua: %w", err)
|
|
}
|
|
n, err := res.RowsAffected()
|
|
if err != nil {
|
|
return fmt.Errorf("update domain dmarc rua rows: %w", err)
|
|
}
|
|
if n == 0 {
|
|
return ErrDomainNotFound
|
|
}
|
|
return nil
|
|
}
|