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).
110 lines
3.9 KiB
C++
110 lines
3.9 KiB
C++
#ifndef __MailFolder_h__
|
|
#define __MailFolder_h__
|
|
|
|
#include <cstdint>
|
|
#include <ctime>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
namespace mail {
|
|
|
|
///
|
|
/// MailFolder is the IMAP mailbox index for one folder directory
|
|
/// (Inbox, Spam, Trash, or any client-CREATEd folder). It does NOT
|
|
/// change how mail is delivered - SMTPServer::inCreate() still just
|
|
/// hardlinks/writes plain files straight into a folder directory, the
|
|
/// same as before IMAP existed. What MailFolder adds, alongside those
|
|
/// message files, is three small index files:
|
|
///
|
|
/// .uidvalidity - generated once, read thereafter.
|
|
/// .uidnext - monotonic counter, never reused even across
|
|
/// EXPUNGE.
|
|
/// .imapindex - one line per message: "<filename> <uid>
|
|
/// <internalDate> <flag1,flag2,...>" (last field
|
|
/// may be empty).
|
|
///
|
|
/// load() reconciles the index against an actual directory scan: any
|
|
/// message file present on disk that isn't yet in the index (freshly
|
|
/// delivered SMTP mail, most commonly) gets a UID assigned and is
|
|
/// marked \Recent for this one load() only; any indexed file no
|
|
/// longer present (expunged some other way) is dropped. This is the
|
|
/// ONLY integration point with delivery - delivery code never needs
|
|
/// to know a UID scheme exists.
|
|
///
|
|
|
|
class MailFolder {
|
|
|
|
public:
|
|
|
|
struct Message {
|
|
uint32_t uid = 0;
|
|
std::string fileName;
|
|
std::vector<std::string> flags;
|
|
bool recent = false;
|
|
size_t size = 0;
|
|
time_t internalDate = 0;
|
|
};
|
|
|
|
bool load(std::string folderPath);
|
|
void save();
|
|
|
|
uint32_t uidValidity() const { return mUidValidity; }
|
|
uint32_t uidNext() const { return mUidNext; }
|
|
size_t size() const { return mMessages.size(); }
|
|
const std::vector<Message> &messages() const { return mMessages; }
|
|
|
|
// 1-based sequence number <-> UID (ascending UID order defines
|
|
// sequence order). Returns 0 for "not present"/"out of range".
|
|
uint32_t seq(uint32_t uid) const;
|
|
uint32_t uidForSeq(uint32_t seqNum) const;
|
|
|
|
Message *find(uint32_t uid);
|
|
|
|
size_t recentCount() const;
|
|
size_t unseenCount() const;
|
|
uint32_t firstUnseenSeq() const;
|
|
|
|
std::string readMessage(uint32_t uid);
|
|
|
|
void setFlags(uint32_t uid, const std::vector<std::string> &flags);
|
|
void addFlags(uint32_t uid, const std::vector<std::string> &flags);
|
|
void removeFlags(uint32_t uid, const std::vector<std::string> &flags);
|
|
|
|
// internalDate == 0 means "use now". Not marked \Recent - an
|
|
// APPEND/COPY destination message is never \Recent (RFC 3501
|
|
// 2.3.2: \Recent means "delivered since the last time any session
|
|
// selected this mailbox", which by definition isn't true of a
|
|
// message THIS session just created).
|
|
uint32_t append(const std::string &data, const std::vector<std::string> &flags, time_t internalDate = 0);
|
|
|
|
// Unlinks every \Deleted message and removes it from the index.
|
|
// Returns the sequence numbers to report via "* n EXPUNGE", each
|
|
// ALREADY ADJUSTED for the responses sent before it (see
|
|
// __IMAP_EXPUNGE.cpp's doc comment for why that adjustment is
|
|
// required, not optional).
|
|
std::vector<uint32_t> expunge();
|
|
|
|
// Unlinks one specific message and removes it from the index -
|
|
// POP3's QUIT (RFC 1939 6) needs this instead of expunge(): POP3
|
|
// deletion marks are tracked by POP3Session as a set of message
|
|
// numbers, entirely separate from the \Deleted flag expunge()
|
|
// acts on, since POP3 has no flags at all.
|
|
void deleteMessage(uint32_t uid);
|
|
|
|
std::string path;
|
|
|
|
private:
|
|
uint32_t mUidValidity = 0;
|
|
uint32_t mUidNext = 1;
|
|
std::vector<Message> mMessages;
|
|
|
|
void loadIndexFile();
|
|
void reconcileWithDisk();
|
|
static std::string generateFileName();
|
|
|
|
};
|
|
|
|
}
|
|
|
|
#endif
|