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>
200 lines
6.1 KiB
Go
200 lines
6.1 KiB
Go
package domain
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"testing"
|
|
|
|
"github.com/mixeme/selfpost/internal/store"
|
|
)
|
|
|
|
// fakeApps stands in for *app.Service in the domain-transfer tests: it records
|
|
// the import calls and hands back canned SASL secrets.
|
|
type fakeApps struct {
|
|
secrets map[string]string
|
|
imported []importedApp
|
|
importErr error
|
|
}
|
|
|
|
type importedApp struct {
|
|
domainID int64
|
|
login string
|
|
mode string
|
|
addresses []string
|
|
password string
|
|
}
|
|
|
|
func (f *fakeApps) PurgeDomainSASL(int64) error { return nil }
|
|
func (f *fakeApps) Resync() error { return nil }
|
|
|
|
func (f *fakeApps) Secret(login string) (string, error) {
|
|
pw, ok := f.secrets[login]
|
|
if !ok {
|
|
return "", fmt.Errorf("no secret for %q", login)
|
|
}
|
|
return pw, nil
|
|
}
|
|
|
|
func (f *fakeApps) ImportApplication(domainID int64, login, mode string, addresses []string, password string) error {
|
|
if f.importErr != nil {
|
|
return f.importErr
|
|
}
|
|
f.imported = append(f.imported, importedApp{domainID, login, mode, addresses, password})
|
|
return nil
|
|
}
|
|
|
|
// newTestService builds a Service over a fresh SQLite store and OpenDKIM tree in
|
|
// a temp dir, with the OpenDKIM reload signal stubbed out.
|
|
func newTestService(t *testing.T, apps Applications) (*Service, *OpenDKIM) {
|
|
t.Helper()
|
|
st, err := store.Open(t.TempDir() + "/selfpost.db")
|
|
if err != nil {
|
|
t.Fatalf("open store: %v", err)
|
|
}
|
|
t.Cleanup(func() { st.Close() })
|
|
odk := NewOpenDKIM(t.TempDir())
|
|
odk.reload = func() error { return nil }
|
|
return NewService(st, odk, apps, "selfpost"), odk
|
|
}
|
|
|
|
func TestExportImportRoundTrip(t *testing.T) {
|
|
// Source instance: a domain with two applications and their secrets.
|
|
srcApps := &fakeApps{secrets: map[string]string{"mailer": "pw-mailer", "alerts": "pw-alerts"}}
|
|
src, srcOdk := newTestService(t, srcApps)
|
|
|
|
d, err := src.Add("example.com")
|
|
if err != nil {
|
|
t.Fatalf("add domain: %v", err)
|
|
}
|
|
if _, err := src.store.AddApplication(d.ID, "mailer", store.AddressModeWildcard, nil); err != nil {
|
|
t.Fatalf("add mailer: %v", err)
|
|
}
|
|
if _, err := src.store.AddApplication(d.ID, "alerts", store.AddressModeList, []string{"a@example.com"}); err != nil {
|
|
t.Fatalf("add alerts: %v", err)
|
|
}
|
|
if err := src.store.SetDomainDMARCAddress(d.ID, "reports@hub.example"); err != nil {
|
|
t.Fatalf("set dmarc rua: %v", err)
|
|
}
|
|
|
|
exp, err := src.Export(d.ID)
|
|
if err != nil {
|
|
t.Fatalf("Export: %v", err)
|
|
}
|
|
if exp.Format != FormatDomainExport || exp.Domain != "example.com" || exp.DKIMSelector != "selfpost" {
|
|
t.Fatalf("export header = %+v", exp)
|
|
}
|
|
if len(exp.Applications) != 2 {
|
|
t.Fatalf("exported %d apps, want 2", len(exp.Applications))
|
|
}
|
|
srcKey, err := srcOdk.ExportKey("example.com", "selfpost")
|
|
if err != nil {
|
|
t.Fatalf("read source key: %v", err)
|
|
}
|
|
if exp.DKIMPrivateKey != string(srcKey) {
|
|
t.Error("export DKIM key does not match the on-disk key")
|
|
}
|
|
|
|
// Target instance: import the file.
|
|
dstApps := &fakeApps{}
|
|
dst, dstOdk := newTestService(t, dstApps)
|
|
nd, err := dst.Import(exp)
|
|
if err != nil {
|
|
t.Fatalf("Import: %v", err)
|
|
}
|
|
|
|
// Domain row landed with the exported selector.
|
|
got, err := dst.Get(nd.ID)
|
|
if err != nil {
|
|
t.Fatalf("get imported domain: %v", err)
|
|
}
|
|
if got.Name != "example.com" || got.DKIMSelector != "selfpost" {
|
|
t.Errorf("imported domain = %+v", got)
|
|
}
|
|
if got.DMARCRua != "reports@hub.example" {
|
|
t.Errorf("imported dmarc rua = %q", got.DMARCRua)
|
|
}
|
|
if exp.DMARCRua != "reports@hub.example" {
|
|
t.Errorf("exported dmarc rua = %q", exp.DMARCRua)
|
|
}
|
|
// The DKIM key was imported byte-for-byte, so the DNS record is unchanged.
|
|
dstKey, err := dstOdk.ExportKey("example.com", "selfpost")
|
|
if err != nil {
|
|
t.Fatalf("read imported key: %v", err)
|
|
}
|
|
if string(dstKey) != string(srcKey) {
|
|
t.Error("imported DKIM key differs from the source key")
|
|
}
|
|
// Applications were re-created with their working passwords.
|
|
if len(dstApps.imported) != 2 {
|
|
t.Fatalf("imported %d apps, want 2", len(dstApps.imported))
|
|
}
|
|
byLogin := map[string]importedApp{}
|
|
for _, a := range dstApps.imported {
|
|
byLogin[a.login] = a
|
|
}
|
|
if byLogin["mailer"].password != "pw-mailer" || byLogin["alerts"].password != "pw-alerts" {
|
|
t.Errorf("imported passwords = %+v", dstApps.imported)
|
|
}
|
|
if byLogin["alerts"].mode != store.AddressModeList {
|
|
t.Errorf("alerts mode = %q", byLogin["alerts"].mode)
|
|
}
|
|
}
|
|
|
|
func TestImportRejectsWrongFormat(t *testing.T) {
|
|
dst, _ := newTestService(t, &fakeApps{})
|
|
if _, err := dst.Import(DomainExport{Format: "nope", Domain: "example.com"}); err == nil {
|
|
t.Error("Import accepted a non-export file")
|
|
}
|
|
}
|
|
|
|
func TestImportRejectsDuplicateDomain(t *testing.T) {
|
|
dst, _ := newTestService(t, &fakeApps{})
|
|
if _, err := dst.Add("example.com"); err != nil {
|
|
t.Fatalf("seed domain: %v", err)
|
|
}
|
|
// A minimal but well-formed export of the same domain.
|
|
src, srcOdk := newTestService(t, &fakeApps{})
|
|
d, _ := src.Add("example.com")
|
|
key, _ := srcOdk.ExportKey("example.com", "selfpost")
|
|
exp := DomainExport{
|
|
Format: FormatDomainExport, Domain: "example.com", DKIMSelector: "selfpost",
|
|
DKIMPrivateKey: string(key),
|
|
}
|
|
_ = d
|
|
if _, err := dst.Import(exp); !errors.Is(err, store.ErrDomainExists) {
|
|
t.Errorf("Import duplicate = %v, want ErrDomainExists", err)
|
|
}
|
|
}
|
|
|
|
func TestImportRollsBackOnAppFailure(t *testing.T) {
|
|
// Build a valid export from a source instance.
|
|
src, _ := newTestService(t, &fakeApps{secrets: map[string]string{"mailer": "pw"}})
|
|
d, _ := src.Add("example.com")
|
|
if _, err := src.store.AddApplication(d.ID, "mailer", store.AddressModeWildcard, nil); err != nil {
|
|
t.Fatalf("add app: %v", err)
|
|
}
|
|
exp, err := src.Export(d.ID)
|
|
if err != nil {
|
|
t.Fatalf("Export: %v", err)
|
|
}
|
|
|
|
// Target rejects the application import; the whole domain must roll back.
|
|
dstApps := &fakeApps{importErr: errors.New("boom")}
|
|
dst, dstOdk := newTestService(t, dstApps)
|
|
if _, err := dst.Import(exp); err == nil {
|
|
t.Fatal("Import succeeded despite an application failure")
|
|
}
|
|
// Domain row removed.
|
|
domains, err := dst.List()
|
|
if err != nil {
|
|
t.Fatalf("list: %v", err)
|
|
}
|
|
if len(domains) != 0 {
|
|
t.Errorf("expected rollback to remove the domain, got %+v", domains)
|
|
}
|
|
// DKIM key removed.
|
|
if _, err := dstOdk.ExportKey("example.com", "selfpost"); err == nil {
|
|
t.Error("expected rollback to remove the imported DKIM key")
|
|
}
|
|
}
|