mixandClaude Opus 5.5
8d1af89e1a
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>
73 lines
1.8 KiB
Go
73 lines
1.8 KiB
Go
package handlers
|
|
|
|
import (
|
|
"net/http"
|
|
|
|
"github.com/mixeme/selfpost/internal/dmarc"
|
|
"github.com/mixeme/selfpost/internal/store"
|
|
"github.com/mixeme/selfpost/internal/web/auth"
|
|
)
|
|
|
|
func (h *Handlers) principal(r *http.Request) (auth.Principal, bool) {
|
|
return auth.PrincipalFromRequest(r)
|
|
}
|
|
|
|
func (h *Handlers) requireGlobal(w http.ResponseWriter, r *http.Request) (auth.Principal, bool) {
|
|
p, ok := h.principal(r)
|
|
if !ok || !p.IsGlobal() {
|
|
http.NotFound(w, r)
|
|
return auth.Principal{}, false
|
|
}
|
|
return p, true
|
|
}
|
|
|
|
func (h *Handlers) pageBase(r *http.Request) map[string]any {
|
|
p, _ := h.principal(r)
|
|
return map[string]any{
|
|
"User": auth.CurrentUser(r),
|
|
"IsGlobal": p.IsGlobal(),
|
|
}
|
|
}
|
|
|
|
func (h *Handlers) assignedDomains(p auth.Principal) ([]store.Domain, error) {
|
|
if p.IsGlobal() {
|
|
return h.store.ListDomains()
|
|
}
|
|
return h.store.ListDomainsForUser(p.ID)
|
|
}
|
|
|
|
// hostedDMARCAddress is the SelfPost-hosted report mailbox for a sending
|
|
// domain, "" when report ingest is off on this server.
|
|
func (h *Handlers) hostedDMARCAddress(domainName string) string {
|
|
if h.dmarc == nil || !h.cfg.DMARCEnabled {
|
|
return ""
|
|
}
|
|
return dmarc.HostedReportAddress(h.cfg.Hostname, domainName)
|
|
}
|
|
|
|
// domainReportAddress resolves where a domain's DMARC aggregate reports go:
|
|
// its own address, or the default of the user it follows. "" is a policy-only
|
|
// record.
|
|
func (h *Handlers) domainReportAddress(d store.Domain) (string, error) {
|
|
return h.store.DomainDMARCRua(d, h.hostedDMARCAddress(d.Name))
|
|
}
|
|
|
|
func domainNameSet(domains []store.Domain) map[string]bool {
|
|
m := make(map[string]bool, len(domains))
|
|
for _, d := range domains {
|
|
m[d.Name] = true
|
|
}
|
|
return m
|
|
}
|
|
|
|
func domainIDSet(p auth.Principal) map[int64]bool {
|
|
if p.IsGlobal() {
|
|
return nil
|
|
}
|
|
m := make(map[int64]bool, len(p.Domains))
|
|
for _, id := range p.Domains {
|
|
m[id] = true
|
|
}
|
|
return m
|
|
}
|