Files
BARANTMail/__SMTP_RCPT.cpp
T
barantandClaude Opus 5.5 d3d7e5f3e5 SMTP: STARTTLS, smuggling fix, and RFC 5321 conformance
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
2026-11-02 11:56:41 -08:00

81 lines
3.3 KiB
C++

# include "__SMTP_RCPT.h"
# include "SMTPServer.h"
# include "SMTPSyntax.h"
namespace mail {
int __SMTP_RCPT::processCommand(coreutils::ZString &request, SMTPSession &session, SMTPServer &server) {
if (session.state != MAIL && session.state != RCPT) {
session.out << "503 5.5.1 Need MAIL command first" << CRLF;
return 1;
}
SMTPSyntax::PathArgument arg = SMTPSyntax::parsePath(SMTPSyntax::argument(line(request)), "TO:", false);
if (!arg.ok) {
session.out << arg.reply << CRLF;
return 1;
}
// No RCPT parameters are offered (no DSN) - RFC 5321 4.1.1.11.
if (!arg.params.empty()) {
session.out << "555 5.5.4 Unsupported parameter " << arg.params[0].first.c_str() << CRLF;
return 1;
}
if (session.recipientList.size() >= SMTPServer::maxRecipients) {
session.out << "452 4.5.3 Too many recipients" << CRLF;
return 1;
}
std::string local, domain;
SMTPSyntax::splitAddress(arg.address, local, domain);
// RFC 5321 4.5.1: "postmaster" with no domain MUST be accepted, and
// the postmaster local-part is case-insensitive at any local domain.
bool isPostmaster = SMTPSyntax::iequals(local, "postmaster") && (domain.empty() || server.isLocalDomain(domain));
std::string recipient = local + "@" + domain;
if (isPostmaster) {
recipient = "postmaster@" + domain;
coreutils::MString r(recipient);
if (domain.empty() || !(server.mailFileSystem.ifMailBoxExists(r) || server.mailFileSystem.ifAliasExists(r)))
recipient = server.postmasterAddress();
if (recipient.empty()) {
// Nothing to deliver it to - a configuration gap, not the
// client's fault (create a postmaster mailbox or alias).
session.out << "451 4.3.0 Postmaster mailbox not configured" << CRLF;
return 1;
}
} else if (server.isLocalDomain(domain)) {
// Our own domain: the mailbox or alias must exist. Local-parts
// that can't be a directory name ("/", ".", "..") can't be one.
// Mailbox directories are lower case; a sender writing
// "Brad@..." should still reach "brad" (RFC 5321 2.4 lets a
// server treat local-parts case-insensitively, and nearly all do).
auto known = [&](const std::string &address) {
coreutils::MString r(address);
return server.mailFileSystem.ifMailBoxExists(r) || server.mailFileSystem.ifAliasExists(r);
};
std::string lowered = SMTPSyntax::lower(local) + "@" + domain;
if (!SMTPSyntax::safePathComponent(local))
recipient.clear();
else if (!known(recipient))
recipient = known(lowered) ? lowered : "";
if (recipient.empty()) {
session.out << "550 5.1.1 No such user here" << CRLF;
return 1;
}
} else if (!session.relay) {
// Someone else's domain and the client hasn't authenticated:
// relaying it would make this an open relay (RFC 5321 3.6.2, 7.1).
session.out << "550 5.7.1 Relaying denied" << CRLF;
return 1;
}
session.recipientList.push_back(coreutils::MString(recipient));
session.state = RCPT;
session.out << "250 2.1.5 Recipient OK" << CRLF;
return 1;
}
}