Stage 3, step 2. Reviewed by Fable (read-only), fixed by Sonnet with a
failing test before each fix, checked by Opus. No Critical or High
finding: route authorization, tenant isolation by id, the /server/
subtree guard, output encoding and the origin check were found sound.
Fixed
- M1: a session was keyed by user name and had no link to the user. A
deleted or renamed user's cookie stayed alive (renewed on every hit,
before the user was looked up) and became a session of whoever was
later created under that name, with that account's role. The
baseline now has sessions.user_id REFERENCES users(id) ON DELETE
CASCADE; the principal is resolved by id and a session is renewed
only after its user was found. RenameSession is gone.
- M2: any user's password change deleted every other user's sessions.
It ends that user's other sessions only.
- L1: a password set on the user form ends that user's sessions (an
administrator editing their own account keeps the current one).
- L2: store, saslpasswd2 and Postfix reload errors were shown verbatim
on the application form, the inbound upstream / recipients forms and
the limit recalculation - pages a domain administrator reaches.
Validation errors (app.ValidationError, inbound.ValidationError,
store.ErrNotAutoRateLimit) keep their text; anything else is logged
and shown as "Could not save ... Check the logs and try again."
- L3: store.ListDMARCReports treated an empty domain list as "all". It
takes a scope now (AllDomains or a list; an empty list is no rows),
and the DMARC hub is open to the domain role as the plan says: the
reports of the assigned domains, without the instance-wide ingest
box. The menu entry was already shown to them and led to a 404.
- I1: /static/ answered with a listing of the embedded assets. A path
that is not a known asset is a 404.
Consequences
- The global DMARC hub lists reports of domains that were deleted
since, too.
- dev/migrate1x (not in the tree) no longer carries sessions over:
everyone signs in again after the transfer.
- docs/schema-migrations.md: the sessions row.
Recorded, not changed - for the owner:
- L4: the report-address select names the followed user and their
address to every administrator of the domain, by default the global
administrator's login name. The plan asks for it.
- L5: a delegated inbound upstream may be any host and port, loopback
and private ranges included - within the trusted-operator model; to
be listed among the accepted risks in security.md.
- L6: Account's profile is saved without the password; becomes a
requirement once password-reset mails to users.email.
- Still echoing an error's text: backup and domain import (global
only), the domain form's validation messages.
Not checked by the review: anything needing the container (e2e, real
Postfix / DNS), CSP behaviour in a live browser.
go test -count=1 ./internal/web/... ./internal/store/... ./internal/app/...
./internal/inbound/... ./internal/dmarc/... ./cmd/panel
ok (all eleven packages; dev/migrate1x also ok)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
217 lines
5.7 KiB
Go
217 lines
5.7 KiB
Go
package dmarc
|
|
|
|
import (
|
|
"archive/zip"
|
|
"bytes"
|
|
"compress/gzip"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/mixeme/selfpost/internal/store"
|
|
)
|
|
|
|
const sampleXML = `<?xml version="1.0"?>
|
|
<feedback>
|
|
<report_metadata>
|
|
<org_name>google.com</org_name>
|
|
<email>noreply@google.com</email>
|
|
<report_id>12345</report_id>
|
|
<date_range><begin>1723593600</begin><end>1723680000</end></date_range>
|
|
</report_metadata>
|
|
<policy_published>
|
|
<domain>example.com</domain>
|
|
<p>none</p><sp>none</sp><pct>100</pct>
|
|
<adkim>r</adkim><aspf>r</aspf>
|
|
</policy_published>
|
|
<record>
|
|
<row>
|
|
<source_ip>203.0.113.10</source_ip>
|
|
<count>10</count>
|
|
<policy_evaluated>
|
|
<disposition>none</disposition>
|
|
<dkim>pass</dkim><spf>pass</spf>
|
|
</policy_evaluated>
|
|
</row>
|
|
<identifiers><header_from>example.com</header_from></identifiers>
|
|
</record>
|
|
<record>
|
|
<row>
|
|
<source_ip>198.51.100.1</source_ip>
|
|
<count>2</count>
|
|
<policy_evaluated>
|
|
<disposition>none</disposition>
|
|
<dkim>fail</dkim><spf>fail</spf>
|
|
</policy_evaluated>
|
|
</row>
|
|
<identifiers><header_from>example.com</header_from></identifiers>
|
|
</record>
|
|
</feedback>`
|
|
|
|
func TestParseAggregateGzip(t *testing.T) {
|
|
var buf bytes.Buffer
|
|
zw := gzip.NewWriter(&buf)
|
|
if _, err := zw.Write([]byte(sampleXML)); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if err := zw.Close(); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
got, err := ParseAggregate(buf.Bytes())
|
|
if err != nil {
|
|
t.Fatalf("ParseAggregate: %v", err)
|
|
}
|
|
if got.Domain != "example.com" || got.Reporter != "google.com" {
|
|
t.Fatalf("metadata = %+v", got)
|
|
}
|
|
if got.PassCount != 10 || got.FailCount != 2 {
|
|
t.Fatalf("counts = %d pass %d fail", got.PassCount, got.FailCount)
|
|
}
|
|
if !got.PeriodBegin.Equal(time.Unix(1723593600, 0).UTC()) {
|
|
t.Fatalf("period begin = %v", got.PeriodBegin)
|
|
}
|
|
}
|
|
|
|
func TestIngestMessageStoresReport(t *testing.T) {
|
|
st, err := store.Open(t.TempDir() + "/test.db")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
defer st.Close()
|
|
if _, err := st.AddDomain("example.com", "selfpost"); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
var gz bytes.Buffer
|
|
zw := gzip.NewWriter(&gz)
|
|
_, _ = zw.Write([]byte(sampleXML))
|
|
_ = zw.Close()
|
|
|
|
msg := bytes.NewBufferString(
|
|
"From: noreply@google.com\r\n" +
|
|
"To: dmarc-reports@mail.example.com\r\n" +
|
|
"Subject: Report\r\n" +
|
|
"Content-Type: application/gzip; name=\"report.xml.gz\"\r\n" +
|
|
"\r\n",
|
|
)
|
|
// append raw gzip for simple single-part test
|
|
msg.Write(gz.Bytes())
|
|
|
|
if err := IngestMessage(st, msg, "dmarc-reports@mail.example.com", time.Now().UTC()); err != nil {
|
|
t.Fatalf("IngestMessage: %v", err)
|
|
}
|
|
list, err := st.ListDMARCReports(store.DMARCReportScope{AllDomains: true}, 10)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if len(list) != 1 {
|
|
t.Fatalf("reports = %d", len(list))
|
|
}
|
|
if list[0].PassCount != 10 {
|
|
t.Fatalf("pass = %d", list[0].PassCount)
|
|
}
|
|
}
|
|
|
|
func TestHostedReportAddress(t *testing.T) {
|
|
got := HostedReportAddress("mail.example.com", "Example.COM")
|
|
want := "dmarc-reports+example.com@mail.example.com"
|
|
if got != want {
|
|
t.Fatalf("got %q want %q", got, want)
|
|
}
|
|
}
|
|
|
|
func TestIngestMessageRejectsUnknownDomain(t *testing.T) {
|
|
st, err := store.Open(t.TempDir() + "/test.db")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
defer st.Close()
|
|
|
|
if err := IngestMessage(st, bytes.NewBufferString(gzipMessage(t, sampleXML)), "dmarc-reports@mail.example.com", time.Now().UTC()); err == nil {
|
|
t.Fatal("report for an unconfigured domain was accepted")
|
|
}
|
|
list, err := st.ListDMARCReports(store.DMARCReportScope{AllDomains: true}, 10)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if len(list) != 0 {
|
|
t.Fatalf("stored %d report(s) for an unconfigured domain", len(list))
|
|
}
|
|
}
|
|
|
|
// A report claiming example.com must not be accepted at the address tagged for
|
|
// another domain, even when both domains are configured here.
|
|
func TestIngestMessageRejectsTagMismatch(t *testing.T) {
|
|
st, err := store.Open(t.TempDir() + "/test.db")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
defer st.Close()
|
|
if _, err := st.AddDomain("example.com", "selfpost"); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if _, err := st.AddDomain("other.example", "selfpost"); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
err = IngestMessage(st, bytes.NewBufferString(gzipMessage(t, sampleXML)),
|
|
"dmarc-reports+other.example@mail.example.com", time.Now().UTC())
|
|
if err == nil {
|
|
t.Fatal("report was accepted at an address tagged for another domain")
|
|
}
|
|
}
|
|
|
|
func TestTaggedDomain(t *testing.T) {
|
|
cases := map[string]string{
|
|
"dmarc-reports+example.com@mail.example.com": "example.com",
|
|
"dmarc-reports@mail.example.com": "",
|
|
"postmaster+example.com@mail.example.com": "",
|
|
"not-an-address": "",
|
|
}
|
|
for addr, want := range cases {
|
|
if got := TaggedDomain(addr); got != want {
|
|
t.Errorf("TaggedDomain(%q) = %q, want %q", addr, got, want)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestParseAggregateFromZip(t *testing.T) {
|
|
var buf bytes.Buffer
|
|
zw := zip.NewWriter(&buf)
|
|
w, err := zw.Create("report.xml")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if _, err := w.Write([]byte(sampleXML)); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if err := zw.Close(); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
got, err := ParseAggregate(buf.Bytes())
|
|
if err != nil {
|
|
t.Fatalf("ParseAggregate(zip): %v", err)
|
|
}
|
|
if got.Domain != "example.com" || got.PassCount != 10 {
|
|
t.Fatalf("zip report = %+v", got)
|
|
}
|
|
}
|
|
|
|
// gzipMessage wraps xml in the single-part gzip message the ingest pipe sees.
|
|
func gzipMessage(t *testing.T, xml string) string {
|
|
t.Helper()
|
|
var gz bytes.Buffer
|
|
zw := gzip.NewWriter(&gz)
|
|
if _, err := zw.Write([]byte(xml)); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if err := zw.Close(); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
return "From: noreply@google.com\r\n" +
|
|
"To: dmarc-reports@mail.example.com\r\n" +
|
|
"Subject: Report\r\n" +
|
|
"Content-Type: application/gzip; name=\"report.xml.gz\"\r\n" +
|
|
"\r\n" + gz.String()
|
|
}
|