[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).
148 lines
5.3 KiB
Go
148 lines
5.3 KiB
Go
package domain
|
|
|
|
import (
|
|
"database/sql"
|
|
"fmt"
|
|
|
|
"github.com/mixeme/selfpost/internal/buildinfo"
|
|
"github.com/mixeme/selfpost/internal/store"
|
|
)
|
|
|
|
// FormatDomainExport identifies a single-domain export file (architecture.md §
|
|
// Persistence).
|
|
const FormatDomainExport = "selfpost-domain-export"
|
|
|
|
// DomainExport is the serialisable form of one sending domain, for moving it
|
|
// between two independently running SelfPost instances (architecture.md §
|
|
// Persistence). It carries the DKIM private key (so the published DNS record
|
|
// stays valid) and each application's working password (so credentials
|
|
// transfer without regeneration). The file is therefore as sensitive as a full
|
|
// backup and must be handled as a secret.
|
|
type DomainExport struct {
|
|
Format string `json:"format"`
|
|
Version string `json:"version"`
|
|
Domain string `json:"domain"`
|
|
DKIMSelector string `json:"dkim_selector"`
|
|
DKIMPrivateKey string `json:"dkim_private_key"` // PKCS#1 PEM
|
|
DMARCRua *string `json:"dmarc_rua,omitempty"` // nil = inherit profile; set = override ("" = none)
|
|
Applications []AppExport `json:"applications"`
|
|
}
|
|
|
|
// AppExport is one application within a DomainExport.
|
|
type AppExport struct {
|
|
Login string `json:"login"`
|
|
AddressMode string `json:"address_mode"`
|
|
Addresses []string `json:"addresses,omitempty"` // list mode only
|
|
Password string `json:"password"`
|
|
}
|
|
|
|
// Export builds the transferable representation of a domain: its DKIM key, its
|
|
// selector and every application with its address mode and working password
|
|
// (architecture.md § Persistence). The returned struct is marshalled to JSON
|
|
// by the caller and offered as a secret download.
|
|
func (s *Service) Export(id int64) (DomainExport, error) {
|
|
d, err := s.store.GetDomain(id)
|
|
if err != nil {
|
|
return DomainExport{}, err
|
|
}
|
|
pem, err := s.odk.ExportKey(d.Name, d.DKIMSelector)
|
|
if err != nil {
|
|
return DomainExport{}, fmt.Errorf("export DKIM key for %s: %w", d.Name, err)
|
|
}
|
|
apps, err := s.store.ListApplicationsByDomain(id)
|
|
if err != nil {
|
|
return DomainExport{}, err
|
|
}
|
|
exp := DomainExport{
|
|
Format: FormatDomainExport,
|
|
Version: buildinfo.Version,
|
|
Domain: d.Name,
|
|
DKIMSelector: d.DKIMSelector,
|
|
DKIMPrivateKey: string(pem),
|
|
Applications: make([]AppExport, 0, len(apps)),
|
|
}
|
|
if d.DMARCRua.Valid {
|
|
s := d.DMARCRua.String
|
|
exp.DMARCRua = &s
|
|
}
|
|
for _, a := range apps {
|
|
password, err := s.apps.Secret(a.Login)
|
|
if err != nil {
|
|
return DomainExport{}, fmt.Errorf("export credential for %s: %w", a.Login, err)
|
|
}
|
|
exp.Applications = append(exp.Applications, AppExport{
|
|
Login: a.Login,
|
|
AddressMode: a.AddressMode,
|
|
Addresses: a.Addresses,
|
|
Password: password,
|
|
})
|
|
}
|
|
return exp, nil
|
|
}
|
|
|
|
// Import re-creates a domain from an export file on this instance
|
|
// (architecture.md § Persistence): it stores the imported DKIM key (so the
|
|
// published DNS record needs no change), registers the domain and rebuilds the
|
|
// OpenDKIM tables, then re-creates each application with its working password
|
|
// and rebuilds the Postfix sender map.
|
|
//
|
|
// exp.Domain must already be normalised and validated by the caller
|
|
// (security.md); the selector is checked for
|
|
// config-injection safety here. A domain or login that already exists is
|
|
// rejected (store.ErrDomainExists / store.ErrLoginExists) rather than merged.
|
|
// If any step fails, everything the import created is rolled back, so a
|
|
// partial import never leaves the instance in an inconsistent state.
|
|
func (s *Service) Import(exp DomainExport) (store.Domain, error) {
|
|
if exp.Format != FormatDomainExport {
|
|
return store.Domain{}, fmt.Errorf("not a SelfPost domain export (format %q)", exp.Format)
|
|
}
|
|
if err := assertConfigSafe(exp.Domain, exp.DKIMSelector); err != nil {
|
|
return store.Domain{}, err
|
|
}
|
|
|
|
// Registry row first, so its UNIQUE constraint is the sole arbiter of a
|
|
// duplicate domain before we touch the filesystem.
|
|
d, err := s.store.AddDomain(exp.Domain, exp.DKIMSelector)
|
|
if err != nil {
|
|
return store.Domain{}, err // ErrDomainExists surfaces to the caller
|
|
}
|
|
|
|
if err := s.odk.ImportKey(d.Name, d.DKIMSelector, []byte(exp.DKIMPrivateKey)); err != nil {
|
|
s.importRollback(d.ID)
|
|
return store.Domain{}, err
|
|
}
|
|
if err := s.resync(); err != nil {
|
|
s.importRollback(d.ID)
|
|
return store.Domain{}, err
|
|
}
|
|
|
|
if exp.DMARCRua != nil {
|
|
if err := s.store.UpdateDomainDMARCRua(d.ID, sql.NullString{Valid: true, String: *exp.DMARCRua}); err != nil {
|
|
s.importRollback(d.ID)
|
|
return store.Domain{}, err
|
|
}
|
|
d.DMARCRua = sql.NullString{Valid: true, String: *exp.DMARCRua}
|
|
}
|
|
|
|
for _, a := range exp.Applications {
|
|
if err := s.apps.ImportApplication(d.ID, a.Login, a.AddressMode, a.Addresses, a.Password); err != nil {
|
|
s.importRollback(d.ID)
|
|
return store.Domain{}, fmt.Errorf("import application %q: %w", a.Login, err)
|
|
}
|
|
}
|
|
if err := s.apps.Resync(); err != nil {
|
|
s.importRollback(d.ID)
|
|
return store.Domain{}, err
|
|
}
|
|
return d, nil
|
|
}
|
|
|
|
// importRollback best-effort tears down a partially imported domain by running
|
|
// the normal deletion path, which clears the SASL accounts of any applications
|
|
// already created, removes the registry rows (cascade), rebuilds both maps and
|
|
// removes the DKIM key. Any error here is subordinate to the original failure
|
|
// the caller returns.
|
|
func (s *Service) importRollback(id int64) {
|
|
_ = s.Delete(id)
|
|
}
|