Thread/EPoll lifecycle: - Thread::~Thread() now actually joins/frees its worker thread (was empty - the OS thread kept running against already-freed EPoll/Socket objects on any early teardown, a confirmed "double free" crash) - EPoll::~EPoll() calls stop() if never explicitly stopped, for the same reason - epoll_wait() now uses a 1s timeout instead of blocking forever, so a worker thread can actually notice isStopping() and let itself be joined - EPoll::processCommand() iterated threads by value, silently double-freeing the real vector's Thread the moment each copy went out of scope - ThreadScope gained onThreadStart()/onThreadEnd() hooks (actually wired up now - the constructor that was supposed to store the scope discarded it) for per-thread C-library init (e.g. MySQL client) Socket/TCPSocket/TLS: - Socket::writeSocket(): give up and shut down a connection after 50 consecutive zero-progress sends instead of retrying forever - SSL_ERROR_WANT_READ on a write needs a READ to make progress, but resetSocket() re-arms EPOLLWRNORM regardless, which an already-writable TCP socket satisfies immediately - a real stuck connection generated 55GB, then 12.9GB of debug log this way before being caught - Socket::writeSocket() now honors sendData()'s actual return value (previously discarded, entry popped unconditionally after one call) - a large response could get silently truncated past what fit in one write()/SSL_write() call - TLS::registerSocket()/sendData()/receiveData(): `initialized` now only goes true once SSL_set_fd() has actually succeeded, and sendData()/receiveData() check it first - fixes a real SIGSEGV where a new session's own queued greeting could reach SSL_write() on a different epoll thread before this session's handshake setup had run - TCPServer::connectionRequest() now performs the TLS handshake ON THE ACCEPTED SESSION, not the listening server itself (was building SSL state on the wrong object, leaving every session's own `ssl` uninitialized) - TCPServer::receiveData() always uses the plain (non-TLS) read path - the listening socket is never itself a TLS peer - TCPSocket's block-mode literal reading used an unset `blockLength` field instead of `blockSize`, and could busy-spin forever on a multi-packet literal - TCPSocket line scanning replaced an unbounded strcspn() (assumes a NUL-terminated buffer; read past a non-NUL-terminated receive buffer into adjacent heap memory) with a bounds-checked memchr() scan Protocol/session handling: - CommandList::processRequest() now case-folds the command keyword before lookup - SMTP/POP3/IMAP commands are spec-required to be case-insensitive; a client sending "Mail From:" instead of "MAIL FROM:" previously failed to dispatch at all - TCPSession::protocol() no longer drops blank lines while a handler has grabbed input (e.g. __SMTP_DATA reading a message body, an IMAP APPEND literal) - those handlers depend on seeing blank lines as real content, not commands; this silently corrupted any message body containing a blank line - TCPSession's uuid alias fixed: streaming a raw uuid_t via operator<< triggered libstdc++'s unsigned-char* overload (strlen() on 16 binary bytes, a real stack-buffer-overflow read), and `alias` pointed at a stack-local that was already destroyed by the time the constructor returned - INotify::processEvent() only treats event->name as a NUL-terminated string when event->len > 0 (per inotify(7)) instead of unconditional strlen() on a field the kernel doesn't guarantee is even present - a confirmed heap-buffer-overflow read that had been misdiagnosed as a MySQL thread-safety issue
179 lines
6.1 KiB
C++
179 lines
6.1 KiB
C++
|
|
#ifndef __TCPSocket_h__
|
|
#define __TCPSocket_h__
|
|
|
|
#include "Socket.h"
|
|
#include "TLS.h"
|
|
#include "TLSInfo.h"
|
|
#include "IPAddress.h"
|
|
|
|
namespace core {
|
|
|
|
///
|
|
/// TCPSocket
|
|
///
|
|
/// Provides a network TCP socket.
|
|
///
|
|
/// For accessing TCP network functions use this object. The connection oriented nature of TCP
|
|
/// provides a single client persistent connection with data error correction and a durable
|
|
/// synchronous data connection.
|
|
///
|
|
|
|
class TCPSocket : public Socket, public TLS {
|
|
|
|
public:
|
|
|
|
///
|
|
///
|
|
///
|
|
|
|
TCPSocket(EPoll &ePoll);
|
|
|
|
///
|
|
///
|
|
///
|
|
|
|
TCPSocket(EPoll &ePoll, std::string text);
|
|
|
|
///
|
|
///
|
|
///
|
|
|
|
TCPSocket(EPoll &ePoll, TLSInfo *tlsInfo, std::string text);
|
|
|
|
///
|
|
///
|
|
///
|
|
|
|
TCPSocket(EPoll &ePoll, SSL_CTX *ctx, std::string text);
|
|
|
|
///
|
|
///
|
|
///
|
|
|
|
virtual ~TCPSocket();
|
|
|
|
///
|
|
///
|
|
///
|
|
|
|
void connect(IPAddress &address);
|
|
|
|
IPAddress ipAddress;
|
|
|
|
///
|
|
/// The output method is called by a socket session (TCPSession) and
|
|
/// will output the detail information for the client socket. When extending
|
|
/// TCPSocket or TCPSession you can override the method to add attributes
|
|
/// to the list.
|
|
///
|
|
|
|
virtual void output(std::stringstream &out);
|
|
|
|
///
|
|
/// Override this method to receive data directly from the socket as data is
|
|
/// received. If you need data split by line termination characters then
|
|
/// override the onLineReceived method instead.
|
|
///
|
|
|
|
virtual void onDataReceived(coreutils::ZString &data) override;
|
|
|
|
///
|
|
/// Override the onLineReceived method to receive a string of characters that
|
|
/// represents a single line of data terminated by a LF or CRLF. If onDataReceived
|
|
/// was overriden this method will not be called unless the onDataReceived calls
|
|
/// this method explicitly using the class and member name.
|
|
///
|
|
|
|
virtual void onLineReceived(coreutils::ZString &line);
|
|
|
|
///
|
|
/// Override the onBlockReceived method to receive a string of characters that
|
|
/// represents a single block of data of length determined by the block length value. If
|
|
/// onDataReceived was overriden this method will not be called unless the onDataReceived
|
|
/// calls this method explicitly using the class and member name.
|
|
///
|
|
|
|
virtual void onBlockReceived(coreutils::ZString &block);
|
|
|
|
///
|
|
/// Use setBlockSize to set the amount of data that should be read at once from the
|
|
/// session data buffer.
|
|
/// If this value is set to 0 then the data will be retrieved
|
|
///
|
|
|
|
void setBlockSize(int size = 0);
|
|
|
|
///
|
|
/// Dispatches to TLS::receiveData (SSL_read) when this socket was constructed with a
|
|
/// TLSInfo/SSL_CTX, otherwise falls back to Socket::receiveData (plain ::read). Needed
|
|
/// because Socket and TLS both declare receiveData as unrelated sibling methods -
|
|
/// Socket::receiveData is virtual but TLS::receiveData does not override it, so without
|
|
/// this explicit override TLS::receiveData would never be reached and encrypted bytes
|
|
/// would be handed to onDataReceived as if they were plaintext.
|
|
///
|
|
|
|
virtual void receiveData(coreutils::ZString &buffer) override;
|
|
|
|
///
|
|
/// Dispatches to TLS::sendData (SSL_write) when this socket was constructed with a
|
|
/// TLSInfo/SSL_CTX, otherwise falls back to Socket::sendData (plain ::write). Mirrors
|
|
/// the receiveData override above for the write path.
|
|
///
|
|
|
|
virtual int sendData(const char *data, int length) override;
|
|
|
|
///
|
|
/// Completes the TLS handshake (SSL_new/SSL_set_fd/SSL_accept) for
|
|
/// THIS socket's own ctx/descriptor. registerSocket()/acceptSocket()
|
|
/// are protected TLS members, reachable here via an ordinary
|
|
/// same-class call - the point of exposing this as a public wrapper
|
|
/// is so a sibling class (TCPServer, which does not inherit
|
|
/// TCPSocket-the-session's-particular-instance and so cannot reach
|
|
/// another object's protected members directly) can still trigger
|
|
/// the handshake on a specific accepted session from
|
|
/// TCPServer::connectionRequest(), rather than accidentally running
|
|
/// it against the listening server socket itself (see that call
|
|
/// site's own comment for the real, confirmed crash this replaces -
|
|
/// SSL_read() on an accepted session's never-initialized ssl
|
|
/// member).
|
|
///
|
|
|
|
void performTLSHandshake();
|
|
|
|
protected:
|
|
bool term = false;
|
|
TLSInfo *tlsInfo;
|
|
|
|
private:
|
|
char *lineBuffer = NULL;
|
|
int lineBufferSize = 0;
|
|
int lineLength = 0;
|
|
int blockSize = 0;
|
|
|
|
// Socket's own `lock` (guards receiveData) and `outlock` (guards
|
|
// writeSocket/the fifo) are two DIFFERENT mutexes - a thread
|
|
// handling EPOLLIN and a different thread handling EPOLLWRNORM for
|
|
// the SAME connection can therefore call SSL_read and SSL_write on
|
|
// the SAME `ssl*` concurrently. OpenSSL does not support that: an
|
|
// SSL object must not be used by more than one thread at a time
|
|
// (even in 1.1.0+/3.x, which dropped the old app-supplied
|
|
// CRYPTO_set_locking_callback global-locking API entirely - that
|
|
// API never protected concurrent use of one SSL object anyway,
|
|
// only OpenSSL's own internal global state). Confirmed live via
|
|
// dmesg: "traps: apiserver[...] general protection fault ... in
|
|
// libssl.so.3" during ordinary interactive use. ioLock serializes
|
|
// just the raw SSL_read/SSL_write calls themselves (see
|
|
// receiveData/sendData below) - deliberately NOT the surrounding
|
|
// request-handling, which already nests `lock` before `outlock`
|
|
// (receiveData's call chain reaches Socket::write(), which takes
|
|
// outlock) - wrapping any larger scope in ioLock+lock+outlock
|
|
// together risks recreating that same ordering as a new cycle.
|
|
std::mutex ioLock;
|
|
|
|
};
|
|
|
|
}
|
|
|
|
#endif
|