infrastructure/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2025-06-28 01:48:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

simplify/cleanup common smtpserver test code

Browse Source
This commit is contained in:
Mechiel Lukkien 2025-01-29 21:11:39 +01:00
parent ec7904c0ee
commit 807d01ee21
No known key found for this signature in database
2 changed files with 153 additions and 335 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
smtpserver/alias_test.go
View File

@ -30,23 +30,17 @@ Subject: test
test email test email
`, "\n", "\r\n") `, "\n", "\r\n")
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
t.Helper()
mailFrom := "mjl@mox.example" mailFrom := "mjl@mox.example"
rcptTo := "public@mox.example" rcptTo := "public@mox.example"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
}
ts.smtpErr(err, nil) ts.smtpErr(err, nil)
}) })
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
t.Helper()
mailFrom := "public@mox.example" // List address as smtp mail from. mailFrom := "public@mox.example" // List address as smtp mail from.
rcptTo := "public@mox.example" rcptTo := "public@mox.example"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
}
ts.smtpErr(err, nil) ts.smtpErr(err, nil)
}) })
@ -57,23 +51,17 @@ Subject: test
test email test email
`, "\n", "\r\n") `, "\n", "\r\n")
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
t.Helper()
mailFrom := "mjl@mox.example" mailFrom := "mjl@mox.example"
rcptTo := "private@mox.example" rcptTo := "private@mox.example"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
}
ts.smtpErr(err, &smtpclient.Error{Permanent: true, Code: smtp.C550MailboxUnavail, Secode: smtp.SePol7DeliveryUnauth1}) ts.smtpErr(err, &smtpclient.Error{Permanent: true, Code: smtp.C550MailboxUnavail, Secode: smtp.SePol7DeliveryUnauth1})
}) })
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
t.Helper()
mailFrom := "private@mox.example" // List address as smtp mail from. mailFrom := "private@mox.example" // List address as smtp mail from.
rcptTo := "private@mox.example" rcptTo := "private@mox.example"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
}
ts.smtpErr(err, &smtpclient.Error{Permanent: true, Code: smtp.C550MailboxUnavail, Secode: smtp.SePol7DeliveryUnauth1}) ts.smtpErr(err, &smtpclient.Error{Permanent: true, Code: smtp.C550MailboxUnavail, Secode: smtp.SePol7DeliveryUnauth1})
}) })
} }
@ -108,23 +96,17 @@ Subject: test
test email test email
`, "\n", "\r\n") `, "\n", "\r\n")
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
t.Helper()
mailFrom := "☺@mox.example" mailFrom := "☺@mox.example"
rcptTo := "public@mox.example" rcptTo := "public@mox.example"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), true, true, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), true, true, false)
}
ts.smtpErr(err, &smtpclient.Error{Permanent: true, Code: smtp.C550MailboxUnavail, Secode: smtp.SePol7DeliveryUnauth1}) ts.smtpErr(err, &smtpclient.Error{Permanent: true, Code: smtp.C550MailboxUnavail, Secode: smtp.SePol7DeliveryUnauth1})
}) })
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
t.Helper()
mailFrom := "public@mox.example" // List address as message from. mailFrom := "public@mox.example" // List address as message from.
rcptTo := "public@mox.example" rcptTo := "public@mox.example"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), true, true, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), true, true, false)
}
ts.smtpErr(err, &smtpclient.Error{Permanent: true, Code: smtp.C550MailboxUnavail, Secode: smtp.SePol7DeliveryUnauth1}) ts.smtpErr(err, &smtpclient.Error{Permanent: true, Code: smtp.C550MailboxUnavail, Secode: smtp.SePol7DeliveryUnauth1})
}) })
} }
@ -148,13 +130,10 @@ To: <private@mox.example>
test email test email
`, "\n", "\r\n") `, "\n", "\r\n")
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
t.Helper()
mailFrom := "other@example.org" mailFrom := "other@example.org"
rcptTo := "private@mox.example" rcptTo := "private@mox.example"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
}
ts.smtpErr(err, &smtpclient.Error{Permanent: true, Code: smtp.C550MailboxUnavail, Secode: smtp.SePol7ExpnProhibited2}) ts.smtpErr(err, &smtpclient.Error{Permanent: true, Code: smtp.C550MailboxUnavail, Secode: smtp.SePol7ExpnProhibited2})
}) })
@ -164,13 +143,10 @@ To: <private@mox.example>
test email test email
`, "\n", "\r\n") `, "\n", "\r\n")
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
t.Helper()
mailFrom := "private@example.org" mailFrom := "private@example.org"
rcptTo := "private@mox.example" rcptTo := "private@mox.example"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
}
ts.smtpErr(err, &smtpclient.Error{Permanent: true, Code: smtp.C550MailboxUnavail, Secode: smtp.SePol7ExpnProhibited2}) ts.smtpErr(err, &smtpclient.Error{Permanent: true, Code: smtp.C550MailboxUnavail, Secode: smtp.SePol7ExpnProhibited2})
}) })
@ -181,25 +157,19 @@ Subject: test
test email test email
`, "\n", "\r\n") `, "\n", "\r\n")
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
t.Helper()
mailFrom := "other@example.org" mailFrom := "other@example.org"
rcptTo := "public@mox.example" rcptTo := "public@mox.example"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
}
ts.smtpErr(err, nil) ts.smtpErr(err, nil)
ts.checkCount("Inbox", 2) // Receiving for both mjl@ and móx@. ts.checkCount("Inbox", 2) // Receiving for both mjl@ and móx@.
}) })
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
t.Helper()
mailFrom := "public@example.org" // List address as message from. mailFrom := "public@example.org" // List address as message from.
rcptTo := "public@mox.example" rcptTo := "public@mox.example"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
}
ts.smtpErr(err, nil) ts.smtpErr(err, nil)
ts.checkCount("Inbox", 4) // Receiving for both mjl@ and móx@. ts.checkCount("Inbox", 4) // Receiving for both mjl@ and móx@.
@ -229,24 +199,20 @@ To: <private@mox.example>
test email test email
`, "\n", "\r\n") `, "\n", "\r\n")
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
mailFrom := "mjl@mox.example" mailFrom := "mjl@mox.example"
rcptTo := []string{"private@mox.example", "móx@mox.example"} rcptTo := []string{"private@mox.example", "móx@mox.example"}
if err == nil { _, err := client.DeliverMultiple(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), true, true, false)
_, err = client.DeliverMultiple(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), true, true, false) // assuming there wasn't a per-recipient error
// assuming there wasn't a per-recipient error
}
ts.smtpErr(err, nil) ts.smtpErr(err, nil)
ts.checkCount("Inbox", 1) // Receiving once. For explicit móx@ recipient, not for mjl@ due to msgfrom, and another again for móx@ due to rcpt to. ts.checkCount("Inbox", 1) // Receiving once. For explicit móx@ recipient, not for mjl@ due to msgfrom, and another again for móx@ due to rcpt to.
}) })
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
mailFrom := "mjl@mox.example" mailFrom := "mjl@mox.example"
rcptTo := "private@mox.example" rcptTo := "private@mox.example"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
}
ts.smtpErr(err, nil) ts.smtpErr(err, nil)
ts.checkCount("Inbox", 2) // Only receiving 1 new message compared to previous, for móx@mox.example, not mjl@. ts.checkCount("Inbox", 2) // Only receiving 1 new message compared to previous, for móx@mox.example, not mjl@.
@ -259,13 +225,10 @@ Subject: test
test email test email
`, "\n", "\r\n") `, "\n", "\r\n")
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
t.Helper()
mailFrom := "other@mox.example" mailFrom := "other@mox.example"
rcptTo := "private@mox.example" rcptTo := "private@mox.example"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
}
ts.smtpErr(err, &smtpclient.Error{Permanent: true, Code: smtp.C550MailboxUnavail, Secode: smtp.SePol7ExpnProhibited2}) ts.smtpErr(err, &smtpclient.Error{Permanent: true, Code: smtp.C550MailboxUnavail, Secode: smtp.SePol7ExpnProhibited2})
}) })
@ -276,13 +239,10 @@ Subject: test
test email test email
`, "\n", "\r\n") `, "\n", "\r\n")
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
t.Helper()
mailFrom := "mjl@mox.example" mailFrom := "mjl@mox.example"
rcptTo := "public@mox.example" rcptTo := "public@mox.example"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
}
ts.smtpErr(err, nil) ts.smtpErr(err, nil)
}) })
} }
@ -309,13 +269,10 @@ To: <private@mox.example>
test email test email
`, "\n", "\r\n") `, "\n", "\r\n")
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
t.Helper()
mailFrom := "mjl@mox.example" mailFrom := "mjl@mox.example"
rcptTo := "private@mox.example" rcptTo := "private@mox.example"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
}
ts.smtpErr(err, nil) ts.smtpErr(err, nil)
ts.checkCount("Inbox", 1) // Only receiving for móx@mox.example, not mjl@. ts.checkCount("Inbox", 1) // Only receiving for móx@mox.example, not mjl@.
@ -327,13 +284,10 @@ test email
tcheck(t, err, "mark as junk") tcheck(t, err, "mark as junk")
tcompare(t, n, 1) tcompare(t, n, 1)
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
t.Helper()
mailFrom := "mjl@mox.example" mailFrom := "mjl@mox.example"
rcptTo := "private@mox.example" rcptTo := "private@mox.example"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
}
ts.smtpErr(err, &smtpclient.Error{Code: smtp.C451LocalErr, Secode: smtp.SeSys3Other0}) ts.smtpErr(err, &smtpclient.Error{Code: smtp.C451LocalErr, Secode: smtp.SeSys3Other0})
}) })
} }

