Stage 1, step 1. BREAKING: a 1.x database is not migrated.
Schema
- internal/store/migrations/ holds one file, 0001_init.sql, equal to the
2.0 schema; 0002..0010 are deleted (they stay in history at 1.9.5). No
admin table created and dropped, no ALTERs.
- users.email replaces users.dmarc_report_email: the address is the
user's own. The default DMARC report address is a user's setting
(dmarc_default_mode hosted/account/custom/none, dmarc_default_address);
the instance setting that mirrored the global user's field is gone.
- domains.dmarc_rua_user_id: a domain follows a named user's default, or
has an address of its own in dmarc_rua ('' = none). ON DELETE SET NULL
leaves it at "no reports", never at someone else's default.
- user_inbound_domains, users.all_domains, users.all_inbound_domains: in
the schema for the inbound delegation of the next step.
- users.role is 'global' / 'domain' (was 'domain_admin');
rate_limits.allowed_ips, unused since 1.9.0, is dropped.
Opening a database
- The baseline sets PRAGMA application_id ("SP20"). store.Open refuses a
file that has a schema version without it (ErrForeignSchema) and one
newer than the build. A 1.x file at user_version 10 would otherwise read
as already migrated. The refused file is left untouched.
Code
- Store.DomainDMARCRua is the one place a domain's report address is
resolved; dnscheck.ResolveDMARCRua and Store.GlobalDMARCReportEmail are
gone. dmarc.AllowedRecipients, the domain page, the dashboard and the
DNS re-check go through it.
- The old templates keep working on the new model until their pages are
restyled: the Settings form's address field is the account e-mail and
switches the user's default between it and none; a domain's "Same as
Settings" makes it follow the user who chose it; a new or imported
domain follows its creator.
- Domain export/import: a domain that follows a user exports no address.
Tests: the baseline pinned table by table (TestBaselineSchema), refusal of a
1.x and of a newer database, constraints and cascades of the new columns and
table, resolution in every default mode, the deleted-user case, and the three
bridged handlers.
docs/schema-migrations.md is rewritten for the baseline; roadmap 11/27,
schema-squash marked built.
go test ./... (Windows)
ok for every package except two that fail the same way before this commit:
internal/domain TestWriteLoadPrivateKeyRoundtrip (file mode on NTFS)
internal/logtail TestFollowTailsAndRotates (rename of an open file)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
245 lines
8.6 KiB
Go
245 lines
8.6 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"` // nil = follows a user's default; set = the domain's own address ("" = none)
|
|
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),
|
|
Applications: make([]AppExport, 0, len(apps)),
|
|
}
|
|
// A domain that follows a user's default exports no address: users do not
|
|
// travel with a domain, and whoever imports it becomes the one it follows.
|
|
if !d.DMARCRuaUserID.Valid {
|
|
rua := d.DMARCRua
|
|
exp.DMARCRua = &rua
|
|
}
|
|
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 != nil {
|
|
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)
|
|
}
|