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).
48 lines
1.6 KiB
C++
48 lines
1.6 KiB
C++
#ifndef __SpamAssassinFilter_h__
|
|
#define __SpamAssassinFilter_h__
|
|
|
|
#include <string>
|
|
|
|
namespace mail {
|
|
|
|
///
|
|
/// Pipes a message through the local spamd (via the spamc protocol,
|
|
/// spoken directly over a socket rather than shelling out to the
|
|
/// spamc binary) on the local-delivery path in
|
|
/// SMTPServer::inCreate() - spamd hands back the message with its
|
|
/// usual X-Spam-Status/X-Spam-Level/X-Spam-Report headers added (and,
|
|
/// once a message is over its own report_safe threshold, rewrapped
|
|
/// into a text/plain report). This class applies no threshold of its
|
|
/// own - spamd's required_score (/etc/spamassassin/local.cf, 5.0 on
|
|
/// this host) is what actually decides Yes/No; isSpam below just
|
|
/// reads that verdict back out of the X-Spam-Status header spamd
|
|
/// already wrote, the same way any other MTA's spam tag would be
|
|
/// read by a downstream filter.
|
|
///
|
|
/// Fails open: if spamd can't be reached at all, delivery proceeds
|
|
/// with the original, unscanned message rather than blocking mail
|
|
/// on a scanner outage.
|
|
///
|
|
|
|
class SpamAssassinFilter {
|
|
|
|
public:
|
|
|
|
struct Result {
|
|
bool ok = false; // true if spamd actually scanned the message
|
|
bool isSpam = false; // parsed from X-Spam-Status: Yes/No - meaningless if !ok
|
|
std::string scanned; // the (possibly tagged/rewritten) message; == input verbatim if !ok
|
|
};
|
|
|
|
static Result scan(const std::string &message);
|
|
|
|
private:
|
|
|
|
static bool talkToSpamd(const std::string &message, std::string &response);
|
|
|
|
};
|
|
|
|
}
|
|
|
|
#endif
|