Brad ArantandClaude Sonnet 5
407cc2e915
- DKIM signing was hardcoded to one domain; now keyed per-domain off the sending address, fixing mail for every domain but the original. - Admin console (port 1027) is now TLS-wrapped instead of plaintext. - barantmail.log now rotates by size (config-driven) instead of growing unbounded (previously hit 23GB). - ResolverThreadScope.h: a <setenv> scoping fix for name resolution inside a <try> block that previously did not survive its own container. - IMAPArgs.cpp: fixed "UID STORE 1:*" wrongly requiring UID 1 to exist, which silently made empty-folder operations delete nothing. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
98 lines
3.4 KiB
C++
98 lines
3.4 KiB
C++
#ifndef __SMTPServer_h__
|
|
# define __SMTPServer_h__
|
|
|
|
# include <string>
|
|
# include <vector>
|
|
# include <map>
|
|
# include <filesystem>
|
|
# include "EPoll.h"
|
|
# include "TCPServer.h"
|
|
# include "TLSInfo.h"
|
|
# include "SMTPSession.h"
|
|
# include "MailFileSystem.h"
|
|
# include "__SMTP_AUTH.h"
|
|
# include "__SMTP_DATA.h"
|
|
# include "__SMTP_EHLO.h"
|
|
# include "__SMTP_EXPN.h"
|
|
# include "__SMTP_HELO.h"
|
|
# include "__SMTP_HELP.h"
|
|
# include "__SMTP_MAIL.h"
|
|
# include "__SMTP_NOOP.h"
|
|
# include "__SMTP_QUIT.h"
|
|
# include "__SMTP_RCPT.h"
|
|
# include "__SMTP_RSET.h"
|
|
# include "__SMTP_VRFY.h"
|
|
# include "INotify.h"
|
|
# include "SendMail.h"
|
|
# include "DKIMSigner.h"
|
|
# include "SpamAssassinFilter.h"
|
|
namespace mail {
|
|
|
|
class SMTPServer : public core::TCPServer, public core::INotify {
|
|
|
|
public:
|
|
// watchQueue controls whether this instance watches the mail
|
|
// queue directory and relays/delivers what lands in it - true by
|
|
// default for the ordinary single-listener case. Running a
|
|
// second SMTPServer for a submission/TLS port alongside the
|
|
// plaintext one needs watchQueue=false on exactly one of the two:
|
|
// each SMTPServer's own INotify watch is independent, so two
|
|
// watchers on the same directory would each fire inCreate() for
|
|
// every queued message, delivering it twice.
|
|
// dkimSigners is optional (nullptr = outbound mail goes out
|
|
// unsigned for every domain) and not owned - passed straight
|
|
// through to every SendMail this instance's inCreate() constructs
|
|
// for outbound relay, which picks the entry matching each
|
|
// individual message's own sender domain (see SendMail's own doc
|
|
// comment).
|
|
SMTPServer(core::EPoll &ePoll, std::string hostName, MailFileSystem &mailFileSystem,
|
|
core::IPAddress ipAddress, core::TLSInfo *tlsInfo, bool watchQueue = true,
|
|
std::map<std::string, DKIMSigner*> *dkimSigners = nullptr);
|
|
|
|
MailFileSystem &mailFileSystem;
|
|
std::string hostName;
|
|
core::EPoll &ePoll;
|
|
std::map<std::string, DKIMSigner*> *dkimSigners;
|
|
|
|
// Advertised via EHLO's "250-SIZE <n>" and enforced by __SMTP_DATA
|
|
// while accumulating a message body - RFC 1870. 25MB, matching
|
|
// the limit most real providers (e.g. Gmail) use.
|
|
static const size_t maxMessageSize = 25 * 1024 * 1024;
|
|
|
|
SMTPSession * getSocketAccept(core::EPoll &ePoll) override;
|
|
void sessionErrorHandler(std::string errorString, std::stringstream &out);
|
|
|
|
protected:
|
|
void inCreate(coreutils::ZString &name);
|
|
|
|
private:
|
|
__SMTP_AUTH _smtp_auth;
|
|
__SMTP_DATA _smtp_data;
|
|
__SMTP_EHLO _smtp_ehlo;
|
|
__SMTP_EXPN _smtp_expn;
|
|
__SMTP_HELO _smtp_helo;
|
|
__SMTP_HELP _smtp_help;
|
|
__SMTP_MAIL _smtp_mail;
|
|
__SMTP_NOOP _smtp_noop;
|
|
__SMTP_QUIT _smtp_quit;
|
|
__SMTP_RCPT _smtp_rcpt;
|
|
__SMTP_RSET _smtp_rset;
|
|
__SMTP_VRFY _smtp_vrfy;
|
|
int wd;
|
|
|
|
void processExisting();
|
|
|
|
// Writes one already-scanned message into one mailbox's Inbox
|
|
// or Spam folder - factored out of inCreate() so an alias
|
|
// (MailFileSystem::ifAliasExists()/getAliasMailboxes()) can
|
|
// deliver the same scanned copy to each of its target mailboxes,
|
|
// not just the single recipient a plain local delivery has.
|
|
void deliverToMailbox(coreutils::ZString &mailbox, coreutils::ZString &messageId,
|
|
SpamAssassinFilter::Result &scan);
|
|
|
|
};
|
|
|
|
}
|
|
|
|
#endif
|