376
smtpserver/server_test.go
View File

@ -187,7 +187,16 @@ func (ts *testserver) checkCount(mailboxName string, expect int) {
} }
} }
func (ts *testserver) run(fn func(helloErr error, client *smtpclient.Client)) { func (ts *testserver) run(fn func(client *smtpclient.Client)) {
ts.t.Helper()
ts.runx(func(helloErr error, client *smtpclient.Client) {
ts.t.Helper()
tcheck(ts.t, helloErr, "hello")
fn(client)
})
}
func (ts *testserver) runx(fn func(helloErr error, client *smtpclient.Client)) {
ts.t.Helper() ts.t.Helper()
ts.runRaw(func(conn net.Conn) { ts.runRaw(func(conn net.Conn) {
ts.t.Helper() ts.t.Helper()
@ -240,13 +249,14 @@ func (ts *testserver) runRaw(fn func(clientConn net.Conn)) {
fn(clientConn) fn(clientConn)
} }
func (ts *testserver) smtpErr(err error, expErr *smtpclient.Error) { func (ts *testserver) smtpErr(err error, expErr *smtpclient.Error) *smtpclient.Error {
t := ts.t t := ts.t
t.Helper() t.Helper()
var cerr smtpclient.Error var cerr smtpclient.Error
if expErr == nil && err != nil || expErr != nil && (err == nil || !errors.As(err, &cerr) || cerr.Permanent != expErr.Permanent || cerr.Code != expErr.Code || cerr.Secode != expErr.Secode) { if expErr == nil && err != nil || expErr != nil && (err == nil || !errors.As(err, &cerr) || cerr.Permanent != expErr.Permanent || cerr.Code != expErr.Code || cerr.Secode != expErr.Secode) {
t.Fatalf("got err:\n%#v (%q)\nexpected:\n%#v", err, err, expErr) t.Fatalf("got err:\n%#v (%q)\nexpected:\n%#v", err, err, expErr)
} }
return &cerr
} }
// Just a cert that appears valid. SMTP client will not verify anything about it // Just a cert that appears valid. SMTP client will not verify anything about it
@ -317,8 +327,7 @@ func TestSubmission(t *testing.T) {
} else { } else {
ts.auth = nil ts.auth = nil
} }
ts.run(func(err error, client *smtpclient.Client) { ts.runx(func(err error, client *smtpclient.Client) {
t.Helper()
mailFrom := "mjl@mox.example" mailFrom := "mjl@mox.example"
rcptTo := "remote@example.org" rcptTo := "remote@example.org"
if err == nil { if err == nil {
@ -483,16 +492,11 @@ func TestDomainDisabled(t *testing.T) {
ts.pass = password0 ts.pass = password0
// Submission with SMTP MAIL FROM of disabled domain must fail. // Submission with SMTP MAIL FROM of disabled domain must fail.
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
mailFrom := "mjl@disabled.example" // Disabled. mailFrom := "mjl@disabled.example" // Disabled.
rcptTo := "remote@example.org" rcptTo := "remote@example.org"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(submitMessage)), strings.NewReader(submitMessage), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(submitMessage)), strings.NewReader(submitMessage), false, false, false) ts.smtpErr(err, &smtpclient.Error{Permanent: false, Code: smtp.C451LocalErr, Secode: smtp.SeSys3Other0})
}
var cerr smtpclient.Error
if err == nil || !errors.As(err, &cerr) || cerr.Code != smtp.C451LocalErr {
t.Fatalf("got err %v, expected smtpclient.Error with code %d", err, smtp.C451LocalErr)
}
checkEvaluationCount(t, 0) checkEvaluationCount(t, 0)
}) })
@ -504,16 +508,11 @@ Message-Id: <test@mox.example>
test email test email
`, "\n", "\r\n") `, "\n", "\r\n")
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
mailFrom := "mjl@mox.example" mailFrom := "mjl@mox.example"
rcptTo := "remote@example.org" rcptTo := "remote@example.org"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(submitMessage2)), strings.NewReader(submitMessage2), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(submitMessage2)), strings.NewReader(submitMessage2), false, false, false) ts.smtpErr(err, &smtpclient.Error{Permanent: false, Code: smtp.C451LocalErr, Secode: smtp.SeSys3Other0})
}
var cerr smtpclient.Error
if err == nil || !errors.As(err, &cerr) || cerr.Code != smtp.C451LocalErr {
t.Fatalf("got err %v, expected smtpclient.Error with code %d", err, smtp.C451LocalErr)
}
checkEvaluationCount(t, 0) checkEvaluationCount(t, 0)
}) })
} }
@ -529,85 +528,55 @@ func TestDelivery(t *testing.T) {
ts := newTestServer(t, filepath.FromSlash("../testdata/smtp/mox.conf"), resolver) ts := newTestServer(t, filepath.FromSlash("../testdata/smtp/mox.conf"), resolver)
defer ts.close() defer ts.close()
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
mailFrom := "remote@example.org" mailFrom := "remote@example.org"
rcptTo := "mjl@127.0.0.10" rcptTo := "mjl@127.0.0.10"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false) ts.smtpErr(err, &smtpclient.Error{Permanent: true, Code: smtp.C550MailboxUnavail, Secode: smtp.SeAddr1UnknownDestMailbox1})
}
var cerr smtpclient.Error
if err == nil || !errors.As(err, &cerr) || cerr.Code != smtp.C550MailboxUnavail {
t.Fatalf("deliver to ip address, got err %v, expected smtpclient.Error with code %d", err, smtp.C550MailboxUnavail)
}
}) })
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
mailFrom := "remote@example.org" mailFrom := "remote@example.org"
rcptTo := "mjl@test.example" // Not configured as destination. rcptTo := "mjl@test.example" // Not configured as destination.
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false) ts.smtpErr(err, &smtpclient.Error{Permanent: true, Code: smtp.C550MailboxUnavail, Secode: smtp.SeAddr1UnknownDestMailbox1})
}
var cerr smtpclient.Error
if err == nil || !errors.As(err, &cerr) || cerr.Code != smtp.C550MailboxUnavail {
t.Fatalf("deliver to unknown domain, got err %v, expected smtpclient.Error with code %d", err, smtp.C550MailboxUnavail)
}
}) })
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
mailFrom := "remote@example.org" mailFrom := "remote@example.org"
rcptTo := "unknown@mox.example" // User unknown. rcptTo := "unknown@mox.example" // User unknown.
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false) ts.smtpErr(err, &smtpclient.Error{Permanent: true, Code: smtp.C550MailboxUnavail, Secode: smtp.SeAddr1UnknownDestMailbox1})
}
var cerr smtpclient.Error
if err == nil || !errors.As(err, &cerr) || cerr.Code != smtp.C550MailboxUnavail {
t.Fatalf("deliver to unknown user for known domain, got err %v, expected smtpclient.Error with code %d", err, smtp.C550MailboxUnavail)
}
}) })
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
mailFrom := "remote@example.org" mailFrom := "remote@example.org"
rcptTo := "mjl@mox.example" rcptTo := "mjl@mox.example"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false) ts.smtpErr(err, &smtpclient.Error{Permanent: false, Code: smtp.C451LocalErr, Secode: smtp.SeSys3Other0})
}
var cerr smtpclient.Error
if err == nil || !errors.As(err, &cerr) || cerr.Code != smtp.C451LocalErr {
t.Fatalf("deliver from user without reputation, valid iprev required, got err %v, expected smtpclient.Error with code %d", err, smtp.C451LocalErr)
}
}) })
// Set up iprev to get delivery from unknown user to be accepted. // Set up iprev to get delivery from unknown user to be accepted.
resolver.PTR["127.0.0.10"] = []string{"example.org."} resolver.PTR["127.0.0.10"] = []string{"example.org."}
// Only ascii o@ is configured, not the greek and cyrillic lookalikes. // Only ascii o@ is configured, not the greek and cyrillic lookalikes.
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
mailFrom := "remote@example.org" mailFrom := "remote@example.org"
rcptTo := "ο@mox.example" // omicron \u03bf, looks like the configured o@ rcptTo := "ο@mox.example" // omicron \u03bf, looks like the configured o@
msg := strings.ReplaceAll(deliverMessage, "mjl@mox.example", rcptTo) msg := strings.ReplaceAll(deliverMessage, "mjl@mox.example", rcptTo)
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, true, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, true, false) ts.smtpErr(err, &smtpclient.Error{Permanent: true, Code: smtp.C550MailboxUnavail, Secode: smtp.SeAddr1UnknownDestMailbox1})
}
var cerr smtpclient.Error
if err == nil || !errors.As(err, &cerr) || cerr.Code != smtp.C550MailboxUnavail {
t.Fatalf("deliver to omicron @ instead of ascii o @, got err %v, expected smtpclient.Error with code %d", err, smtp.C550MailboxUnavail)
}
}) })
// Deliveries to disabled domain are rejected with temporary error. // Deliveries to disabled domain are rejected with temporary error.
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
mailFrom := "remote@example.org" mailFrom := "remote@example.org"
rcptTo := "mjl@disabled.example" rcptTo := "mjl@disabled.example"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false) ts.smtpErr(err, &smtpclient.Error{Permanent: false, Code: smtp.C450MailboxUnavail, Secode: smtp.SeMailbox2Disabled1})
}
var cerr smtpclient.Error
if err == nil || !errors.As(err, &cerr) || cerr.Code != smtp.C450MailboxUnavail {
t.Fatalf("deliver to disabled domain, got err %v, expected smtpclient.Error with code %d", err, smtp.C450MailboxUnavail)
}
}) })
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
recipients := []string{ recipients := []string{
"mjl@mox.example", "mjl@mox.example",
"o@mox.example", // ascii o, as configured "o@mox.example", // ascii o, as configured
@ -624,9 +593,7 @@ func TestDelivery(t *testing.T) {
msg := strings.ReplaceAll(deliverMessage, "mjl@mox.example", rcptTo) msg := strings.ReplaceAll(deliverMessage, "mjl@mox.example", rcptTo)
mailFrom := "remote@example.org" mailFrom := "remote@example.org"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, true, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, true, false)
}
tcheck(t, err, "deliver to remote") tcheck(t, err, "deliver to remote")
changes := make(chan []store.Change) changes := make(chan []store.Change)
@ -741,16 +708,11 @@ func TestSpam(t *testing.T) {
} }
// Delivery from sender with bad reputation should fail. // Delivery from sender with bad reputation should fail.
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
mailFrom := "remote@example.org" mailFrom := "remote@example.org"
rcptTo := "mjl@mox.example" rcptTo := "mjl@mox.example"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false) ts.smtpErr(err, &smtpclient.Error{Permanent: false, Code: smtp.C451LocalErr, Secode: smtp.SeSys3Other0})
}
var cerr smtpclient.Error
if err == nil || !errors.As(err, &cerr) || cerr.Code != smtp.C451LocalErr {
t.Fatalf("delivery by bad sender, got err %v, expected smtpclient.Error with code %d", err, smtp.C451LocalErr)
}
ts.checkCount("Rejects", 1) ts.checkCount("Rejects", 1)
checkEvaluationCount(t, 0) // No positive interactions yet. checkEvaluationCount(t, 0) // No positive interactions yet.
@ -758,12 +720,10 @@ func TestSpam(t *testing.T) {
// Delivery from sender with bad reputation matching AcceptRejectsToMailbox should // Delivery from sender with bad reputation matching AcceptRejectsToMailbox should
// result in accepted delivery to the mailbox. // result in accepted delivery to the mailbox.
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
mailFrom := "remote@example.org" mailFrom := "remote@example.org"
rcptTo := "mjl2@mox.example" rcptTo := "mjl2@mox.example"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage2)), strings.NewReader(deliverMessage2), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage2)), strings.NewReader(deliverMessage2), false, false, false)
}
tcheck(t, err, "deliver") tcheck(t, err, "deliver")
ts.checkCount("mjl2junk", 1) // In ruleset rejects mailbox. ts.checkCount("mjl2junk", 1) // In ruleset rejects mailbox.
@ -778,12 +738,11 @@ func TestSpam(t *testing.T) {
tcheck(t, err, "update junkiness") tcheck(t, err, "update junkiness")
// Message should now be accepted. // Message should now be accepted.
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
tcheck(t, err, "hello")
mailFrom := "remote@example.org" mailFrom := "remote@example.org"
rcptTo := "mjl@mox.example" rcptTo := "mjl@mox.example"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false)
}
tcheck(t, err, "deliver") tcheck(t, err, "deliver")
// Message should now be removed from Rejects mailboxes. // Message should now be removed from Rejects mailboxes.
@ -801,16 +760,12 @@ func TestSpam(t *testing.T) {
tretrain(t, ts.acc) tretrain(t, ts.acc)
// Message should be refused for spammy content. // Message should be refused for spammy content.
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
tcheck(t, err, "hello")
mailFrom := "remote@example.org" mailFrom := "remote@example.org"
rcptTo := "mjl@mox.example" rcptTo := "mjl@mox.example"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false) ts.smtpErr(err, &smtpclient.Error{Permanent: false, Code: smtp.C451LocalErr, Secode: smtp.SeSys3Other0})
}
var cerr smtpclient.Error
if err == nil || !errors.As(err, &cerr) || cerr.Code != smtp.C451LocalErr {
t.Fatalf("attempt to deliver spamy message, got err %v, expected smtpclient.Error with code %d", err, smtp.C451LocalErr)
}
checkEvaluationCount(t, 1) // No new evaluation, this isn't a DMARC reject. checkEvaluationCount(t, 1) // No new evaluation, this isn't a DMARC reject.
}) })
} }
@ -876,16 +831,14 @@ happens to come from forwarding mail server.
// Deliver forwarded messages, then classify as junk. Normally enough to treat // Deliver forwarded messages, then classify as junk. Normally enough to treat
// other unrelated messages from IP as junk, but not for forwarded messages. // other unrelated messages from IP as junk, but not for forwarded messages.
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
tcheck(t, err, "connect")
mailFrom := "remote@forward.example" mailFrom := "remote@forward.example"
if !forward { if !forward {
mailFrom = "remote@bad.example" mailFrom = "remote@bad.example"
} }
for i := 0; i < 10; i++ { for i := 0; i < 10; i++ {
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msgBad)), strings.NewReader(msgBad), false, false, false) err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msgBad)), strings.NewReader(msgBad), false, false, false)
tcheck(t, err, "deliver message") tcheck(t, err, "deliver message")
} }
totalEvaluations += 10 totalEvaluations += 10
@ -896,10 +849,7 @@ happens to come from forwarding mail server.
// Next delivery will fail, with negative "message From" signal. // Next delivery will fail, with negative "message From" signal.
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msgBad)), strings.NewReader(msgBad), false, false, false) err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msgBad)), strings.NewReader(msgBad), false, false, false)
var cerr smtpclient.Error ts.smtpErr(err, &smtpclient.Error{Permanent: false, Code: smtp.C451LocalErr, Secode: smtp.SeSys3Other0})
if err == nil || !errors.As(err, &cerr) || cerr.Code != smtp.C451LocalErr {
t.Fatalf("delivery by bad sender, got err %v, expected smtpclient.Error with code %d", err, smtp.C451LocalErr)
}
checkEvaluationCount(t, totalEvaluations) checkEvaluationCount(t, totalEvaluations)
}) })
@ -907,31 +857,24 @@ happens to come from forwarding mail server.
// Delivery from different "message From" without reputation, but from same // Delivery from different "message From" without reputation, but from same
// forwarding email server, should succeed under forwarding, not as regular sending // forwarding email server, should succeed under forwarding, not as regular sending
// server. // server.
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
tcheck(t, err, "connect")
mailFrom := "remote@forward.example" mailFrom := "remote@forward.example"
if !forward { if !forward {
mailFrom = "remote@good.example" mailFrom = "remote@good.example"
} }
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msgOK)), strings.NewReader(msgOK), false, false, false) err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msgOK)), strings.NewReader(msgOK), false, false, false)
if forward { if forward {
tcheck(t, err, "deliver") tcheck(t, err, "deliver")
totalEvaluations += 1 totalEvaluations += 1
} else { } else {
var cerr smtpclient.Error ts.smtpErr(err, &smtpclient.Error{Permanent: false, Code: smtp.C451LocalErr, Secode: smtp.SeSys3Other0})
if err == nil || !errors.As(err, &cerr) || cerr.Code != smtp.C451LocalErr {
t.Fatalf("delivery by bad ip, got err %v, expected smtpclient.Error with code %d", err, smtp.C451LocalErr)
}
} }
checkEvaluationCount(t, totalEvaluations) checkEvaluationCount(t, totalEvaluations)
}) })
// Delivery from forwarding server that isn't a forward should get same treatment. // Delivery from forwarding server that isn't a forward should get same treatment.
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
tcheck(t, err, "connect")
mailFrom := "other@forward.example" mailFrom := "other@forward.example"
// Ensure To header matches. // Ensure To header matches.
@ -940,15 +883,12 @@ happens to come from forwarding mail server.
msg = strings.ReplaceAll(msg, "<mjl@mox.example>", "<mjl3@mox.example>") msg = strings.ReplaceAll(msg, "<mjl@mox.example>", "<mjl3@mox.example>")
} }
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false) err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
if forward { if forward {
tcheck(t, err, "deliver") tcheck(t, err, "deliver")
totalEvaluations += 1 totalEvaluations += 1
} else { } else {
var cerr smtpclient.Error ts.smtpErr(err, &smtpclient.Error{Permanent: false, Code: smtp.C451LocalErr, Secode: smtp.SeSys3Other0})
if err == nil || !errors.As(err, &cerr) || cerr.Code != smtp.C451LocalErr {
t.Fatalf("delivery by bad ip, got err %v, expected smtpclient.Error with code %d", err, smtp.C451LocalErr)
}
} }
checkEvaluationCount(t, totalEvaluations) checkEvaluationCount(t, totalEvaluations)
}) })
@ -973,16 +913,11 @@ func TestDMARCSent(t *testing.T) {
defer ts.close() defer ts.close()
// First check that DMARC policy rejects message and results in optional evaluation. // First check that DMARC policy rejects message and results in optional evaluation.
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
mailFrom := "remote@example.org" mailFrom := "remote@example.org"
rcptTo := "mjl@mox.example" rcptTo := "mjl@mox.example"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false) ts.smtpErr(err, &smtpclient.Error{Permanent: true, Code: smtp.C550MailboxUnavail, Secode: smtp.SePol7MultiAuthFails26})
}
var cerr smtpclient.Error
if err == nil || !errors.As(err, &cerr) || cerr.Code != smtp.C550MailboxUnavail {
t.Fatalf("attempt to deliver spamy message, got err %v, expected smtpclient.Error with code %d", err, smtp.C550MailboxUnavail)
}
l := checkEvaluationCount(t, 1) l := checkEvaluationCount(t, 1)
tcompare(t, l[0].Optional, true) tcompare(t, l[0].Optional, true)
}) })
@ -1011,16 +946,11 @@ func TestDMARCSent(t *testing.T) {
tretrain(t, ts.acc) tretrain(t, ts.acc)
// Baseline, message should be refused for spammy content. // Baseline, message should be refused for spammy content.
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
mailFrom := "remote@example.org" mailFrom := "remote@example.org"
rcptTo := "mjl@mox.example" rcptTo := "mjl@mox.example"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false) ts.smtpErr(err, &smtpclient.Error{Permanent: false, Code: smtp.C451LocalErr, Secode: smtp.SeSys3Other0})
}
var cerr smtpclient.Error
if err == nil || !errors.As(err, &cerr) || cerr.Code != smtp.C451LocalErr {
t.Fatalf("attempt to deliver spamy message, got err %v, expected smtpclient.Error with code %d", err, smtp.C451LocalErr)
}
checkEvaluationCount(t, 1) // No new evaluation. checkEvaluationCount(t, 1) // No new evaluation.
}) })
@ -1034,28 +964,21 @@ func TestDMARCSent(t *testing.T) {
// is no longer unknown and we should see a non-optional evaluation that will // is no longer unknown and we should see a non-optional evaluation that will
// result in a DMARC report. // result in a DMARC report.
resolver.TXT["example.org."] = []string{"v=spf1 ip4:127.0.0.1 -all"} resolver.TXT["example.org."] = []string{"v=spf1 ip4:127.0.0.1 -all"}
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
mailFrom := "remote@example.org" mailFrom := "remote@example.org"
rcptTo := "mjl@mox.example" rcptTo := "mjl@mox.example"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false) ts.smtpErr(err, &smtpclient.Error{Permanent: true, Code: smtp.C550MailboxUnavail, Secode: smtp.SePol7MultiAuthFails26})
}
var cerr smtpclient.Error
if err == nil || !errors.As(err, &cerr) || cerr.Code != smtp.C550MailboxUnavail {
t.Fatalf("attempt to deliver spamy message, got err %v, expected smtpclient.Error with code %d", err, smtp.C550MailboxUnavail)
}
l := checkEvaluationCount(t, 2) // New evaluation. l := checkEvaluationCount(t, 2) // New evaluation.
tcompare(t, l[1].Optional, false) tcompare(t, l[1].Optional, false)
}) })
// We should now be accepting the message because we recently sent a message. // We should now be accepting the message because we recently sent a message.
resolver.TXT["example.org."] = []string{"v=spf1 ip4:127.0.0.10 -all"} resolver.TXT["example.org."] = []string{"v=spf1 ip4:127.0.0.10 -all"}
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
mailFrom := "remote@example.org" mailFrom := "remote@example.org"
rcptTo := "mjl@mox.example" rcptTo := "mjl@mox.example"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false)
}
tcheck(t, err, "deliver") tcheck(t, err, "deliver")
l := checkEvaluationCount(t, 3) // New evaluation. l := checkEvaluationCount(t, 3) // New evaluation.
tcompare(t, l[2].Optional, false) tcompare(t, l[2].Optional, false)
@ -1085,16 +1008,11 @@ func TestBlocklistedSubjectpass(t *testing.T) {
defer ts.close() defer ts.close()
// Message should be refused softly (temporary error) due to DNSBL. // Message should be refused softly (temporary error) due to DNSBL.
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
mailFrom := "remote@example.org" mailFrom := "remote@example.org"
rcptTo := "mjl@mox.example" rcptTo := "mjl@mox.example"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false) ts.smtpErr(err, &smtpclient.Error{Permanent: false, Code: smtp.C451LocalErr, Secode: smtp.SeSys3Other0})
}
var cerr smtpclient.Error
if err == nil || !errors.As(err, &cerr) || cerr.Code != smtp.C451LocalErr {
t.Fatalf("attempted deliver from dnsblocklisted ip, got err %v, expected smtpclient.Error with code %d", err, smtp.C451LocalErr)
}
}) })
// Set up subjectpass on account. // Set up subjectpass on account.
@ -1104,16 +1022,11 @@ func TestBlocklistedSubjectpass(t *testing.T) {
// Message should be refused quickly (permanent error) due to DNSBL and Subjectkey. // Message should be refused quickly (permanent error) due to DNSBL and Subjectkey.
var pass string var pass string
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
mailFrom := "remote@example.org" mailFrom := "remote@example.org"
rcptTo := "mjl@mox.example" rcptTo := "mjl@mox.example"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false) cerr := ts.smtpErr(err, &smtpclient.Error{Permanent: true, Code: smtp.C550MailboxUnavail, Secode: smtp.SePol7DeliveryUnauth1})
}
var cerr smtpclient.Error
if err == nil || !errors.As(err, &cerr) || cerr.Code != smtp.C550MailboxUnavail {
t.Fatalf("attempted deliver from dnsblocklisted ip, got err %v, expected smtpclient.Error with code %d", err, smtp.C550MailboxUnavail)
}
i := strings.Index(cerr.Line, subjectpass.Explanation) i := strings.Index(cerr.Line, subjectpass.Explanation)
if i < 0 { if i < 0 {
t.Fatalf("got error line %q, expected error line with subjectpass", cerr.Line) t.Fatalf("got error line %q, expected error line with subjectpass", cerr.Line)
@ -1121,13 +1034,11 @@ func TestBlocklistedSubjectpass(t *testing.T) {
pass = cerr.Line[i+len(subjectpass.Explanation):] pass = cerr.Line[i+len(subjectpass.Explanation):]
}) })
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
mailFrom := "remote@example.org" mailFrom := "remote@example.org"
rcptTo := "mjl@mox.example" rcptTo := "mjl@mox.example"
passMessage := strings.Replace(deliverMessage, "Subject: test", "Subject: test "+pass, 1) passMessage := strings.Replace(deliverMessage, "Subject: test", "Subject: test "+pass, 1)
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(passMessage)), strings.NewReader(passMessage), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(passMessage)), strings.NewReader(passMessage), false, false, false)
}
tcheck(t, err, "deliver with subjectpass") tcheck(t, err, "deliver with subjectpass")
}) })
} }
@ -1151,11 +1062,9 @@ func TestDMARCReport(t *testing.T) {
run := func(report string, n int) { run := func(report string, n int) {
t.Helper() t.Helper()
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
t.Helper() t.Helper()
tcheck(t, err, "run")
mailFrom := "remote@example.org" mailFrom := "remote@example.org"
rcptTo := "mjl@mox.example" rcptTo := "mjl@mox.example"
@ -1167,9 +1076,7 @@ func TestDMARCReport(t *testing.T) {
tcheck(t, xerr, "write message") tcheck(t, xerr, "write message")
msg := msgb.String() msg := msgb.String()
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
}
tcheck(t, err, "deliver") tcheck(t, err, "deliver")
records, err := dmarcdb.Records(ctxbg) records, err := dmarcdb.Records(ctxbg)
@ -1278,7 +1185,7 @@ func TestTLSReport(t *testing.T) {
run := func(rcptTo, tlsrpt string, n int) { run := func(rcptTo, tlsrpt string, n int) {
t.Helper() t.Helper()
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
t.Helper() t.Helper()
mailFrom := "remote@example.org" mailFrom := "remote@example.org"
@ -1293,9 +1200,7 @@ func TestTLSReport(t *testing.T) {
tcheck(t, xerr, "dkim sign") tcheck(t, xerr, "dkim sign")
msg = headers + msg msg = headers + msg
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
}
tcheck(t, err, "deliver") tcheck(t, err, "deliver")
records, err := tlsrptdb.Records(ctxbg) records, err := tlsrptdb.Records(ctxbg)
@ -1331,7 +1236,7 @@ func TestRatelimitConnectionrate(t *testing.T) {
// We may be passing a window boundary during this tests. The limit is 300/minute. // We may be passing a window boundary during this tests. The limit is 300/minute.
// So make twice that many connections and hope the tests don't take too long. // So make twice that many connections and hope the tests don't take too long.
for i := 0; i <= 2*300; i++ { for i := 0; i <= 2*300; i++ {
ts.run(func(err error, client *smtpclient.Client) { ts.runx(func(err error, client *smtpclient.Client) {
t.Helper() t.Helper()
if err != nil && i < 300 { if err != nil && i < 300 {
t.Fatalf("expected smtp connection, got %v", err) t.Fatalf("expected smtp connection, got %v", err)
@ -1359,7 +1264,7 @@ func TestRatelimitAuth(t *testing.T) {
// failures/minute. So make twice that many connections and hope the tests don't // failures/minute. So make twice that many connections and hope the tests don't
// take too long. // take too long.
for i := 0; i <= 2*10; i++ { for i := 0; i <= 2*10; i++ {
ts.run(func(err error, client *smtpclient.Client) { ts.runx(func(err error, client *smtpclient.Client) {
t.Helper() t.Helper()
if err == nil { if err == nil {
t.Fatalf("got auth success with bad credentials") t.Fatalf("got auth success with bad credentials")
@ -1397,19 +1302,14 @@ func TestRatelimitDelivery(t *testing.T) {
limitIPMasked1MessagesPerMinute = orig limitIPMasked1MessagesPerMinute = orig
}() }()
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
mailFrom := "remote@example.org" mailFrom := "remote@example.org"
rcptTo := "mjl@mox.example" rcptTo := "mjl@mox.example"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false)
}
tcheck(t, err, "deliver to remote") tcheck(t, err, "deliver to remote")
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false) err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false)
var cerr smtpclient.Error ts.smtpErr(err, &smtpclient.Error{Permanent: false, Code: smtp.C452StorageFull, Secode: smtp.SeMailbox2Full2})
if err == nil || !errors.As(err, &cerr) || cerr.Code != smtp.C452StorageFull {
t.Fatalf("got err %v, expected smtpclient error with code 452 for storage full", err)
}
}) })
limitIPMasked1MessagesPerMinute = orig limitIPMasked1MessagesPerMinute = orig
@ -1426,19 +1326,14 @@ func TestRatelimitDelivery(t *testing.T) {
defer func() { defer func() {
limitIPMasked1SizePerMinute = origSize limitIPMasked1SizePerMinute = origSize
}() }()
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
mailFrom := "remote@example.org" mailFrom := "remote@example.org"
rcptTo := "mjl@mox.example" rcptTo := "mjl@mox.example"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false)
}
tcheck(t, err, "deliver to remote") tcheck(t, err, "deliver to remote")
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false) err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false)
var cerr smtpclient.Error ts.smtpErr(err, &smtpclient.Error{Permanent: false, Code: smtp.C452StorageFull, Secode: smtp.SeMailbox2Full2})
if err == nil || !errors.As(err, &cerr) || cerr.Code != smtp.C452StorageFull {
t.Fatalf("got err %v, expected smtpclient error with code 452 for storage full", err)
}
}) })
} }
@ -1499,12 +1394,10 @@ func TestLimitOutgoing(t *testing.T) {
testSubmit := func(rcptTo string, expErr *smtpclient.Error) { testSubmit := func(rcptTo string, expErr *smtpclient.Error) {
t.Helper() t.Helper()
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
t.Helper() t.Helper()
mailFrom := "mjl@mox.example" mailFrom := "mjl@mox.example"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(submitMessage)), strings.NewReader(submitMessage), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(submitMessage)), strings.NewReader(submitMessage), false, false, false)
}
ts.smtpErr(err, expErr) ts.smtpErr(err, expErr)
}) })
} }
@ -1532,13 +1425,9 @@ func TestQuota(t *testing.T) {
defer ts.close() defer ts.close()
testDeliver := func(rcptTo string, expErr *smtpclient.Error) { testDeliver := func(rcptTo string, expErr *smtpclient.Error) {
t.Helper() ts.run(func(client *smtpclient.Client) {
ts.run(func(err error, client *smtpclient.Client) {
t.Helper()
mailFrom := "mjl@other.example" mailFrom := "mjl@other.example"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false)
}
ts.smtpErr(err, expErr) ts.smtpErr(err, expErr)
}) })
} }
@ -1561,12 +1450,10 @@ func TestCatchall(t *testing.T) {
testDeliver := func(rcptTo string, expErr *smtpclient.Error) { testDeliver := func(rcptTo string, expErr *smtpclient.Error) {
t.Helper() t.Helper()
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
t.Helper() t.Helper()
mailFrom := "mjl@other.example" mailFrom := "mjl@other.example"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(submitMessage)), strings.NewReader(submitMessage), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(submitMessage)), strings.NewReader(submitMessage), false, false, false)
}
ts.smtpErr(err, expErr) ts.smtpErr(err, expErr)
}) })
} }
@ -1645,7 +1532,7 @@ func TestDKIMSign(t *testing.T) {
n := 0 n := 0
testSubmit := func(mailFrom, msgFrom string) { testSubmit := func(mailFrom, msgFrom string) {
t.Helper() t.Helper()
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
t.Helper() t.Helper()
msg := strings.ReplaceAll(fmt.Sprintf(`From: <%s> msg := strings.ReplaceAll(fmt.Sprintf(`From: <%s>
@ -1657,9 +1544,7 @@ test email
`, msgFrom), "\n", "\r\n") `, msgFrom), "\n", "\r\n")
rcptTo := "remote@example.org" rcptTo := "remote@example.org"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
}
tcheck(t, err, "deliver") tcheck(t, err, "deliver")
msgs, err := queue.List(ctxbg, queue.Filter{}, queue.Sort{}) msgs, err := queue.List(ctxbg, queue.Filter{}, queue.Sort{})
@ -1699,12 +1584,10 @@ func TestPostmaster(t *testing.T) {
testDeliver := func(rcptTo string, expErr *smtpclient.Error) { testDeliver := func(rcptTo string, expErr *smtpclient.Error) {
t.Helper() t.Helper()
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
t.Helper() t.Helper()
mailFrom := "mjl@other.example" mailFrom := "mjl@other.example"
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false)
}
ts.smtpErr(err, expErr) ts.smtpErr(err, expErr)
}) })
} }
@ -1729,15 +1612,10 @@ func TestEmptylocalpart(t *testing.T) {
defer ts.close() defer ts.close()
testDeliver := func(rcptTo string, expErr *smtpclient.Error) { testDeliver := func(rcptTo string, expErr *smtpclient.Error) {
t.Helper() ts.run(func(client *smtpclient.Client) {
ts.run(func(err error, client *smtpclient.Client) {
t.Helper()
mailFrom := `""@other.example` mailFrom := `""@other.example`
msg := strings.ReplaceAll(deliverMessage, "To: <mjl@mox.example>", `To: <""@mox.example>`) msg := strings.ReplaceAll(deliverMessage, "To: <mjl@mox.example>", `To: <""@mox.example>`)
if err == nil { err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, false)
}
ts.smtpErr(err, expErr) ts.smtpErr(err, expErr)
}) })
} }
@ -1796,13 +1674,11 @@ test email
testSubmit := func(msg string, requiretls bool, expRequireTLS *bool) { testSubmit := func(msg string, requiretls bool, expRequireTLS *bool) {
t.Helper() t.Helper()
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
t.Helper() t.Helper()
rcptTo := "remote@example.org" rcptTo := "remote@example.org"
if err == nil { err := client.Deliver(ctxbg, "mjl@mox.example", rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, requiretls)
err = client.Deliver(ctxbg, "mjl@mox.example", rcptTo, int64(len(msg)), strings.NewReader(msg), false, false, requiretls)
}
tcheck(t, err, "deliver") tcheck(t, err, "deliver")
msgs, err := queue.List(ctxbg, queue.Filter{}, queue.Sort{}) msgs, err := queue.List(ctxbg, queue.Filter{}, queue.Sort{})
@ -1824,13 +1700,9 @@ test email
// Check that we get an error if remote SMTP server does not support the requiretls // Check that we get an error if remote SMTP server does not support the requiretls
// extension. // extension.
ts.requiretls = false ts.requiretls = false
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
t.Helper()
rcptTo := "remote@example.org" rcptTo := "remote@example.org"
if err == nil { err := client.Deliver(ctxbg, "mjl@mox.example", rcptTo, int64(len(msg0)), strings.NewReader(msg0), false, false, true)
err = client.Deliver(ctxbg, "mjl@mox.example", rcptTo, int64(len(msg0)), strings.NewReader(msg0), false, false, true)
}
if err == nil { if err == nil {
t.Fatalf("delivered with requiretls to server without requiretls") t.Fatalf("delivered with requiretls to server without requiretls")
} }
@ -1993,7 +1865,7 @@ func TestSMTPUTF8(t *testing.T) {
test := func(mailFrom string, rcptTo string, headerValue string, filename string, clientSmtputf8 bool, expectedSmtputf8 bool, expErr *smtpclient.Error) { test := func(mailFrom string, rcptTo string, headerValue string, filename string, clientSmtputf8 bool, expectedSmtputf8 bool, expErr *smtpclient.Error) {
t.Helper() t.Helper()
ts.run(func(_ error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
t.Helper() t.Helper()
msg := strings.ReplaceAll(fmt.Sprintf(`From: <%s> msg := strings.ReplaceAll(fmt.Sprintf(`From: <%s>
To: <%s> To: <%s>
@ -2062,12 +1934,10 @@ Message-Id: <test@mox.example>
test email test email
`, "\n", "\r\n") `, "\n", "\r\n")
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
t.Helper()
tcheck(t, err, "init client")
mailFrom := "mjl@mox.example" mailFrom := "mjl@mox.example"
rcptTo := "mjl@mox.example" rcptTo := "mjl@mox.example"
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(extraMsg)), strings.NewReader(extraMsg), true, true, false) err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(extraMsg)), strings.NewReader(extraMsg), true, true, false)
tcheck(t, err, "deliver") tcheck(t, err, "deliver")
}) })
msgs, err := queue.List(ctxbg, queue.Filter{}, queue.Sort{}) msgs, err := queue.List(ctxbg, queue.Filter{}, queue.Sort{})
@ -2101,11 +1971,10 @@ Message-Id: <test@mox.example>
test email test email
`, "\n", "\r\n") `, "\n", "\r\n")
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
tcheck(t, err, "init client")
mailFrom := "mjl@mox.example" mailFrom := "mjl@mox.example"
rcptTo := "mjl@mox.example" rcptTo := "mjl@mox.example"
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(extraMsg)), strings.NewReader(extraMsg), true, true, false) err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(extraMsg)), strings.NewReader(extraMsg), true, true, false)
ts.smtpErr(err, &smtpclient.Error{Permanent: true, Code: smtp.C554TransactionFailed, Secode: smtp.SeMsg6Other0}) ts.smtpErr(err, &smtpclient.Error{Permanent: true, Code: smtp.C554TransactionFailed, Secode: smtp.SeMsg6Other0})
}) })
} }
@ -2127,29 +1996,26 @@ test email
`, "\n", "\r\n") `, "\n", "\r\n")
// Specify our own unique id when queueing. // Specify our own unique id when queueing.
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
tcheck(t, err, "init client")
mailFrom := "mjl+unique@mox.example" mailFrom := "mjl+unique@mox.example"
rcptTo := "mjl@mox.example" rcptTo := "mjl@mox.example"
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(extraMsg)), strings.NewReader(extraMsg), true, true, false) err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(extraMsg)), strings.NewReader(extraMsg), true, true, false)
ts.smtpErr(err, nil) ts.smtpErr(err, nil)
}) })
// But we can only use it once. // But we can only use it once.
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
tcheck(t, err, "init client")
mailFrom := "mjl+unique@mox.example" mailFrom := "mjl+unique@mox.example"
rcptTo := "mjl@mox.example" rcptTo := "mjl@mox.example"
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(extraMsg)), strings.NewReader(extraMsg), true, true, false) err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(extraMsg)), strings.NewReader(extraMsg), true, true, false)
ts.smtpErr(err, &smtpclient.Error{Permanent: true, Code: smtp.C554TransactionFailed, Secode: smtp.SeAddr1SenderSyntax7}) ts.smtpErr(err, &smtpclient.Error{Permanent: true, Code: smtp.C554TransactionFailed, Secode: smtp.SeAddr1SenderSyntax7})
}) })
// We cannot use our own fromid with multiple recipients. // We cannot use our own fromid with multiple recipients.
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
tcheck(t, err, "init client")
mailFrom := "mjl+unique2@mox.example" mailFrom := "mjl+unique2@mox.example"
rcptTo := []string{"mjl@mox.example", "mjl@mox.example"} rcptTo := []string{"mjl@mox.example", "mjl@mox.example"}
_, err = client.DeliverMultiple(ctxbg, mailFrom, rcptTo, int64(len(extraMsg)), strings.NewReader(extraMsg), true, true, false) _, err := client.DeliverMultiple(ctxbg, mailFrom, rcptTo, int64(len(extraMsg)), strings.NewReader(extraMsg), true, true, false)
ts.smtpErr(err, &smtpclient.Error{Permanent: true, Code: smtp.C554TransactionFailed, Secode: smtp.SeProto5TooManyRcpts3}) ts.smtpErr(err, &smtpclient.Error{Permanent: true, Code: smtp.C554TransactionFailed, Secode: smtp.SeProto5TooManyRcpts3})
}) })
} }
@ -2165,12 +2031,10 @@ func TestDestinationSMTPError(t *testing.T) {
ts := newTestServer(t, filepath.FromSlash("../testdata/smtp/mox.conf"), resolver) ts := newTestServer(t, filepath.FromSlash("../testdata/smtp/mox.conf"), resolver)
defer ts.close() defer ts.close()
ts.run(func(err error, client *smtpclient.Client) { ts.run(func(client *smtpclient.Client) {
t.Helper()
tcheck(t, err, "init client")
mailFrom := "mjl@example.org" mailFrom := "mjl@example.org"
rcptTo := "blocked@mox.example" rcptTo := "blocked@mox.example"
err = client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false) err := client.Deliver(ctxbg, mailFrom, rcptTo, int64(len(deliverMessage)), strings.NewReader(deliverMessage), false, false, false)
ts.smtpErr(err, &smtpclient.Error{Permanent: true, Code: smtp.C550MailboxUnavail, Secode: smtp.SeAddr1UnknownDestMailbox1}) ts.smtpErr(err, &smtpclient.Error{Permanent: true, Code: smtp.C550MailboxUnavail, Secode: smtp.SeAddr1UnknownDestMailbox1})
}) })
} }