Brad Arant
3609ed603e
tls and master diverged from a July 2024 fork point and never reconciled - tls carries ~19 months of real socket/TLS stability fixes (uninitialized tlsInfo, TCPServer::connectionRequest() unconditionally initializing TLS, the WANT_READ write busy-spin, the console authentication fix from this session), while master independently picked up a Subscription/SubscriptionManager rework (MString-based ownership tracking: owner/ownership/selection/time fields and a working subscriptionOwner() method) that tls never had. Every file both branches touched was resolved by keeping tls's side entirely (Command.h, Socket.cpp, TCPServer.h, TCPSession.cpp/h, TCPSocket.h were pure reformatting on master's side, or an alternate/superseded fix for a bug tls already fixed a different way - e.g. master's TCPSession uuid/alias handling vs tls's existing uuid_unparse-based fix), with two deliberate exceptions: - TCPServer.cpp's constructor was missing the commands.add(subscriptions, "publish"/"subscribe"/"catalog"/...) wiring master had - without it, SubscriptionManager existed but was completely unreachable through the normal command dispatch. Restored on top of tls's TLS-aware constructor. - SubscriptionManager.cpp's "invite" command handler had a real incompatibility: master's version assigned into an `invitee` member typed as coreutils::MString via a stray `(coreutils::MString *)` cast that doesn't match the member's actual (non-pointer) type, and called session.server.getSessionByAlias() against a TCPServer reference - tls made TCPSession::server a pointer (part of removing the separate TCPSession2 class), so that call site no longer compiles as written. Took tls's cleaner local-variable version instead (functionally identical - looks up a session by alias and forwards an invite message) and removed the now-unused `invitee` member from SubscriptionManager.h. One additional compile fix needed after resolving conflicts: Subscription::subscriptionOwners is an MString (master's ownership design), but TCPSession::alias is void* (tls's identity mechanism, unchanged and depended on elsewhere) - MString has an implicit constructor from void* already used successfully elsewhere in this same file (the "publish" handler's Subscription constructor call), but operator== doesn't accept the same implicit conversion, so removeSessionSubscriptions()'s ownership check needed an explicit coreutils::MString(session.alias) construction to compile. Also drops output/main (a stray checked-in compiled binary, already removed on tls) and the doxygen docs/html output (already removed on tls, was carried on master since the fork). Verified: full ServerCore rebuild (./compile) succeeds with zero errors or warnings beyond the one compile fix documented above.
65 lines
2.2 KiB
Plaintext
65 lines
2.2 KiB
Plaintext
#include "CommandList.h"
|
|
#include "Log.h"
|
|
#include <algorithm>
|
|
#include <cctype>
|
|
|
|
namespace core {
|
|
|
|
CommandList::CommandList(std::string delimiter, int depth) : delimiter(delimiter), depth(depth) {}
|
|
|
|
void CommandList::add(Command &command, std::string name) {
|
|
commands.insert(std::make_pair(name, &command));
|
|
}
|
|
|
|
void CommandList::remove(Command &command) {}
|
|
|
|
int CommandList::processRequest(coreutils::ZString &request, TCPSession &session) {
|
|
if(session.grab != NULL) {
|
|
return session.grab->processCommand(request, session);
|
|
}
|
|
else {
|
|
if(request.equals(""))
|
|
return 0;
|
|
request.split(delimiter, depth);
|
|
request.reset();
|
|
try {
|
|
// Every protocol built on this (SMTP, POP3, IMAP - RFC 5321
|
|
// 2.4, RFC 1939 3, RFC 3501 2.2.1) specifies that command
|
|
// keywords are case-insensitive, but commands are always
|
|
// registered here in uppercase and this was an exact-match
|
|
// lookup - "mail from:" or "Mail From:" (both legal on the
|
|
// wire, and not unusual from real clients) silently failed
|
|
// to dispatch at all. Only the lookup key is case-folded;
|
|
// the token instances handlers actually receive are
|
|
// untouched, so any handler doing its own case-sensitive
|
|
// parsing on arguments is unaffected.
|
|
std::string key = request[0].str();
|
|
std::transform(key.begin(), key.end(), key.begin(),
|
|
[](unsigned char c) { return std::toupper(c); });
|
|
auto command = commands.at(key);
|
|
return command->processCommand(request, session);
|
|
}
|
|
catch(...) {
|
|
return 0;
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
bool CommandList::grabInput(TCPSession &session, Command &command) {
|
|
session.grab = &command;
|
|
return true;
|
|
}
|
|
|
|
void CommandList::clearGrab(TCPSession &session) {
|
|
session.grab = NULL;
|
|
}
|
|
|
|
int CommandList::processCommand(coreutils::ZString &request, TCPSession &session) {
|
|
// for(Command *command : commands)
|
|
// session.out << command->getName() << std::endl;
|
|
return true;
|
|
}
|
|
|
|
}
|