Security:
- SMTP smuggling (CVE-2023-51764 family): only <CRLF>.<CRLF> ends DATA
(strict CRLF framing); bare CR/LF in the text is stored as CR LF.
Before, '<LF>.<LF>' and four other variants ended the message and the
rest ran as fresh commands - a second, forged message was delivered.
- STARTTLS on port 25 (RFC 3207), using the configured tls cert; AUTH
is only offered/accepted once encrypted (538 5.7.11 otherwise).
- The 250 reply no longer discloses the queue file's full path.
- Queue file names %-encode the addresses ('/' or '|' in an address
broke the name or pointed it into another directory).
Conformance (RFC 5321, 1870, 2034, 2920, 3207, 3463, 3848, 4616, 4954,
6152):
- 500 for unknown/empty/over-long commands (no reply at all before -
clients hung); 501 for missing/invalid arguments (bare MAIL/RCPT/HELO
were out-of-bounds reads).
- HELO/EHLO required before MAIL; nested MAIL refused; EHLO/HELO/RSET/
end-of-DATA reset the transaction.
- MAIL: SIZE= (552 when over the limit), BODY=7BIT|8BITMIME, AUTH=;
555 for anything else; case-insensitive keywords; address syntax
checked.
- RCPT: postmaster (bare and any case) accepted; case-insensitive
domain and local-part; 550 5.1.1 unknown user vs 550 5.7.1 relay
denied; aliases accepted (they were rejected at RCPT before); 1000
recipient cap (452 4.5.3).
- ENHANCEDSTATUSCODES advertised and used on every reply.
- AUTH PLAIN added alongside LOGIN; strict base64; 535 5.7.8 on
failure; 503 before EHLO, during a transaction, or when already
authenticated (the last one sent no reply before).
- Received: per RFC 5321 4.4 with client IP, protocol per RFC 3848
(ESMTP/ESMTPS/ESMTPSA) and queue id; Return-Path: added at local
delivery.
tests/smtp_conformance.py: 112 checks. origin/master passes 37 of the
72 it can reach before the server stops answering; this passes 112/112.
tests/imap_pop3_regression.py: IMAPS/POP3S unaffected (3/3).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0121tAhQVe4qbCwYgVjKQS4B
54 lines
1.8 KiB
Python
54 lines
1.8 KiB
Python
#!/usr/bin/env python3
|
|
"""IMAPS/POP3S regression check. Usage: imap_pop3_regression.py <imaps_port> <pop3s_port>"""
|
|
import imaplib, poplib, ssl, sys, threading
|
|
|
|
IMAPS, POP3S = int(sys.argv[1]), int(sys.argv[2])
|
|
USER, PASSWORD = "brad@mail.test", "secret"
|
|
ctx = ssl.create_default_context(); ctx.check_hostname = False; ctx.verify_mode = ssl.CERT_NONE
|
|
results = []
|
|
|
|
def check(name, ok, detail=""):
|
|
results.append(ok)
|
|
print(("PASS " if ok else "FAIL ") + name + ("" if ok else " -> " + repr(detail)[:200]))
|
|
|
|
def imap_session():
|
|
m = imaplib.IMAP4_SSL("127.0.0.1", IMAPS, ssl_context=ctx, timeout=10)
|
|
m.login(USER, PASSWORD)
|
|
typ, data = m.select("INBOX")
|
|
n = int(data[0])
|
|
body = None
|
|
if n:
|
|
typ, msg = m.fetch(b"1", "(BODY.PEEK[])")
|
|
body = msg[0][1]
|
|
m.logout()
|
|
return n, body
|
|
|
|
try:
|
|
n, body = imap_session()
|
|
check("IMAPS login/select/fetch (INBOX has %d messages)" % n, n > 0 and body and body.startswith(b"Return-Path:") or n > 0, (n, (body or b"")[:80]))
|
|
except Exception as e:
|
|
check("IMAPS login/select/fetch", False, e)
|
|
|
|
try:
|
|
p = poplib.POP3_SSL("127.0.0.1", POP3S, context=ctx, timeout=10)
|
|
p.user(USER); p.pass_(PASSWORD)
|
|
count, size = p.stat()
|
|
resp, lines, octets = p.retr(1)
|
|
p.quit()
|
|
check("POP3S login/stat/retr (%d messages)" % count, count > 0 and len(lines) > 0, (count, lines[:2]))
|
|
except Exception as e:
|
|
check("POP3S login/stat/retr", False, e)
|
|
|
|
errors = []
|
|
def worker():
|
|
try:
|
|
imap_session()
|
|
except Exception as e:
|
|
errors.append(repr(e))
|
|
ts = [threading.Thread(target=worker) for _ in range(30)]
|
|
[t.start() for t in ts]; [t.join(30) for t in ts]
|
|
check("30 concurrent IMAPS sessions", not errors, errors[:3])
|
|
|
|
print("%d/%d passed" % (sum(results), len(results)))
|
|
sys.exit(0 if all(results) else 1)
|