Follows the design and guard commits before it. Written by Sonnet,
reviewed by Opus.
The report address
- Baseline: users.dmarc_default_mode, users.dmarc_default_address and
domains.dmarc_rua_user_id are gone. domains.dmarc_rua alone says
where reports go: '' is no reports (a new domain), the address
SelfPost derives for the domain is the hosted choice (while hosted
reports are on), anything else is a typed address.
- Removed: the user default and its store functions, a domain
following a user, keep / inherit, followCreator, POST /account/dmarc
with its handler, the DMARC box of Account, the user-delete item
about domains losing their address.
- Domain settings offers the three choices; beside the typed address a
"Use my e-mail" button fills in the profile e-mail (panel.js: one
generic data-fill hook; absent without a profile e-mail; it fills,
it does not save).
- The DMARC record's note names the address and no user. This closes
L4 of the security review.
- Domain export / import carries the address as a plain string.
- The ingest allow-list is the generic mailbox plus each domain's
address on this host; the generic mailbox is always open now.
- dev/migrate1x (not in the tree): a 1.x domain that inherited the
instance default gets that address as its own, so no published rua=
changes.
Row actions
- row_action partial (RowAction: Label, Post, Confirm, Danger);
panel.css has the mockup's three rules. A row of the Applications
table is Edit, New password, Delete; the confirmation texts are the
ones the application page's head uses. Both roles, with the checks
of the application page.
Tests cover: a new domain has no reports; each choice saved and shown
selected; hosted refused when hosted reports are off; a bad address
refused with what was typed kept; an untouched save changes nothing in
each state; the fill button with and without a profile e-mail; deleting
a user leaves every domain's address; the row's forms, targets and
confirmations for both roles and a 404 for a stranger.
Known: if hosted reports are switched off later, a stored hosted address
reads as a typed one. docs/guide.md still describes the old choices -
the documentation step.
Evidence
- docs/assets/panel-redesign/evidence/account.png,
out-domain-settings.png, out-domain.png, user-delete.png, help.png:
1440 px wide, headless Edge, real templates served locally with
their fixtures - NOT from the container.
- panel/audit.js on out-domain, out-domain-settings, account, help,
components and user-delete at 1440 and 1280: 1420 texts checked,
problems: [].
- In a browser: the fill button sets the field and does not submit;
the row buttons have the font, size and colour of the Edit link,
Delete the red of the other delete links; data-confirm fires on
both. Hover and focus states were not observed.
- go test -count=1 ./internal/web/... ./internal/store/...
./internal/dmarc/... ./internal/app/... ./internal/inbound/...
./cmd/panel: ok (ten packages; dev/migrate1x also ok).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
240 lines
8.4 KiB
Go
240 lines
8.4 KiB
Go
package domain
|
|
|
|
import (
|
|
"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"` // the domain's report address; absent = no reports
|
|
RateLimit *RateLimitExport `json:"rate_limit,omitempty"`
|
|
Applications []AppExport `json:"applications"`
|
|
}
|
|
|
|
// RateLimitExport is the transferable level-2 limit for a domain or application.
|
|
type RateLimitExport struct {
|
|
Mode string `json:"mode,omitempty"`
|
|
MaxMessages int `json:"max_messages,omitempty"`
|
|
WindowSeconds int `json:"window_seconds,omitempty"`
|
|
AutoMultiplier float64 `json:"auto_multiplier,omitempty"`
|
|
AllowedIPs []string `json:"allowed_ips,omitempty"`
|
|
}
|
|
|
|
// 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"`
|
|
AuthIPRestrict bool `json:"auth_ip_restrict,omitempty"`
|
|
AuthAllowedIPs []string `json:"auth_allowed_ips,omitempty"`
|
|
RateLimit *RateLimitExport `json:"rate_limit,omitempty"`
|
|
}
|
|
|
|
// 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),
|
|
DMARCRua: d.DMARCRua,
|
|
Applications: make([]AppExport, 0, len(apps)),
|
|
}
|
|
rl, ok, err := s.store.GetRateLimit(store.RateLimitScopeDomain, id)
|
|
if err != nil {
|
|
return DomainExport{}, fmt.Errorf("export rate limit for %s: %w", d.Name, err)
|
|
}
|
|
if ok {
|
|
exp.RateLimit = exportRateLimit(rl)
|
|
}
|
|
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)
|
|
}
|
|
appExp := AppExport{
|
|
Login: a.Login,
|
|
AddressMode: a.AddressMode,
|
|
Addresses: a.Addresses,
|
|
Password: password,
|
|
AuthIPRestrict: a.AuthIPRestrict,
|
|
AuthAllowedIPs: a.AuthAllowedIPs,
|
|
}
|
|
appRL, ok, err := s.store.GetRateLimit(store.RateLimitScopeApp, a.ID)
|
|
if err != nil {
|
|
return DomainExport{}, fmt.Errorf("export rate limit for %s: %w", a.Login, err)
|
|
}
|
|
if ok {
|
|
appExp.RateLimit = exportRateLimit(appRL)
|
|
}
|
|
exp.Applications = append(exp.Applications, appExp)
|
|
}
|
|
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 != "" {
|
|
if err := s.store.SetDomainDMARCAddress(d.ID, exp.DMARCRua); err != nil {
|
|
s.importRollback(d.ID)
|
|
return store.Domain{}, err
|
|
}
|
|
d.DMARCRua = exp.DMARCRua
|
|
}
|
|
if exp.RateLimit != nil {
|
|
if err := s.importRateLimit(store.RateLimitScopeDomain, d.ID, *exp.RateLimit); err != nil {
|
|
s.importRollback(d.ID)
|
|
return store.Domain{}, err
|
|
}
|
|
}
|
|
|
|
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)
|
|
}
|
|
restrict, ips := a.AuthIPRestrict, a.AuthAllowedIPs
|
|
// Legacy exports stored client IPs on the rate-limit row as trusted IPs.
|
|
if a.RateLimit != nil && len(a.RateLimit.AllowedIPs) > 0 {
|
|
restrict = true
|
|
ips = a.RateLimit.AllowedIPs
|
|
}
|
|
needAuthIPs := restrict || len(ips) > 0
|
|
needRateLimit := a.RateLimit != nil
|
|
if needAuthIPs || needRateLimit {
|
|
app, err := s.store.GetApplicationByLogin(a.Login)
|
|
if err != nil {
|
|
s.importRollback(d.ID)
|
|
return store.Domain{}, fmt.Errorf("import application %q: %w", a.Login, err)
|
|
}
|
|
if needAuthIPs {
|
|
if err := s.store.UpdateApplicationAuthIPs(app.ID, restrict, ips); err != nil {
|
|
s.importRollback(d.ID)
|
|
return store.Domain{}, fmt.Errorf("import auth IPs for %q: %w", a.Login, err)
|
|
}
|
|
}
|
|
if needRateLimit {
|
|
if err := s.importRateLimit(store.RateLimitScopeApp, app.ID, *a.RateLimit); err != nil {
|
|
s.importRollback(d.ID)
|
|
return store.Domain{}, fmt.Errorf("import rate limit for %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)
|
|
}
|
|
|
|
func exportRateLimit(rl store.RateLimit) *RateLimitExport {
|
|
mode := rl.Mode
|
|
if mode == "" {
|
|
mode = store.RateLimitModeManual
|
|
}
|
|
exp := &RateLimitExport{
|
|
Mode: mode,
|
|
MaxMessages: rl.MaxMessages,
|
|
WindowSeconds: rl.WindowSeconds,
|
|
AutoMultiplier: rl.AutoMultiplier,
|
|
}
|
|
return exp
|
|
}
|
|
|
|
func (s *Service) importRateLimit(scope string, refID int64, exp RateLimitExport) error {
|
|
mode := exp.Mode
|
|
if mode == "" {
|
|
mode = store.RateLimitModeManual
|
|
}
|
|
rl := store.RateLimit{
|
|
Scope: scope,
|
|
RefID: refID,
|
|
Mode: mode,
|
|
MaxMessages: exp.MaxMessages,
|
|
WindowSeconds: exp.WindowSeconds,
|
|
AutoMultiplier: exp.AutoMultiplier,
|
|
}
|
|
if mode == store.RateLimitModeManual && rl.MaxMessages <= 0 && rl.WindowSeconds <= 0 {
|
|
return nil
|
|
}
|
|
return s.store.SetRateLimit(rl)
|
|
}
|