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>
142 lines
5.0 KiB
Go
142 lines
5.0 KiB
Go
package store
|
|
|
|
import (
|
|
"errors"
|
|
"testing"
|
|
)
|
|
|
|
const hostedForTest = "dmarc+example.com@mail.example.org"
|
|
|
|
// A domain either has a report address of its own or follows a user's default;
|
|
// the two never mix, and a fresh domain has neither.
|
|
func TestDomainDMARCAddressAndUser(t *testing.T) {
|
|
st := openTestStore(t)
|
|
d, err := st.AddDomain("example.com", "sel")
|
|
if err != nil {
|
|
t.Fatalf("AddDomain: %v", err)
|
|
}
|
|
got, err := st.GetDomain(d.ID)
|
|
if err != nil {
|
|
t.Fatalf("GetDomain: %v", err)
|
|
}
|
|
if got.DMARCRua != "" || got.DMARCRuaUserID.Valid {
|
|
t.Fatalf("a new domain = %q / follows %v, want no reports", got.DMARCRua, got.DMARCRuaUserID)
|
|
}
|
|
|
|
if err := st.SetDomainDMARCAddress(d.ID, "reports@hub.com"); err != nil {
|
|
t.Fatalf("SetDomainDMARCAddress: %v", err)
|
|
}
|
|
got, _ = st.GetDomain(d.ID)
|
|
if rua, err := st.DomainDMARCRua(got, hostedForTest); err != nil || rua != "reports@hub.com" {
|
|
t.Fatalf("own address resolves to %q, %v", rua, err)
|
|
}
|
|
|
|
if err := st.CreateGlobalUser("admin", "hash"); err != nil {
|
|
t.Fatalf("CreateGlobalUser: %v", err)
|
|
}
|
|
u, _ := st.GetUserByUsername("admin")
|
|
if err := st.SetDomainDMARCUser(d.ID, u.ID); err != nil {
|
|
t.Fatalf("SetDomainDMARCUser: %v", err)
|
|
}
|
|
got, _ = st.GetDomain(d.ID)
|
|
if got.DMARCRua != "" || !got.DMARCRuaUserID.Valid || got.DMARCRuaUserID.Int64 != u.ID {
|
|
t.Fatalf("following a user left %q / %v; the own address must be dropped", got.DMARCRua, got.DMARCRuaUserID)
|
|
}
|
|
|
|
if err := st.SetDomainDMARCAddress(d.ID, ""); err != nil {
|
|
t.Fatalf("SetDomainDMARCAddress none: %v", err)
|
|
}
|
|
got, _ = st.GetDomain(d.ID)
|
|
if got.DMARCRua != "" || got.DMARCRuaUserID.Valid {
|
|
t.Fatalf("none = %q / %v", got.DMARCRua, got.DMARCRuaUserID)
|
|
}
|
|
|
|
if err := st.SetDomainDMARCAddress(d.ID+100, "x@y.com"); !errors.Is(err, ErrDomainNotFound) {
|
|
t.Fatalf("unknown domain = %v, want ErrDomainNotFound", err)
|
|
}
|
|
}
|
|
|
|
// A domain that follows a user resolves to whatever that user's default says
|
|
// today — every mode — and changes with it.
|
|
func TestDomainFollowsUserDefault(t *testing.T) {
|
|
st := openTestStore(t)
|
|
if err := st.CreateGlobalUser("admin", "hash"); err != nil {
|
|
t.Fatalf("CreateGlobalUser: %v", err)
|
|
}
|
|
u, _ := st.GetUserByUsername("admin")
|
|
if err := st.UpdateUser(u.ID, "admin", "hash", "mix@example.org"); err != nil {
|
|
t.Fatalf("UpdateUser: %v", err)
|
|
}
|
|
d, _ := st.AddDomain("example.com", "sel")
|
|
if err := st.SetDomainDMARCUser(d.ID, u.ID); err != nil {
|
|
t.Fatalf("SetDomainDMARCUser: %v", err)
|
|
}
|
|
d, _ = st.GetDomain(d.ID)
|
|
|
|
for _, tc := range []struct {
|
|
mode, address string
|
|
hosted string
|
|
want string
|
|
}{
|
|
{DMARCDefaultNone, "", hostedForTest, ""},
|
|
{DMARCDefaultAccount, "", hostedForTest, "mix@example.org"},
|
|
{DMARCDefaultCustom, "dmarc@hub.example", hostedForTest, "dmarc@hub.example"},
|
|
{DMARCDefaultHosted, "", hostedForTest, hostedForTest},
|
|
// Ingest switched off: a hosted default has no mailbox to point at.
|
|
{DMARCDefaultHosted, "", "", ""},
|
|
// The custom address belongs to the custom mode only.
|
|
{DMARCDefaultAccount, "ignored@hub.example", hostedForTest, "mix@example.org"},
|
|
} {
|
|
if err := st.SetDMARCDefault(u.ID, tc.mode, tc.address); err != nil {
|
|
t.Fatalf("SetDMARCDefault(%s): %v", tc.mode, err)
|
|
}
|
|
got, err := st.DomainDMARCRua(d, tc.hosted)
|
|
if err != nil || got != tc.want {
|
|
t.Errorf("mode %s, hosted %q: resolved %q, %v; want %q", tc.mode, tc.hosted, got, err, tc.want)
|
|
}
|
|
}
|
|
def, err := st.GetDMARCDefault(u.ID)
|
|
if err != nil || def.Address != "" || def.Username != "admin" {
|
|
t.Errorf("default after a non-custom mode = %+v, %v; the custom address must be cleared", def, err)
|
|
}
|
|
if err := st.SetDMARCDefault(u.ID, "profile", ""); err == nil {
|
|
t.Error("an unknown mode was stored")
|
|
}
|
|
if err := st.SetDMARCDefault(u.ID+100, DMARCDefaultNone, ""); !errors.Is(err, ErrUserNotFound) {
|
|
t.Errorf("unknown user = %v, want ErrUserNotFound", err)
|
|
}
|
|
}
|
|
|
|
// Deleting the user a domain follows must leave the domain with no report
|
|
// address — not with another user's default, and not with a dangling id.
|
|
func TestDeletingTheFollowedUserLeavesNoReports(t *testing.T) {
|
|
st := openTestStore(t)
|
|
if err := st.CreateGlobalUser("admin", "hash"); err != nil {
|
|
t.Fatalf("CreateGlobalUser: %v", err)
|
|
}
|
|
d, _ := st.AddDomain("example.com", "sel")
|
|
id, err := st.CreateUser("second", "hash", RoleGlobal, nil)
|
|
if err != nil {
|
|
t.Fatalf("CreateUser: %v", err)
|
|
}
|
|
if err := st.SetDMARCDefault(id, DMARCDefaultCustom, "dmarc@hub.example"); err != nil {
|
|
t.Fatalf("SetDMARCDefault: %v", err)
|
|
}
|
|
if err := st.SetDomainDMARCUser(d.ID, id); err != nil {
|
|
t.Fatalf("SetDomainDMARCUser: %v", err)
|
|
}
|
|
if err := st.DeleteUser(id); err != nil {
|
|
t.Fatalf("DeleteUser: %v", err)
|
|
}
|
|
got, err := st.GetDomain(d.ID)
|
|
if err != nil {
|
|
t.Fatalf("GetDomain: %v", err)
|
|
}
|
|
if got.DMARCRuaUserID.Valid || got.DMARCRua != "" {
|
|
t.Fatalf("after deleting the followed user: %q / %v, want no reports", got.DMARCRua, got.DMARCRuaUserID)
|
|
}
|
|
if rua, err := st.DomainDMARCRua(got, hostedForTest); err != nil || rua != "" {
|
|
t.Fatalf("resolved %q, %v; want no reports", rua, err)
|
|
}
|
|
}
|