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).
87 lines
3.3 KiB
C++
87 lines
3.3 KiB
C++
#include "__IMAP_APPEND.h"
|
|
#include "IMAPArgs.h"
|
|
#include "IMAPServer.h"
|
|
#include "MailFolder.h"
|
|
#include <cstdlib>
|
|
#include <sstream>
|
|
|
|
namespace mail {
|
|
|
|
int __IMAP_APPEND::processCommand(coreutils::ZString &request, IMAPSession &session, IMAPServer &server) {
|
|
if (session.state == IMAPSession::NOT_AUTHENTICATED) {
|
|
session.out << session.tag << " NO Not authenticated" << CRLF;
|
|
return 1;
|
|
}
|
|
|
|
coreutils::ZString mailboxArg = IMAPArgs::nextArgument(request);
|
|
std::string folderName = IMAPArgs::normalizeFolderName(IMAPArgs::unwrap(mailboxArg));
|
|
coreutils::ZString userNameZ(session.userName);
|
|
|
|
if (!IMAPArgs::isValidFolderName(folderName)) {
|
|
session.out << session.tag << " BAD Invalid mailbox name" << CRLF;
|
|
return 1;
|
|
}
|
|
if (!server.mailFileSystem.ifFolderExists(userNameZ, folderName)) {
|
|
session.out << session.tag << " NO [TRYCREATE] Mailbox does not exist" << CRLF;
|
|
return 1;
|
|
}
|
|
|
|
std::vector<std::string> flags;
|
|
time_t internalDate = 0;
|
|
|
|
coreutils::ZString nextArg = IMAPArgs::nextArgument(request);
|
|
std::string nextText = nextArg.str();
|
|
if (!nextText.empty() && nextText[0] == '(') {
|
|
std::string flagText = IMAPArgs::unwrap(nextArg);
|
|
std::istringstream flagStream(flagText);
|
|
std::string flag;
|
|
while (flagStream >> flag)
|
|
flags.push_back(flag);
|
|
nextArg = IMAPArgs::nextArgument(request);
|
|
nextText = nextArg.str();
|
|
}
|
|
if (!nextText.empty() && nextText[0] == '"') {
|
|
internalDate = IMAPArgs::parseDate(nextArg);
|
|
if (internalDate == (time_t)-1)
|
|
internalDate = 0;
|
|
nextArg = IMAPArgs::nextArgument(request);
|
|
nextText = nextArg.str();
|
|
}
|
|
|
|
if (nextText.empty() || nextText[0] != '{') {
|
|
session.out << session.tag << " BAD APPEND requires a message literal" << CRLF;
|
|
return 1;
|
|
}
|
|
long literalSize = std::strtol(IMAPArgs::unwrap(nextArg).c_str(), nullptr, 10);
|
|
if (literalSize < 0) {
|
|
session.out << session.tag << " BAD Invalid literal size" << CRLF;
|
|
return 1;
|
|
}
|
|
|
|
std::string folderPath = server.mailFileSystem.getFolderPath(userNameZ, folderName).str();
|
|
std::string tag = session.tag;
|
|
bool wasSelectedFolder = (session.state == IMAPSession::SELECTED && session.selectedFolderName == folderName);
|
|
|
|
session.pendingBlockHandler = [&session, folderPath, flags, internalDate, tag, wasSelectedFolder](coreutils::ZString &block) {
|
|
session.setBlockSize(0);
|
|
MailFolder folder;
|
|
folder.load(folderPath);
|
|
uint32_t uid = folder.append(block.str(), flags, internalDate);
|
|
// A client that APPENDs into the mailbox it currently has
|
|
// SELECTed needs its own view refreshed, or a subsequent FETCH/
|
|
// STORE against the sequence numbers it already knows would be
|
|
// working off a stale EXISTS count.
|
|
if (wasSelectedFolder)
|
|
session.mailbox = folder;
|
|
session.out << tag << " OK [APPENDUID " << (int)folder.uidValidity() << " " << (int)uid << "] APPEND completed" << CRLF;
|
|
session.send();
|
|
};
|
|
|
|
session.out << "+ OK" << CRLF;
|
|
session.send();
|
|
session.setBlockSize((int)literalSize);
|
|
return 1;
|
|
}
|
|
|
|
}
|