Brad Arant
cd5e0a9905
IMAP (RFC 3501): LOGIN through UID, previously all stubs except CAPABILITY/LOGOUT/a partial APPEND. Multi-folder support with per-folder UID/flag indexing (new MailFolder class, backed by .uidvalidity/.uidnext/ .imapindex sidecar files), ENVELOPE support (new MessageHeaders class: header parsing, address-list parsing, IMAP quoting), and shared cursor-based argument parsing (new IMAPArgs class: sequence sets, flag lists, dates, folder-name normalization, and path-traversal protection via isValidFolderName - a bare ".." folder name would otherwise resolve into a sibling user's mailbox directory). POP3 (RFC 1939): USER through QUIT, previously only CAPA. Added UIDL. POP3 handlers use cursor-based parsing throughout rather than indexed access - ZString's copy constructor doesn't copy its `list` field, and POP3's dispatch passes the request by value, so indexed access into a copy was silently reading nothing. SMTP: DMARC evaluation added to the DATA-terminator path (DKIM verification + alignment/policy, Authentication-Results header, conditional rejection matching RFC 7489 6.3's p=reject + sampled pct=). AUTH LOGIN now handles RFC 4954's optional inline initial response (e.g. Python smtplib's "AUTH LOGIN <base64>" in one line) instead of only the exact three-line form. Outbound relay now forces IPv4 (AF_INET) instead of AF_UNSPEC - this server's IPv4 has a correct PTR record and SPF coverage, its IPv6 doesn't, and Gmail was rejecting outbound mail with 550 5.7.25 as a result. Delivery pipeline: local delivery now runs the message through SpamAssassin (new SpamAssassinFilter class, speaking spamd's PROCESS protocol directly over a raw socket - fails open/delivers unscanned if spamd is unreachable) instead of a plain hardlink, since scanning can tag/modify content. BARANTMailConfig: extracted config loading into its own class. compile: (see individual file changes - build script adjustments to match the above). Deliberately excluded from this commit: barantmail.log/ barantmail-service.log (operational logs, not source - barantmail.log in particular was the runaway 55GB/12.9GB file from a busy-loop bug fixed separately in ServerCore) and barantmail.cfg (this server's own live deployment config, matching how APIServer's equivalent config also stays untracked).
57 lines
1.9 KiB
C++
57 lines
1.9 KiB
C++
#ifndef __SMTPSession_h__
|
|
# define __SMTPSession_h__
|
|
|
|
# include "TCPSession.h"
|
|
# include "TCPServer.h"
|
|
# include "MString.h"
|
|
# include "SPFChecker.h"
|
|
|
|
# define CRLF "\r\n"
|
|
|
|
namespace mail {
|
|
|
|
enum State {CONNECT, READY, READYX, MAIL, RCPT, DATA, SENT};
|
|
enum AuthState {USER_UNKNOWN, USER_QUERY, USER_SECRET_QUERY, USER_KNOWN};
|
|
enum Mode {WAIT_FOR_DATA, RECEIVE_DATA};
|
|
|
|
class SMTPSession : public core::TCPSession {
|
|
|
|
public:
|
|
SMTPSession(core::EPoll &ePoll, core::TCPServer &server);
|
|
|
|
void onConnected() override;
|
|
|
|
coreutils::MString clientDomainName;
|
|
coreutils::MString userName;
|
|
coreutils::MString password;
|
|
coreutils::MString mailData;
|
|
State state = CONNECT;
|
|
AuthState authState = USER_UNKNOWN;
|
|
Mode mode = WAIT_FOR_DATA;
|
|
// Defaults to false: relaying to a non-local recipient is only
|
|
// permitted after a real, successful AUTH (see __SMTP_AUTH.cpp,
|
|
// which sets this true on success) - defaulting to true made every
|
|
// brand-new, unauthenticated connection an open relay for anyone
|
|
// (__SMTP_RCPT.cpp checks exactly this flag before accepting a
|
|
// recipient whose mailbox does not exist locally).
|
|
bool relay = false;
|
|
coreutils::MString from;
|
|
std::vector<coreutils::MString> recipientList;
|
|
|
|
// Computed once at MAIL FROM time (see __SMTP_MAIL.cpp) and
|
|
// reused at DATA time (__SMTP_DATA.cpp), rather than re-running
|
|
// the SPF DNS lookups a second time for the same transaction. The
|
|
// header is ready to prepend to the message as-is; domain/result
|
|
// are also kept separately since DMARC's own alignment check
|
|
// (also run at DATA time) needs the raw identity/result, not the
|
|
// pre-formatted header text.
|
|
std::string spfHeader;
|
|
std::string spfDomain;
|
|
SPFChecker::Result spfResult = SPFChecker::Result::None;
|
|
|
|
};
|
|
|
|
}
|
|
|
|
#endif
|