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).
72 lines
2.7 KiB
C++
72 lines
2.7 KiB
C++
#ifndef __SPFChecker_h__
|
|
#define __SPFChecker_h__
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
namespace mail {
|
|
|
|
///
|
|
/// SPFChecker evaluates RFC 7208 Sender Policy Framework: whether
|
|
/// the IP address a connection actually came from is authorized to
|
|
/// send mail claiming to be from a given domain.
|
|
///
|
|
/// Deliberately does not implement two parts of the RFC: macro
|
|
/// expansion (7208 7) and the ptr mechanism (7208 5.5) - macros are
|
|
/// rare outside large/complex senders, and the RFC itself says ptr
|
|
/// "SHOULD NOT be published" and "SHOULD be used as a last resort"
|
|
/// by checkers, precisely because it is unreliable and expensive (a
|
|
/// reverse-then-forward DNS round trip per candidate name). A
|
|
/// mechanism using either is simply skipped (treated as
|
|
/// non-matching) rather than failing the whole check.
|
|
///
|
|
|
|
class SPFChecker {
|
|
|
|
public:
|
|
|
|
enum class Result { Pass, Fail, SoftFail, Neutral, None, PermError, TempError };
|
|
|
|
///
|
|
/// domain is the identity being checked (the envelope MAIL FROM's
|
|
/// domain, or the HELO/EHLO domain when MAIL FROM is the null
|
|
/// reverse-path <> - RFC 7208 2.3/2.4). clientIP is the IP
|
|
/// address of the SMTP client that actually connected.
|
|
///
|
|
|
|
static Result check(const std::string &domain, const std::string &clientIP);
|
|
|
|
static std::string resultName(Result result);
|
|
|
|
///
|
|
/// A standard Received-SPF: header (RFC 7208 9.1, the convention
|
|
/// essentially every inbound MTA follows) recording the result -
|
|
/// downstream processing (a user's mail client, a later
|
|
/// spam-scoring pass) can key off this without redoing the DNS
|
|
/// work itself.
|
|
///
|
|
|
|
static std::string receivedSPFHeader(Result result, const std::string &domain,
|
|
const std::string &clientIP, const std::string &helo,
|
|
const std::string &receivingHost);
|
|
|
|
private:
|
|
|
|
// mechanismCount is threaded by reference through every
|
|
// recursive/redirected call so the RFC 7208 4.6.4 limit (10
|
|
// DNS-querying terms total across the whole evaluation, not per
|
|
// record) is enforced globally, not reset at each level.
|
|
static Result checkRecursive(const std::string &domain, const std::string &clientIP, int &mechanismCount);
|
|
|
|
static std::vector<std::string> lookupSPFRecords(const std::string &domain);
|
|
static std::vector<std::string> lookupA(const std::string &domain);
|
|
static std::vector<std::string> lookupMX(const std::string &domain);
|
|
|
|
static bool ipInCIDR(const std::string &ip, const std::string &cidrSpec, int defaultPrefixV4, int defaultPrefixV6);
|
|
|
|
};
|
|
|
|
}
|
|
|
|
#endif
|