test / test (push) Has been cancelled
Review pass over the 1.4.0-1.9.1 work. Port 25 no longer inherits main.cf's submission milter chain: smtpd_milters is always overridden on smtp/inet, to the antispam milter or to nothing. Without that, OpenDKIM (strict, tempfail) gated relayed mail during a signing outage, and the journal-milter filed inbound mail into the outbound send log under the sender's domain -- so Deliveries showed other people's mail and a forged From: consumed that domain's level-2 budget. architecture.md already described the intended behaviour; the code now matches. DMARC reports are checked before they are stored: the policy domain must be a configured sending domain, and must match the +tag of a per-domain hosted address. The rua address form is predictable, so anyone able to reach it could file reports under any domain and evict genuine ones through the retention cap. Zip attachments are now decompressed as well as gzip. The auto level-2 ceiling is scaled to the level-1 window before the multiplier is applied; any window other than 3600s shifted the allowance by window/3600. Migration 0010 indexes send_log(app_login, created_at) -- both the per-MAIL FROM rate-limit count and the per-application statistics were scanning the created_at range. e2e now regenerates the Postfix config in-container for all four port-25 flag combinations and requires postfix check to pass; the 1.9.1 crash-loop shipped in 1.4.0 and survived three releases because only the flags-off path was exercised. Migration 0009 stays as shipped -- its conversion branch only fires for a database carrying application-scope allowed_ips from before 1.9.0. The schema reference notes that the old list was permissive and the new column is restrictive; the guide documents the allow-list as a sending control on a fail-open path, not an authentication boundary. Also: gofmt across cmd/ and internal/, unused duplicate validators dropped from internal/web/validate, export no longer swallows store errors. Co-Authored-By: Claude Opus 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(nil, 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(nil, 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()
|
|
}
|