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>
83 lines
3.5 KiB
C++
83 lines
3.5 KiB
C++
#ifndef __SendMail_h__
|
|
#define __SendMail_h__
|
|
|
|
#include "DKIMSigner.h"
|
|
#include "File.h"
|
|
#include "MString.h"
|
|
#include <map>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
namespace mail {
|
|
|
|
///
|
|
/// SendMail delivers one message to one remote recipient over
|
|
/// outbound SMTP (RFC 5321): resolves the recipient domain's MX
|
|
/// records - falling back to the domain's own address when none
|
|
/// exist, per RFC 5321 5.1 - tries each candidate host in preference
|
|
/// order until one accepts the message, and runs the client side of
|
|
/// the SMTP conversation (EHLO/HELO, MAIL FROM, RCPT TO, DATA with
|
|
/// dot-stuffing) over a plain blocking socket.
|
|
///
|
|
/// send() is a plain, synchronous, blocking call - it does not spawn
|
|
/// a thread or manage this object's lifetime itself, so the exact
|
|
/// same class serves both of this server's real callers even though
|
|
/// they want opposite things: SMTPServer::inCreate() (queued mail
|
|
/// found via inotify) wants fire-and-forget, so it wraps its own
|
|
/// heap-allocated SendMail in a detached thread and deletes it when
|
|
/// send() returns; main.cpp's "sendmail2" CLI-injector mode wants to
|
|
/// block and report the result back to its caller (matching the
|
|
/// classic local sendmail(1) contract other programs shell out to),
|
|
/// so it just calls send() directly on the stack. Baking a threading
|
|
/// policy into this class would have made one of those two wrong.
|
|
///
|
|
/// Every line sent and every line the remote server responds with is
|
|
/// appended, as it happens (not buffered to be written only at the
|
|
/// end - a hung or very slow remote host would otherwise leave no
|
|
/// trace at all until it finally times out), to one log file per
|
|
/// message under sendLogPath, shared across every recipient of that
|
|
/// message so its full delivery history reads as one transcript.
|
|
///
|
|
|
|
class SendMail {
|
|
|
|
public:
|
|
// dkimSigners is optional (nullptr = don't sign anything) and not
|
|
// owned - the caller keeps both it and every DKIMSigner it points
|
|
// to alive for as long as any SendMail built from it might still
|
|
// be sending (shared, reusable across many messages; a signer
|
|
// holds no per-message state). Keyed by domain (matching a
|
|
// sender address's own domain, case-sensitive exact match, via
|
|
// domainOf() on `from`) - a domain with no entry just goes out
|
|
// unsigned, same as dkimSigners being nullptr entirely.
|
|
SendMail(std::string hostName, std::string sendLogPath, std::string messageId,
|
|
coreutils::MString from, coreutils::MString recipient, coreutils::MString mailData,
|
|
std::map<std::string, DKIMSigner*> *dkimSigners = nullptr);
|
|
|
|
/// Blocking. Returns true if some MX host for the recipient's
|
|
/// domain accepted the message, false if DNS resolution or every
|
|
/// host it tried failed.
|
|
bool send();
|
|
|
|
private:
|
|
bool deliverToHost(const std::string &host, coreutils::File &log);
|
|
std::vector<std::string> lookupMX(const std::string &domain);
|
|
std::string domainOf(coreutils::MString &address);
|
|
std::string readLine(int fd);
|
|
int readResponse(int fd, coreutils::File &log, std::string &fullText);
|
|
void sendLine(int fd, const std::string &line, coreutils::File &log);
|
|
|
|
std::string hostName;
|
|
std::string sendLogPath;
|
|
std::string messageId;
|
|
coreutils::MString from;
|
|
coreutils::MString recipient;
|
|
coreutils::MString mailData;
|
|
std::map<std::string, DKIMSigner*> *dkimSigners;
|
|
|
|
};
|
|
|
|
}
|
|
|
|
#endif
|