test / test (push) Canceled after 0s
Found on the test server after the rollout of b905f3e: the SigningTable had
the three sending domains and no line for selfpost.mixfed.ru. The tables are
rebuilt when a domain is added or deleted, and nothing had done either since
the upgrade - notifications would have gone out unsigned until something did.
The e2e stand did not show it: it adds a domain right after its start.
The notifier now asks at its start whether the table on disk has the line
and rebuilds the tables once if it does not (domain.Service.EnsureServerSigned).
A failure is logged and costs the signature, not the message.
Checked on Windows: go vet clean; go test ./internal/domain passes apart from
TestWriteLoadPrivateKeyRoundtrip, which fails there on file modes and always
did; the new test holds one rebuild, none the second time, and that a longer
name is not taken for the server's.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
147 lines
4.9 KiB
Go
147 lines
4.9 KiB
Go
package domain
|
|
|
|
import (
|
|
"os"
|
|
"strings"
|
|
"testing"
|
|
)
|
|
|
|
func readTables(t *testing.T, odk *OpenDKIM) (keyTable, signingTable string) {
|
|
t.Helper()
|
|
kt, err := os.ReadFile(odk.keyTablePath)
|
|
if err != nil {
|
|
t.Fatalf("read KeyTable: %v", err)
|
|
}
|
|
st, err := os.ReadFile(odk.signingTablePath)
|
|
if err != nil {
|
|
t.Fatalf("read SigningTable: %v", err)
|
|
}
|
|
return string(kt), string(st)
|
|
}
|
|
|
|
// The server's own name is signed like a sending domain - a key, a line in
|
|
// each table - without being one: no row in the registry, so no application
|
|
// can send as it.
|
|
func TestServerNameIsSignedWithoutBeingADomain(t *testing.T) {
|
|
svc, odk := newTestService(t, &fakeApps{})
|
|
svc.SetServerName("mail.example.org")
|
|
|
|
if _, err := svc.Add("example.com"); err != nil {
|
|
t.Fatalf("add domain: %v", err)
|
|
}
|
|
kt, st := readTables(t, odk)
|
|
for _, want := range []string{"mail.example.org mail.example.org:selfpost:", "example.com example.com:selfpost:"} {
|
|
if !strings.Contains(kt, want) {
|
|
t.Errorf("KeyTable lacks %q:\n%s", want, kt)
|
|
}
|
|
}
|
|
if !strings.Contains(st, "*@mail.example.org mail.example.org\n") {
|
|
t.Errorf("SigningTable does not sign the server's own name:\n%s", st)
|
|
}
|
|
domains, err := svc.List()
|
|
if err != nil || len(domains) != 1 {
|
|
t.Fatalf("registry holds %d domains, %v; want the one that was added", len(domains), err)
|
|
}
|
|
|
|
mail, err := svc.ServerMail()
|
|
if err != nil {
|
|
t.Fatalf("ServerMail: %v", err)
|
|
}
|
|
if mail.Name != "mail.example.org" || mail.Selector != "selfpost" ||
|
|
mail.Record.Name != "selfpost._domainkey.mail.example.org" || !strings.HasPrefix(mail.Record.Value, "v=DKIM1;") {
|
|
t.Errorf("server mail = %+v", mail)
|
|
}
|
|
// Asked again, it is the same key: the record published in DNS stays valid.
|
|
again, err := svc.ServerMail()
|
|
if err != nil || again.Record.Value != mail.Record.Value {
|
|
t.Errorf("the server's key changed between two readings (%v)", err)
|
|
}
|
|
}
|
|
|
|
// When the hostname is itself a sending domain, there is one key and one line,
|
|
// the domain's; deleting the domain leaves the server's mail signed with it.
|
|
func TestServerNameThatIsAlsoADomain(t *testing.T) {
|
|
svc, odk := newTestService(t, &fakeApps{})
|
|
svc.SetServerName("example.com")
|
|
|
|
d, err := svc.Add("example.com")
|
|
if err != nil {
|
|
t.Fatalf("add domain: %v", err)
|
|
}
|
|
_, st := readTables(t, odk)
|
|
if strings.Count(st, "*@example.com ") != 1 {
|
|
t.Errorf("the name is in the SigningTable more than once:\n%s", st)
|
|
}
|
|
asDomain, err := svc.DKIMRecord(d)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
mail, err := svc.ServerMail()
|
|
if err != nil || mail.Record.Value != asDomain.Value {
|
|
t.Fatalf("the server's record is not the domain's (%v)", err)
|
|
}
|
|
|
|
if err := svc.Delete(d.ID); err != nil {
|
|
t.Fatalf("delete domain: %v", err)
|
|
}
|
|
_, st = readTables(t, odk)
|
|
if !strings.Contains(st, "*@example.com example.com\n") {
|
|
t.Errorf("deleting the domain stopped the server's own mail being signed:\n%s", st)
|
|
}
|
|
after, err := svc.ServerMail()
|
|
if err != nil || after.Record.Value != asDomain.Value {
|
|
t.Errorf("deleting the domain changed the server's key (%v)", err)
|
|
}
|
|
}
|
|
|
|
// An installation upgraded to a version that signs the server's own name has
|
|
// tables without its line until something rebuilds them. The start does, once.
|
|
func TestEnsureServerSignedRebuildsOnce(t *testing.T) {
|
|
svc, odk := newTestService(t, &fakeApps{})
|
|
if _, err := svc.Add("example.com"); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
reloads := 0
|
|
odk.reload = func() error { reloads++; return nil }
|
|
|
|
// The tables as the earlier version left them; now the name is known.
|
|
svc.SetServerName("mail.example.org")
|
|
if rebuilt, err := svc.EnsureServerSigned(); err != nil || !rebuilt {
|
|
t.Fatalf("first start: rebuilt = %v, %v; want a rebuild", rebuilt, err)
|
|
}
|
|
if _, st := readTables(t, odk); !strings.Contains(st, "*@mail.example.org mail.example.org\n") || !strings.Contains(st, "*@example.com ") {
|
|
t.Errorf("SigningTable after the rebuild:\n%s", st)
|
|
}
|
|
if rebuilt, err := svc.EnsureServerSigned(); err != nil || rebuilt {
|
|
t.Errorf("second start: rebuilt = %v, %v; want nothing to do", rebuilt, err)
|
|
}
|
|
if reloads != 1 {
|
|
t.Errorf("OpenDKIM was reloaded %d times, want once", reloads)
|
|
}
|
|
|
|
// A name that only begins like the server's is not it.
|
|
other, otherOdk := newTestService(t, &fakeApps{})
|
|
other.SetServerName("mail.example.org.evil.example")
|
|
if _, err := other.EnsureServerSigned(); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
other.SetServerName("mail.example.org")
|
|
if signed, err := otherOdk.signs("mail.example.org"); err != nil || signed {
|
|
t.Errorf("a longer name was taken for the server's: %v, %v", signed, err)
|
|
}
|
|
}
|
|
|
|
// Without a hostname nothing is added and nothing is signed for it.
|
|
func TestNoServerName(t *testing.T) {
|
|
svc, odk := newTestService(t, &fakeApps{})
|
|
if _, err := svc.Add("example.com"); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if _, st := readTables(t, odk); strings.Count(st, "\n") != 1 {
|
|
t.Errorf("SigningTable has more than the one domain:\n%s", st)
|
|
}
|
|
if _, err := svc.ServerMail(); err == nil {
|
|
t.Error("ServerMail without a hostname returned no error")
|
|
}
|
|
}
|