feat(ingest): dispatch command addresses and held mail

- Route +join, +leave, +confirm and +bounce addresses before list posts
- Accept held mail without relaying it
- Map invalid tokens and closed lists to 550
This commit is contained in:
tgiachi 2026-11-09 15:04:56 +01:00
commit 966b3e0234
2 changed files with 70 additions and 15 deletions

View file

@ -77,22 +77,33 @@ func (s *session) LMTPData(r io.Reader, status smtp.StatusCollector) error {
}
func (s *session) deliver(ctx context.Context, rcpt string, data []byte) error {
res, err := s.b.router.Route(s.from, rcpt, data)
rt := s.b.router
if handled, err := rt.Command(ctx, s.b.out, s.from, rcpt, data); handled {
return s.status(rcpt, err)
}
res, err := rt.Route(s.from, rcpt, data)
if err != nil {
return s.status(rcpt, err)
}
return s.status(rcpt, rt.Send(ctx, s.b.out, res))
}
// status turns a router result into an LMTP reply.
func (s *session) status(rcpt string, err error) error {
switch {
case err == nil, errors.Is(err, router.ErrHeld):
return nil
case errors.Is(err, router.ErrUnknownList):
return &smtp.SMTPError{Code: 550, EnhancedCode: smtp.EnhancedCode{5, 1, 1}, Message: "no such list"}
case errors.Is(err, router.ErrNotMember):
return &smtp.SMTPError{Code: 550, EnhancedCode: smtp.EnhancedCode{5, 7, 1}, Message: "only list members may post"}
case err != nil:
log.Printf("route %s: %v", rcpt, err)
return tempFail()
case errors.Is(err, router.ErrBadToken):
return &smtp.SMTPError{Code: 550, EnhancedCode: smtp.EnhancedCode{5, 7, 1}, Message: "invalid or expired token"}
case errors.Is(err, router.ErrJoinClosed):
return &smtp.SMTPError{Code: 550, EnhancedCode: smtp.EnhancedCode{5, 7, 1}, Message: "this list does not accept subscriptions"}
}
bounce := res.List.Name + "+bounce@" + res.List.Domain
if err := s.b.out.Send(ctx, bounce, res.Recipients, res.Data); err != nil {
log.Printf("relay %s: %v", rcpt, err)
return tempFail()
}
return nil
log.Printf("deliver %s: %v", rcpt, err)
return tempFail()
}
func tempFail() error {

View file

@ -85,14 +85,14 @@ func TestDeliverFansOut(t *testing.T) {
if res["dev@example.org"] != nil {
t.Fatalf("unexpected error: %v", res)
}
if len(relay.Sent) != 1 {
t.Fatalf("want 1 send, got %d", len(relay.Sent))
if len(relay.Sent) != 2 {
t.Fatalf("want one send per member, got %d", len(relay.Sent))
}
s := relay.Sent[0]
if len(s.To) != 2 {
if len(s.To) != 1 {
t.Errorf("recipients = %v", s.To)
}
if s.From != "dev+bounce@example.org" {
if !strings.HasPrefix(s.From, "dev+bounce-") {
t.Errorf("envelope from = %q", s.From)
}
if !strings.Contains(string(s.Data), "List-Id: Dev <dev.example.org>") {
@ -127,7 +127,7 @@ func TestMixedRecipients(t *testing.T) {
if res["dev@example.org"] != nil || res["nope@example.org"] == nil {
t.Fatalf("results: %v", res)
}
if len(relay.Sent) != 1 {
if len(relay.Sent) != 2 {
t.Fatalf("sent = %d", len(relay.Sent))
}
}
@ -154,3 +154,47 @@ func TestRelayFailureIsTemporary(t *testing.T) {
t.Fatalf("want 451, got %v", res["dev@example.org"])
}
}
func TestJoinCommandOverLMTP(t *testing.T) {
addr, relay := setup(t)
res := deliver(t, addr, "carol@x.com", []string{"dev+join@example.org"})
if res["dev+join@example.org"] != nil {
t.Fatalf("join: %v", res)
}
if len(relay.Sent) != 1 || relay.Sent[0].To[0] != "carol@x.com" {
t.Fatalf("confirmation mail: %+v", relay.Sent)
}
}
func TestBadTokenRejected(t *testing.T) {
addr, _ := setup(t)
res := deliver(t, addr, "carol@x.com", []string{"dev+confirm-deadbeef@example.org"})
var se *smtp.SMTPError
if !errors.As(res["dev+confirm-deadbeef@example.org"], &se) || se.Code != 550 {
t.Fatalf("want 550, got %v", res)
}
}
func TestModeratedPostIsAcceptedButNotRelayed(t *testing.T) {
s, _ := store.Open(":memory:")
t.Cleanup(func() { s.Close() })
l, _ := s.CreateList("dev", "example.org", "Dev")
s.AddMember(l.ID, "alice@example.com", "Alice")
s.SetPolicies(l.ID, store.PostModerated, store.JoinOpen)
relay := &outbound.Fake{}
srv := NewServer(router.New(s), relay)
ln, _ := net.Listen("tcp", "127.0.0.1:0")
go srv.Serve(ln)
t.Cleanup(func() { srv.Close() })
res := deliver(t, ln.Addr().String(), "stranger@x.com", []string{"dev@example.org"})
if res["dev@example.org"] != nil {
t.Fatalf("held mail must be accepted: %v", res)
}
if len(relay.Sent) != 0 {
t.Fatal("nothing may be relayed")
}
if h, _ := s.ListHeld(l.ID); len(h) != 1 {
t.Fatalf("held = %d", len(h))
}
}