internal/milter/sign.go: a milter on two sockets (cmd/panel/signer.go): sign.sock for 465/587, the key of the domain the SASL login belongs to (Bindings.DomainOf, the sender_login_maps Postfix reads), and sign-local.sock for the panel's own sendmail(1) mail, the server's name. go-msgauth/dkim v0.7.0, relaxed/simple, OpenDKIM's dkim_should_signhdrs[] (libopendkim/dkim.c:223-246) in message order plus From once more; keys and selectors from the KeyTable the panel writes, a key path outside the key directory refused; strict - whatever cannot be signed is deferred. From the sources: Postfix 3.10.13 milter8.c:2329-2400 hands a folded header \n-separated, so the signer joins its lines with CRLF; inserts are 1-based in cleanup_ins_header() (cleanup_milter.c:1193), so index 0 is the top, where OpenDKIM puts its own (opendkim.c:3673). go-milter v0.4.1 calls no Abort when a connection ends, so a watchdog closes go-msgauth's streaming signer after an hour and a late end of message is deferred. Postfix: smtpd_milters = sender check, signer, OpenDKIM, journal; non_smtpd_milters = the signer's local socket, OpenDKIM - both sign every message until stage 2. disable_mime_output_conversion=yes (default off, mail_params.h:3088): an 8-bit message is no longer re-encoded after it is signed. Tests: unit tests sign and verify folded, tab-led and space-free headers, an added From:, a changed body, two messages on a connection, odd bodies, and five cases deferred. e2e: the sink image has python3-dkim (dkimpy 1.1.8-2) and the stand's DNS; on an application's message and on a notification the two signatures must agree on h=, bh=, c=, s=, a= and each must pass dkimverify. On the server: make e2e exit 0 (714 s), go vet + go test 27 packages ok. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
207 lines
7.4 KiB
Go
207 lines
7.4 KiB
Go
package e2e
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
"net/mail"
|
|
"os"
|
|
"path/filepath"
|
|
"regexp"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/emersion/go-msgauth/dkim"
|
|
)
|
|
|
|
// senderDomain and recipient are fixed for the whole run: one sending domain
|
|
// registered in the panel, and the sink-MX as the single recipient every
|
|
// positive send targets. Here, not in main_test.go: smtp_client.go uses them,
|
|
// and the package builds without its tests (staticcheck reads it so).
|
|
const (
|
|
senderDomain = "sender.e2e.test"
|
|
recipient = "rcpt@sink.e2e.test"
|
|
)
|
|
|
|
// findSinkMessage polls the sink-MX's dump directory (see test/e2e/sink) for
|
|
// a file whose contents contain token — the unique Subject-line marker every
|
|
// test send carries — and returns it. Polling a directory listing rather than
|
|
// sleeping a fixed duration is what keeps this deterministic even under a
|
|
// slow CI runner (plan C.4).
|
|
func findSinkMessage(stageDir, token string, timeout time.Duration) ([]byte, error) {
|
|
_, raw, err := findSinkFile(stageDir, token, timeout)
|
|
return raw, err
|
|
}
|
|
|
|
// findSinkFile is findSinkMessage that also says the file's name in the
|
|
// sink's /mail (the same directory, mounted).
|
|
func findSinkFile(stageDir, token string, timeout time.Duration) (string, []byte, error) {
|
|
dir := filepath.Join(stageDir, "mail-stage")
|
|
var name string
|
|
var found []byte
|
|
err := waitFor(fmt.Sprintf("sink-MX to receive a message tagged %q", token), timeout, 300*time.Millisecond, func() (bool, error) {
|
|
entries, err := os.ReadDir(dir)
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
for _, e := range entries {
|
|
if e.IsDir() {
|
|
continue
|
|
}
|
|
b, err := os.ReadFile(filepath.Join(dir, e.Name()))
|
|
if err != nil {
|
|
continue
|
|
}
|
|
if bytes.Contains(b, []byte(token)) {
|
|
name, found = e.Name(), b
|
|
return true, nil
|
|
}
|
|
}
|
|
return false, fmt.Errorf("no dumped message contains %q yet (%d on disk)", token, len(entries))
|
|
})
|
|
return name, found, err
|
|
}
|
|
|
|
// verifyDKIM checks that raw (a message dumped by the sink) carries a DKIM
|
|
// signature for domain and that every signature for it validates against the
|
|
// public key published in the fake zone — i.e. exactly what a real receiver
|
|
// would check, using DNS the harness itself controls instead of
|
|
// net.DefaultResolver (plan C.4).
|
|
func verifyDKIM(raw []byte, domain string) error {
|
|
verifications, err := dkim.VerifyWithOptions(bytes.NewReader(raw), &dkim.VerifyOptions{
|
|
LookupTXT: lookupTXTFunc(),
|
|
})
|
|
if err != nil {
|
|
return fmt.Errorf("dkim verify: %w", err)
|
|
}
|
|
n := 0
|
|
for _, v := range verifications {
|
|
if v.Domain == domain {
|
|
if v.Err != nil {
|
|
return fmt.Errorf("dkim signature for %s did not validate: %w", domain, v.Err)
|
|
}
|
|
n++
|
|
}
|
|
}
|
|
if n == 0 {
|
|
return fmt.Errorf("no DKIM signature found for domain %s (got %d signature(s))", domain, len(verifications))
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// checkBothSigners is the oracle of docs/plans/panel-dkim-signing.md, stage
|
|
// 1: the panel's signer and OpenDKIM both sign (OpenDKIM after the panel in
|
|
// the chain, so its signature is the top one - build/postfix-config.sh);
|
|
// the two must agree on what they sign - the same h= and bh= - and each
|
|
// must verify with dkimpy (python3-dkim in the sink image), an
|
|
// implementation that is neither go-msgauth, the panel's library, nor
|
|
// OpenDKIM. name is the file in the sink's /mail.
|
|
func checkBothSigners(s *stack, name string, raw []byte, domain string) error {
|
|
msg, err := mail.ReadMessage(bytes.NewReader(raw))
|
|
if err != nil {
|
|
return fmt.Errorf("parse the delivered message: %w", err)
|
|
}
|
|
var sigs []map[string]string
|
|
for _, v := range msg.Header["Dkim-Signature"] {
|
|
tags := dkimTags(v)
|
|
if tags["d"] == domain {
|
|
sigs = append(sigs, tags)
|
|
}
|
|
}
|
|
if len(sigs) != 2 {
|
|
return fmt.Errorf("%d DKIM signatures for %s, want 2 (the panel's and OpenDKIM's)", len(sigs), domain)
|
|
}
|
|
for _, tag := range []string{"bh", "h", "c", "s", "a"} {
|
|
a, b := sigs[0][tag], sigs[1][tag]
|
|
if tag == "h" {
|
|
a, b = strings.ToLower(a), strings.ToLower(b)
|
|
}
|
|
if a != b {
|
|
return fmt.Errorf("the signatures differ in %s=: OpenDKIM %q, the panel %q", tag, a, b)
|
|
}
|
|
}
|
|
for i := range sigs {
|
|
out, err := s.execIn("sink", "sh", "-c", fmt.Sprintf("dkimverify --index %d < '/mail/%s'", i, name))
|
|
if err != nil || !strings.Contains(out, "signature ok") {
|
|
return fmt.Errorf("dkimpy on signature %d (%s): %v\n%s", i, []string{"OpenDKIM's", "the panel's"}[i], err, out)
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// dkimTags splits a DKIM-Signature value into its tags, white space removed
|
|
// (RFC 6376 § 3.2: tag=value pairs separated by ";", FWS anywhere).
|
|
func dkimTags(v string) map[string]string {
|
|
tags := map[string]string{}
|
|
for _, part := range strings.Split(v, ";") {
|
|
k, val, ok := strings.Cut(part, "=")
|
|
if !ok {
|
|
continue
|
|
}
|
|
tags[strings.TrimSpace(k)] = strings.Join(strings.Fields(val), "")
|
|
}
|
|
return tags
|
|
}
|
|
|
|
// postfixReceived returns the Received: headers of raw that a Postfix smtpd
|
|
// wrote - "(Postfix)" after the host name, the only form it writes (Postfix
|
|
// 3.10.13, src/smtpd/smtpd.c:3627-3645, "by %s (%s)" with var_mail_name).
|
|
// In the stand only SelfPost's Postfix writes one: the tests compose their
|
|
// messages without any, and the sink, smtp-sink, adds its own with "by
|
|
// <host> (smtp-sink)" (src/smtpstone/smtp-sink.c:520-531,
|
|
// mail_file_finish_header()), which the "(Postfix)" filter leaves out.
|
|
func postfixReceived(raw []byte) ([]string, error) {
|
|
msg, err := mail.ReadMessage(bytes.NewReader(raw))
|
|
if err != nil {
|
|
return nil, fmt.Errorf("parse the delivered message: %w", err)
|
|
}
|
|
var out []string
|
|
for _, v := range msg.Header["Received"] {
|
|
if strings.Contains(v, "(Postfix)") {
|
|
out = append(out, v)
|
|
}
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
// checkReceivedHidden: the submission ports set smtpd_hide_client_session
|
|
// (build/postfix-config.sh), so SelfPost's Received: header is the redacted
|
|
// one - it opens with "by", names no client and no protocol (Postfix 3.10.13,
|
|
// src/smtpd/smtpd.c:3495, the "from" part written only when the parameter
|
|
// is off, and with_protocol emptied with it).
|
|
func checkReceivedHidden(raw []byte) error {
|
|
recv, err := postfixReceived(raw)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if len(recv) != 1 {
|
|
return fmt.Errorf("want one Received: header from SelfPost's Postfix, got %d: %q", len(recv), recv)
|
|
}
|
|
if !strings.HasPrefix(recv[0], "by ") || strings.Contains(recv[0], " with ") {
|
|
return fmt.Errorf("the Received: header names the client session: %q", recv[0])
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// connectFromPattern matches Postfix's smtpd "connect from ...[ADDR]" log
|
|
// line, which is how the harness learns the source address Postfix itself
|
|
// observed for a just-made connection (needed to configure a level-2 rate
|
|
// limit's allowed-IPs list — the address a host-published port is seen as
|
|
// inside the container depends on Docker's NAT and isn't worth hard-coding).
|
|
// Postfix 3.10.13, src/smtpd/smtpd.c, smtpd_service(): msg_info("connect from
|
|
// %s", namaddr), namaddr being "name[addr]".
|
|
var connectFromPattern = regexp.MustCompile(`connect from [^\[]*\[([0-9a-fA-F.:]+)\]`)
|
|
|
|
// lastSMTPClientIP reads mail.log inside the selfpost container and returns
|
|
// the most recent address Postfix's smtpd logged a connection from.
|
|
func lastSMTPClientIP(s *stack) (string, error) {
|
|
out, err := s.execIn("selfpost", "tail", "-n", "200", "/data/log/mail.log")
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
matches := connectFromPattern.FindAllStringSubmatch(out, -1)
|
|
if len(matches) == 0 {
|
|
return "", fmt.Errorf("no \"connect from\" line in mail.log yet")
|
|
}
|
|
return matches[len(matches)-1][1], nil
|
|
}
|