test / test (push) Canceled after 0s
The row's recipient has to be the address Postfix writes in to=<..> or orig_to=<..>, or the delivery line finds no row and the sweep closes it as bounced. Postfix 3.7.11 hands the milter the RCPT argument as the client wrote it (smtpd.c, milter_argv(); extract_addr() leaves it), go-milter v0.4.1 trims "<>" and drops the ESMTP parameters (session.go, case CodeRcpt) - so cleanAddress's cut at the first blank broke a quoted local part (B-G5). Postfix keeps the address in internal form (tok822: quotes off, backslash escapes taken) and logs it external (info_log_addr_form.c, quote_822_local(): quoted again only when not a dot-string); recipientAsLogged does the same, "ab"@x -> ab@x, "a b"@x stays. A recipient given twice in any case is one row: cleanup drops the duplicate, comparing folded (cleanup_out_recipient.c, been_here(), BH_FLAG_FOLD; A-31). A rewritten recipient is matched by orig_to=, which log_adhoc() writes only when it differs (A-9). The store's case-insensitive match stays, now with its reason from the source (D-S20). Stand (2026-10-14, make e2e, exit 0): new recipients_as_postfix_logs_them - RCPT TO "x y"@, "ab"@ and "X Y"@ sink.e2e.test give two rows, "x y"@sink.e2e.test and ab@sink.e2e.test, both sent. go vet and go test ./... pass on the server; a unit test drives the milter through go-milter's own client. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
294 lines
9.6 KiB
Go
294 lines
9.6 KiB
Go
package e2e
|
|
|
|
import (
|
|
"crypto/tls"
|
|
"errors"
|
|
"fmt"
|
|
"net"
|
|
"net/smtp"
|
|
"net/textproto"
|
|
"strings"
|
|
"time"
|
|
)
|
|
|
|
// smtpsAddr is where compose.override.yml publishes the primary implicit-TLS
|
|
// submission port (465 in the shipped compose, remapped here to avoid clashing
|
|
// with a local deployment on the same host).
|
|
const smtpsAddr = "127.0.0.1:20465"
|
|
|
|
// sendAttempt is one SMTP transaction against the stand. An empty authLogin
|
|
// means "connect without AUTH" (negative checks 1/3); from/to are full
|
|
// mailbox addresses. headerFrom is the From: line of the message when it is
|
|
// not to be the envelope sender (the sender check holds the two to one rule).
|
|
type sendAttempt struct {
|
|
authLogin, authPassword string
|
|
from, to string
|
|
moreTo []string // further RCPT TO, after to
|
|
headerFrom string
|
|
subject, body string
|
|
}
|
|
|
|
// sendResult records the error (if any) at each stage the transaction
|
|
// reached. Only the fields up to and including the first failure are set —
|
|
// the rest are nil because that stage was never attempted, not because it
|
|
// succeeded silently.
|
|
type sendResult struct {
|
|
dialErr error
|
|
authErr error
|
|
mailErr error
|
|
rcptErr error
|
|
dataErr error
|
|
}
|
|
|
|
// ok reports whether the message was fully accepted (DATA closed cleanly).
|
|
func (r sendResult) ok() bool {
|
|
return r.dialErr == nil && r.authErr == nil && r.mailErr == nil && r.rcptErr == nil && r.dataErr == nil
|
|
}
|
|
|
|
// firstErr returns whichever stage failed first, or nil if none did.
|
|
func (r sendResult) firstErr() error {
|
|
for _, e := range []error{r.dialErr, r.authErr, r.mailErr, r.rcptErr, r.dataErr} {
|
|
if e != nil {
|
|
return e
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// refusedAt says nil only when the transaction was refused at stage
|
|
// ("connect", "AUTH", "MAIL", "RCPT" or "DATA") with the server's reply code
|
|
// and a reply text containing text. A negative case passes on its own refusal
|
|
// and nothing else: a reset or a timeout while Postfix was still starting once
|
|
// passed for the level-1 rate limit. Anything else is described for the
|
|
// failure message - where it stopped and what came.
|
|
func (r sendResult) refusedAt(stage string, code int, text string) error {
|
|
for _, s := range []struct {
|
|
name string
|
|
err error
|
|
}{{"connect", r.dialErr}, {"AUTH", r.authErr}, {"MAIL", r.mailErr}, {"RCPT", r.rcptErr}, {"DATA", r.dataErr}} {
|
|
if s.err == nil {
|
|
continue
|
|
}
|
|
if s.name != stage {
|
|
return fmt.Errorf("stopped at %s, not at %s: %v", s.name, stage, s.err)
|
|
}
|
|
return replyIs(s.err, code, text)
|
|
}
|
|
return fmt.Errorf("accepted, want refused at %s with %d", stage, code)
|
|
}
|
|
|
|
// replyIs says nil when err is the server's reply code with text in it.
|
|
func replyIs(err error, code int, text string) error {
|
|
var reply *textproto.Error
|
|
if !errors.As(err, &reply) {
|
|
return fmt.Errorf("no SMTP reply but %v, want %d ...%s", err, code, text)
|
|
}
|
|
if reply.Code != code || !strings.Contains(reply.Msg, text) {
|
|
return fmt.Errorf("reply %d %s, want %d ...%s", reply.Code, reply.Msg, code, text)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// attemptSend drives one SMTP transaction over the implicit-TLS port, exactly
|
|
// as an application client library would: TLS connect, EHLO, optional AUTH
|
|
// PLAIN, MAIL/RCPT/DATA. The certificate is the stand's throwaway self-signed
|
|
// one (see stage.go), so verification is skipped — Postfix's
|
|
// smtpd_tls_security_level is "may" here just like production, this is purely
|
|
// about the test client trusting an unknown CA.
|
|
func attemptSend(a sendAttempt) sendResult {
|
|
var res sendResult
|
|
|
|
dialer := &net.Dialer{Timeout: 10 * time.Second}
|
|
conn, err := tls.DialWithDialer(dialer, "tcp", smtpsAddr, &tls.Config{
|
|
InsecureSkipVerify: true,
|
|
ServerName: selfpostHostname,
|
|
})
|
|
if err != nil {
|
|
res.dialErr = fmt.Errorf("dial %s: %w", smtpsAddr, err)
|
|
return res
|
|
}
|
|
c, err := smtp.NewClient(conn, selfpostHostname)
|
|
if err != nil {
|
|
res.dialErr = fmt.Errorf("smtp handshake: %w", err)
|
|
_ = conn.Close()
|
|
return res
|
|
}
|
|
defer c.Close()
|
|
|
|
if err := c.Hello("e2e-client.e2e.test"); err != nil {
|
|
res.dialErr = err
|
|
return res
|
|
}
|
|
|
|
if a.authLogin != "" {
|
|
auth := smtp.PlainAuth("", a.authLogin, a.authPassword, selfpostHostname)
|
|
if err := c.Auth(auth); err != nil {
|
|
res.authErr = err
|
|
_ = c.Quit()
|
|
return res
|
|
}
|
|
}
|
|
|
|
if err := c.Mail(a.from); err != nil {
|
|
res.mailErr = err
|
|
_ = c.Quit()
|
|
return res
|
|
}
|
|
for _, to := range append([]string{a.to}, a.moreTo...) {
|
|
if err := c.Rcpt(to); err != nil {
|
|
res.rcptErr = err
|
|
_ = c.Quit()
|
|
return res
|
|
}
|
|
}
|
|
w, err := c.Data()
|
|
if err != nil {
|
|
res.dataErr = err
|
|
_ = c.Quit()
|
|
return res
|
|
}
|
|
msg := buildMessage(a)
|
|
if _, err := w.Write([]byte(msg)); err != nil {
|
|
res.dataErr = err
|
|
} else if err := w.Close(); err != nil {
|
|
res.dataErr = err
|
|
}
|
|
_ = c.Quit()
|
|
return res
|
|
}
|
|
|
|
// waitForSMTPSReady polls the implicit-TLS port until Postfix greets over
|
|
// TLS. Used after a container (re)start: the panel's HTTP port and Postfix's
|
|
// smtpd come up independently (postfix-wrapper.sh additionally waits on both
|
|
// milter sockets before starting Postfix at all), so a caller that only
|
|
// waited for the panel could still race a not-yet-listening smtpd. A bare TCP
|
|
// connect is not enough: Docker's port proxy accepts on the host side before
|
|
// anything listens in the container and then resets the connection, which is
|
|
// how the level-1 rate-limit case once took a reset for its limit (seen on the
|
|
// stand, date not recorded; Docker's documentation does not describe it).
|
|
func waitForSMTPSReady(timeout time.Duration) error {
|
|
return waitFor("smtps port to greet", timeout, 300*time.Millisecond, func() (bool, error) {
|
|
conn, err := tls.DialWithDialer(&net.Dialer{Timeout: 2 * time.Second}, "tcp", smtpsAddr, &tls.Config{
|
|
InsecureSkipVerify: true,
|
|
ServerName: selfpostHostname,
|
|
})
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
_ = conn.SetDeadline(time.Now().Add(5 * time.Second))
|
|
c, err := smtp.NewClient(conn, selfpostHostname) // reads the 220 greeting
|
|
if err != nil {
|
|
_ = conn.Close()
|
|
return false, err
|
|
}
|
|
_ = c.Quit()
|
|
_ = c.Close()
|
|
return true, nil
|
|
})
|
|
}
|
|
|
|
// buildMessage renders a minimal, valid RFC 5322 message. subject is expected
|
|
// to carry a unique token so the harness can find this exact message in the
|
|
// sink-MX's dump directory afterwards.
|
|
func buildMessage(a sendAttempt) string {
|
|
if a.headerFrom != "" {
|
|
a.from = a.headerFrom
|
|
}
|
|
return fmt.Sprintf(
|
|
"From: %s\r\nTo: %s\r\nSubject: %s\r\nDate: %s\r\nMIME-Version: 1.0\r\nContent-Type: text/plain; charset=utf-8\r\n\r\n%s\r\n",
|
|
a.from, a.to, a.subject, time.Now().UTC().Format(time.RFC1123Z), a.body,
|
|
)
|
|
}
|
|
|
|
// mailTwiceOnOneConnection authenticates once and sends MAIL FROM twice on the
|
|
// same connection, with a RSET between, and returns how each was answered. No
|
|
// message is sent: this is about what the server says to the second
|
|
// transaction of a connection whose first was refused.
|
|
func mailTwiceOnOneConnection(login, password, from string) [2]error {
|
|
var out [2]error
|
|
conn, err := tls.DialWithDialer(&net.Dialer{Timeout: 10 * time.Second}, "tcp", smtpsAddr, &tls.Config{
|
|
InsecureSkipVerify: true,
|
|
ServerName: selfpostHostname,
|
|
})
|
|
if err != nil {
|
|
return [2]error{nil, nil}
|
|
}
|
|
c, err := smtp.NewClient(conn, selfpostHostname)
|
|
if err != nil {
|
|
_ = conn.Close()
|
|
return [2]error{nil, nil}
|
|
}
|
|
defer c.Close()
|
|
if err := c.Hello("e2e-client.e2e.test"); err != nil {
|
|
return [2]error{nil, nil}
|
|
}
|
|
if err := c.Auth(smtp.PlainAuth("", login, password, selfpostHostname)); err != nil {
|
|
return [2]error{nil, nil}
|
|
}
|
|
out[0] = c.Mail(from)
|
|
_ = c.Reset()
|
|
out[1] = c.Mail(from)
|
|
_ = c.Quit()
|
|
return out
|
|
}
|
|
|
|
// waitForSenderMap waits until Postfix lets login use from: an application
|
|
// the panel has just created is written into the sender map and Postfix is
|
|
// reloaded, and an smtpd that was idle from before the reload can still take
|
|
// a connection in the second that follows and answer 553 "not owned by user"
|
|
// (seen on the stand, date not recorded; two seconds after the save it no
|
|
// longer happened, at 0, 10, 40 or 110 s of waiting). Postfix 3.7.11: an smtpd
|
|
// reads the texthash map once, when it starts (html/DATABASE_README.html,
|
|
// "texthash"), and one from before the reload exits only when it next sees
|
|
// master's status pipe closed (src/master/multi_server.c,
|
|
// multi_server_abort()). It goes as far as RCPT and then RSET, so no
|
|
// message is sent and no row is written. Only that 553 is waited out, for 15
|
|
// s at most; any other answer fails at once.
|
|
func waitForSenderMap(login, password, from string) error {
|
|
deadline := time.Now().Add(15 * time.Second)
|
|
for {
|
|
err := probeSender(login, password, from)
|
|
if err == nil {
|
|
return nil
|
|
}
|
|
if replyIs(err, 553, "not owned by user "+login) != nil || time.Now().After(deadline) {
|
|
return fmt.Errorf("Postfix does not yet let %s send as %s: %w", login, from, err)
|
|
}
|
|
time.Sleep(300 * time.Millisecond)
|
|
}
|
|
}
|
|
|
|
// probeSender authenticates as login and offers MAIL FROM from and one RCPT,
|
|
// then resets. It returns the first refusal, or nil.
|
|
func probeSender(login, password, from string) error {
|
|
conn, err := tls.DialWithDialer(&net.Dialer{Timeout: 10 * time.Second}, "tcp", smtpsAddr, &tls.Config{
|
|
InsecureSkipVerify: true,
|
|
ServerName: selfpostHostname,
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
_ = conn.SetDeadline(time.Now().Add(30 * time.Second))
|
|
c, err := smtp.NewClient(conn, selfpostHostname)
|
|
if err != nil {
|
|
_ = conn.Close()
|
|
return err
|
|
}
|
|
defer c.Close()
|
|
if err := c.Hello("e2e-client.e2e.test"); err != nil {
|
|
return err
|
|
}
|
|
if err := c.Auth(smtp.PlainAuth("", login, password, selfpostHostname)); err != nil {
|
|
return err
|
|
}
|
|
if err := c.Mail(from); err != nil {
|
|
return err
|
|
}
|
|
if err := c.Rcpt(recipient); err != nil {
|
|
return err
|
|
}
|
|
_ = c.Reset()
|
|
_ = c.Quit()
|
|
return nil
|
|
}
|