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>
79 lines
2.5 KiB
Go
79 lines
2.5 KiB
Go
package dnscheck
|
|
|
|
import (
|
|
"context"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/mixeme/selfpost/internal/health"
|
|
)
|
|
|
|
func TestSPFExample(t *testing.T) {
|
|
cases := []struct {
|
|
name string
|
|
hostname string
|
|
ips []string
|
|
want string
|
|
}{
|
|
{"ipv4", "mail.example.com", []string{"203.0.113.10"}, "v=spf1 ip4:203.0.113.10 -all"},
|
|
{"both families", "mail.example.com", []string{"203.0.113.10", "2001:db8::1"},
|
|
"v=spf1 ip4:203.0.113.10 ip6:2001:db8::1 -all"},
|
|
{"no addresses", "mail.example.com", nil, "v=spf1 a:mail.example.com -all"},
|
|
{"unparsable addresses", "mail.example.com", []string{"not-an-ip"}, "v=spf1 a:mail.example.com -all"},
|
|
}
|
|
for _, c := range cases {
|
|
t.Run(c.name, func(t *testing.T) {
|
|
if got := SPFExample(c.hostname, c.ips); got != c.want {
|
|
t.Errorf("SPFExample = %q, want %q", got, c.want)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestDMARCExample(t *testing.T) {
|
|
if got := DMARCExample(""); got != "v=DMARC1; p=none" {
|
|
t.Errorf("empty = %q", got)
|
|
}
|
|
want := "v=DMARC1; p=none; rua=mailto:reports@hub.example"
|
|
if got := DMARCExample("reports@hub.example"); got != want {
|
|
t.Errorf("with rua = %q, want %q", got, want)
|
|
}
|
|
}
|
|
|
|
func TestExternalReportAuth(t *testing.T) {
|
|
name, value, ok := ExternalReportAuth("shop.com", "reports@hub.com")
|
|
if !ok || name != "_report._dmarc.hub.com" || value != "v=DMARC1;" {
|
|
t.Fatalf("external = (%q, %q, %v)", name, value, ok)
|
|
}
|
|
if _, _, ok := ExternalReportAuth("shop.com", "dmarc@shop.com"); ok {
|
|
t.Fatal("same domain should not need external auth")
|
|
}
|
|
}
|
|
|
|
// The record the panel shows and the one a failed check suggests must be the
|
|
// same string, or the operator is told two different things on one page.
|
|
func TestMissingRecordChecksSuggestTheShownExample(t *testing.T) {
|
|
f := &fakeResolver{}
|
|
c := newTestChecker(f)
|
|
|
|
spf := c.checkSPF(context.Background(), Query{
|
|
Name: "example.com",
|
|
Hostname: "mail.example.com",
|
|
ServerIPs: []string{"203.0.113.10"},
|
|
})
|
|
if spf.Status != health.StatusError {
|
|
t.Fatalf("SPF status = %q, want error (%s)", spf.Status, spf.Detail)
|
|
}
|
|
if want := SPFExample("mail.example.com", []string{"203.0.113.10"}); !strings.Contains(spf.Detail, want) {
|
|
t.Errorf("SPF advice %q does not suggest %q", spf.Detail, want)
|
|
}
|
|
|
|
dmarc := c.checkDMARC(context.Background(), Query{Name: "example.com"})
|
|
if dmarc.Status != health.StatusWarn {
|
|
t.Fatalf("DMARC status = %q, want warn (%s)", dmarc.Status, dmarc.Detail)
|
|
}
|
|
if want := DMARCExample(""); !strings.Contains(dmarc.Detail, want) {
|
|
t.Errorf("DMARC advice %q does not suggest %q", dmarc.Detail, want)
|
|
}
|
|
}
|