fix(ingest): answer 552 for a message too big to hold, with tests
This commit is contained in:
parent
94b5a58e93
commit
1e46be79b0
4 changed files with 44 additions and 0 deletions
|
|
@ -92,6 +92,8 @@ func (s *session) status(rcpt string, err error) error {
|
|||
return &smtp.SMTPError{Code: 550, EnhancedCode: smtp.EnhancedCode{5, 1, 1}, Message: "no such list"}
|
||||
case errors.Is(err, router.ErrHeldFull):
|
||||
return &smtp.SMTPError{Code: 452, EnhancedCode: smtp.EnhancedCode{4, 2, 2}, Message: "the moderation queue of this list is full, try again later"}
|
||||
case errors.Is(err, router.ErrHeldTooLarge):
|
||||
return &smtp.SMTPError{Code: 552, EnhancedCode: smtp.EnhancedCode{5, 3, 4}, Message: "message too large for this moderated 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 errors.Is(err, router.ErrBadToken):
|
||||
|
|
|
|||
|
|
@ -289,3 +289,30 @@ func TestAFullModerationQueueAnswers452(t *testing.T) {
|
|||
t.Fatalf("a temporary refusal, so a legitimate sender retries later and a spam run goes away: %v", res["dev@example.org"])
|
||||
}
|
||||
}
|
||||
|
||||
func TestAMessageTooBigToHoldAnswers552(t *testing.T) {
|
||||
st := newStack(t, nil)
|
||||
l, _ := st.store.FindList("dev@example.org")
|
||||
st.store.SetPolicies(l.ID, store.PostModerated, store.JoinOpen, store.ArchivePrivate)
|
||||
conn, err := net.Dial("tcp", st.addr)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
c := smtp.NewClientLMTP(conn)
|
||||
defer c.Close()
|
||||
c.Hello("localhost")
|
||||
c.Mail("alice@example.com", nil)
|
||||
c.Rcpt("dev@example.org", nil)
|
||||
w, _ := c.Data()
|
||||
w.Write([]byte("From: Alice <alice@example.com>\r\nSubject: huge\r\n\r\n"))
|
||||
line := []byte(strings.Repeat("x", 76) + "\r\n")
|
||||
for i := 0; i < (10<<20)/len(line)+10; i++ {
|
||||
w.Write(line)
|
||||
}
|
||||
_, err = w.CloseWithLMTPResponse()
|
||||
var de smtp.LMTPDataError
|
||||
var se *smtp.SMTPError
|
||||
if !errors.As(err, &de) || !errors.As(de["dev@example.org"], &se) || se.Code != 552 {
|
||||
t.Fatalf("a permanent refusal: the sender is told to send it elsewhere: %v", err)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -138,3 +138,16 @@ func TestSimultaneousApprovalsDeliverOnce(t *testing.T) {
|
|||
t.Fatalf("2 members, one approval: pending = %d", st.Pending)
|
||||
}
|
||||
}
|
||||
|
||||
func TestAMessageTooBigToHoldIsRefused(t *testing.T) {
|
||||
e := newEnv(t)
|
||||
e.s.SetPolicies(e.list.ID, "moderated", "open", "private")
|
||||
big := append(postFrom("alice@example.com"), make([]byte, 10<<20)...)
|
||||
_, err := e.r.Route("alice@example.com", "dev@example.org", big)
|
||||
if !errors.Is(err, ErrHeldTooLarge) {
|
||||
t.Fatalf("want ErrHeldTooLarge, got %v", err)
|
||||
}
|
||||
if held, _ := e.s.ListHeld(e.list.ID); len(held) != 0 {
|
||||
t.Fatal("nothing is held")
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,6 +22,8 @@ var (
|
|||
ErrDiscarded = errors.New("discarded")
|
||||
// ErrHeldFull means the list's moderation queue is full: refuse for now, the sender may retry.
|
||||
ErrHeldFull = store.ErrHeldFull
|
||||
// ErrHeldTooLarge means the message is too big to hold for moderation on a moderated list.
|
||||
ErrHeldTooLarge = store.ErrHeldTooLarge
|
||||
// ErrNotMember means the sender may not post to the list.
|
||||
ErrNotMember = errors.New("sender is not a member")
|
||||
// ErrHeld means the message was queued for moderation. It is not a failure.
|
||||
|
|
|
|||
Loading…
Reference in a new issue