mirror of
https://github.com/logos-co/logos-protocol.git
synced 2026-08-27 12:01:15 +00:00
* feat: group-shareable local sockets, stale-socket reaper, bind-failure detection
The QtRO local transport binds each module's unix socket at 0777 & ~umask
(0755) with no way for a second OS user to reach it, discards the listen
result so a failed bind surfaces only as clients hanging, and never cleans up
the socket file — a hard-killed logos_host leaks it forever.
Add a Qt-free helper (logos_socket_paths.{h,cpp}) usable from both the qt_remote
and plain transport paths:
- applySocketPerms(path): chgrp + chmod a bound socket per LOGOS_SOCKET_GROUP /
LOGOS_SOCKET_MODE (chgrp-then-chmod so a half-applied policy is only ever
too strict). No-op when unset, so default behaviour is unchanged. Connecting
to an AF_UNIX socket needs write permission, so 0660 is what lets a group
member in.
- isSocketDead(path): S_ISSOCK && owned-by-us && non-blocking connect returns
ECONNREFUSED/ENOENT. Fails closed on any other outcome, so it never reports
a live socket or a regular file dead.
- reapStaleSockets(dir, prefix): unlink only the dead sockets, never a regular
file that shares the prefix (e.g. a *.lgx build artefact).
Wire it into RemoteTransportHost::publishObject and QtRemoteRegistry:
- construct QRemoteObjectRegistryHost empty and listen via setRegistryUrl() so
a bind failure is observed and logged (with lastError() + the socket path)
instead of leaving a silently-broken host;
- apply the socket-access policy to the freshly-bound local: socket.
The env-driven policy means every process in a node's tree (daemon, logos_host
subprocesses, their children) applies the same rule to every socket it binds
without threading config through each layer — the daemon exports the vars once.
Adds test_socket_paths.cpp (8 gtests): mode/group application, no-op default,
bad-mode rejection, live/dead/regular-file classification, and the reaper
keeping live sockets and regular files while removing only dead ones.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* review: harden socket helpers (gid overflow, socket-owner check, empty-prefix guard, dedup path)
Addressing automated review feedback on the socket helpers:
- resolveGid(): validate strtoul() errno/range so an out-of-range numeric
LOGOS_SOCKET_GROUP is rejected instead of silently truncating to a wrong gid.
- applySocketPerms(): when a policy is requested, stat the path first and refuse
unless it's a socket we own (S_ISSOCK + st_uid == geteuid()), so a malformed
URL can never chmod/chown a stray file. No-op fast path when the env is unset.
- reapStaleSockets(): refuse an empty prefix (would make every dead socket the
process owns a deletion candidate).
- Extract the duplicated `localSocketFilePath()` (Qt QLocalServer name->path
rule) into a shared qt_remote/qt_socket_path.h so RemoteTransportHost and
QtRemoteRegistry can't drift.
Adds tests: non-socket path refused (mode unchanged), empty-prefix reaper no-op.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* feat: transport-aware token validator hook on ModuleProxy (#22)
* feat: transport-aware token validator hook on ModuleProxy
Adds an injectable authorizer so a host (the logoscore daemon) can accept tokens
the built-in issued-token scan doesn't know — specifically operator-issued named
tokens validated against a persistent store — with per-token expiry and
local_only enforced against the transport the call arrived on.
- ModuleProxy::setTokenValidator(std::function<bool(token, transportProtocol)>).
isAuthorized() consults it ONLY after the existing m_tokens + TokenManager
scan fails, so installing a validator is purely additive: it can grant, never
revoke, access the built-in path already allows. Empty (default) = today's
behaviour exactly.
- callRemoteMethod() gains a defaulted `transportProtocol` ("local"). The QtRO
local path (RemoteTransportHost) uses the default; PlainTransportHost::onCall
passes the real wire ("tcp" | "tcp_ssl", fail-closed to non-local on an
unexpected protocol) so a local_only token presented over the network is
rejected. One ModuleProxy is shared across a provider's transports, so the
transport can't be inferred — it must be threaded per call, which the defaulted
arg does without changing the QtRO replica's 3-arg call.
The daemon backs the validator with TokenStore::lookupByToken; other modules
keep the default (no validator) and are unaffected.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* review: split callRemoteMethod into explicit 3-arg + 4-arg overloads; include <utility>
Addressing review feedback:
- Replace the defaulted transportProtocol argument with two explicit Q_INVOKABLE
overloads. The Qt meta-object system matches methods by their full parameter
list and doesn't apply C++ default arguments, so the QtRO/local 3-arg call
must remain a real 3-arg method rather than relying on moc's reduced-arity
generation. The 3-arg form forwards to the transport-aware 4-arg form with
"local"; PlainTransportHost keeps calling the 4-arg form with the real wire.
- Include <utility> explicitly in module_proxy.h for std::move rather than
relying on an indirect include.
Full protocol suite green (160/160).
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
254 lines
10 KiB
C++
254 lines
10 KiB
C++
#include "module_proxy.h"
|
|
#include "logos_provider_interface.h"
|
|
#include "token_manager.h"
|
|
#include "logos_rpc_status.h"
|
|
#include <QDebug>
|
|
#include <QByteArray>
|
|
#include <QJsonObject>
|
|
#include <QJsonValue>
|
|
#include <algorithm>
|
|
|
|
ModuleProxy::ModuleProxy(LogosProviderObject* provider, QObject* parent)
|
|
: QObject(parent)
|
|
, m_provider(provider)
|
|
{
|
|
if (m_provider) {
|
|
m_provider->setEventListener([this](const QString& eventName, const QVariantList& data) {
|
|
qDebug() << "[LogosProviderObject] ModuleProxy: forwarding event" << eventName << "as Qt signal";
|
|
// Events may be fired from any thread (e.g. a module's worker/FFI
|
|
// thread), but this object is the QtRemoteObjects source and must be
|
|
// driven from its own thread. Emitting directly from a foreign
|
|
// thread runs QtRO's source serialization there, racing the source
|
|
// socket against a reply being sent from the source thread, which
|
|
// can silently drop the reply.
|
|
//
|
|
// We *always* queue the emission to this object's own thread, never
|
|
// emit inline — even for a same-thread caller. A module that emits an
|
|
// event from inside an async-call-completion callback (e.g. a
|
|
// gather/fan-out completion firing `balances_updated` from within the
|
|
// `__logos_call_complete__` reply dispatch) is on the source thread,
|
|
// so an AutoConnection would run QtRO's source serialization for the
|
|
// event *re-entrantly*, while a reply is still being marshalled on the
|
|
// same stack — corrupting the source and crashing (SIGSEGV). A queued
|
|
// connection defers the emit to the next event-loop turn, after the
|
|
// reply has been sent, so events and replies stay serialized on the
|
|
// thread QtRO owns. Passing `this` as the context also cancels a
|
|
// queued emission if this object is destroyed first.
|
|
QMetaObject::invokeMethod(this, [this, eventName, data]() {
|
|
emit eventResponse(eventName, data);
|
|
}, Qt::QueuedConnection);
|
|
});
|
|
qDebug() << "[LogosProviderObject] ModuleProxy: created, wrapping LogosProviderObject"
|
|
<< m_provider->providerName();
|
|
}
|
|
}
|
|
|
|
ModuleProxy::~ModuleProxy()
|
|
{
|
|
qDebug() << "ModuleProxy: destroyed";
|
|
}
|
|
|
|
bool ModuleProxy::saveToken(const QString& from_module_name, const QString& token)
|
|
{
|
|
if (from_module_name.isEmpty()) {
|
|
qWarning() << "ModuleProxy: Cannot save token with empty module name";
|
|
return false;
|
|
}
|
|
if (token.isEmpty()) {
|
|
qWarning() << "ModuleProxy: Cannot save empty token for module:" << from_module_name;
|
|
return false;
|
|
}
|
|
|
|
m_tokens[from_module_name] = token;
|
|
qDebug() << "ModuleProxy: Token saved for module:" << from_module_name;
|
|
return true;
|
|
}
|
|
|
|
void ModuleProxy::setTokenValidator(TokenValidator validator)
|
|
{
|
|
m_validator = std::move(validator);
|
|
}
|
|
|
|
// QtRO / local path: RemoteTransportHost only ever serves a local socket, so
|
|
// the wire is "local". Forwards to the transport-aware overload.
|
|
QVariant ModuleProxy::callRemoteMethod(const QString& authToken, const QString& methodName, const QVariantList& args)
|
|
{
|
|
return callRemoteMethod(authToken, methodName, args, QStringLiteral("local"));
|
|
}
|
|
|
|
QVariant ModuleProxy::callRemoteMethod(const QString& authToken, const QString& methodName, const QVariantList& args, const QString& transportProtocol)
|
|
{
|
|
if (!m_provider) {
|
|
qWarning() << "ModuleProxy: Cannot call method on null provider:" << methodName;
|
|
return QVariant();
|
|
}
|
|
|
|
if (methodName.isEmpty()) {
|
|
qWarning() << "ModuleProxy: Method name cannot be empty";
|
|
return QVariant();
|
|
}
|
|
|
|
if (methodName == "getPluginMethods" && args.isEmpty()) {
|
|
return QVariant(getPluginMethods());
|
|
}
|
|
|
|
if (methodName == "getPluginEvents" && args.isEmpty()) {
|
|
return QVariant(getPluginEvents());
|
|
}
|
|
|
|
if (methodName == "getPluginInterface" && args.isEmpty()) {
|
|
return QVariant(getPluginInterface());
|
|
}
|
|
// NOTE: the three getPlugin* introspection calls above intentionally stay
|
|
// ungated. They expose only the method/event signatures (no business logic
|
|
// or state) and are needed before any token exists — a caller discovers a
|
|
// module's interface as part of the connection handshake, ahead of the
|
|
// capability_module token exchange. Everything past this point is a real
|
|
// business-method dispatch and MUST be authorized.
|
|
|
|
if (!isAuthorized(authToken, transportProtocol)) {
|
|
qWarning() << "ModuleProxy: rejecting unauthorized call to" << methodName
|
|
<< "- auth token not recognized";
|
|
// Structured rejection instead of a bare QVariant() so a NEW consumer can
|
|
// drop its stale token and re-exchange (see logos_rpc_status.h /
|
|
// LogosAPIClient::invokeRemoteMethod). OLD consumers convert this to the
|
|
// same empty/default they already got from QVariant(), so it's backward
|
|
// compatible.
|
|
return logos::makeUnauthorizedSentinel();
|
|
}
|
|
|
|
// SECURITY: never log call arguments — they routinely carry secrets
|
|
// (mnemonics, passwords, tokens, key material). Log only the method name and
|
|
// the argument count, matching the other transport call sites.
|
|
qDebug() << "ModuleProxy: callRemoteMethod" << methodName << "args:" << args.size();
|
|
return m_provider->callMethod(methodName, args);
|
|
}
|
|
|
|
namespace {
|
|
// note: this is to ensure comparison is constant time to prevent timing attacks
|
|
// Length-independent constant-time comparison of two tokens. Returns true only
|
|
// when both byte sequences are identical. We compare over the longer of the two
|
|
// lengths (folding any length difference into the result) so the running time
|
|
// does not reveal a correct prefix or the secret's length.
|
|
bool constantTimeEquals(const QString& a, const QString& b)
|
|
{
|
|
const QByteArray ba = a.toUtf8();
|
|
const QByteArray bb = b.toUtf8();
|
|
const int n = std::max(ba.size(), bb.size());
|
|
// A different length is a mismatch, but keep scanning to stay constant-time.
|
|
int diff = ba.size() ^ bb.size();
|
|
for (int i = 0; i < n; ++i) {
|
|
const unsigned char ca = i < ba.size() ? static_cast<unsigned char>(ba[i]) : 0;
|
|
const unsigned char cb = i < bb.size() ? static_cast<unsigned char>(bb[i]) : 0;
|
|
diff |= (ca ^ cb);
|
|
}
|
|
return diff == 0;
|
|
}
|
|
} // namespace
|
|
|
|
bool ModuleProxy::informModuleToken(const QString& authToken, const QString& moduleName, const QString& token)
|
|
{
|
|
if (!m_provider) {
|
|
qWarning() << "ModuleProxy: Cannot inform token on null provider";
|
|
return false;
|
|
}
|
|
|
|
const QString coreToken = TokenManager::instance().getToken(QStringLiteral("core"));
|
|
const QString capToken = TokenManager::instance().getToken(QStringLiteral("capability_module"));
|
|
const bool callerIsTrusted =
|
|
(!coreToken.isEmpty() && constantTimeEquals(authToken, coreToken)) ||
|
|
(!capToken.isEmpty() && constantTimeEquals(authToken, capToken));
|
|
if (authToken.isEmpty() || !callerIsTrusted) {
|
|
qWarning() << "ModuleProxy: rejecting informModuleToken for" << moduleName
|
|
<< "- caller is not the trusted core/capability_module channel";
|
|
return false;
|
|
}
|
|
|
|
if (moduleName.isEmpty()) {
|
|
qWarning() << "ModuleProxy: Cannot inform token with empty module name";
|
|
return false;
|
|
}
|
|
if (token.isEmpty()) {
|
|
qWarning() << "ModuleProxy: Cannot inform empty token for module:" << moduleName;
|
|
return false;
|
|
}
|
|
|
|
return m_provider->informModuleToken(moduleName, token);
|
|
}
|
|
|
|
bool ModuleProxy::isAuthorized(const QString& authToken, const QString& transportProtocol) const
|
|
{
|
|
// Fail closed: an empty token is never valid, even if some empty value
|
|
// somehow ended up in a token store.
|
|
if (authToken.isEmpty()) {
|
|
return false;
|
|
}
|
|
|
|
// A token is valid only if THIS module actually issued it to some caller.
|
|
// Two stores hold issued tokens:
|
|
// * m_tokens — legacy per-proxy store (LogosAPIProvider::saveToken)
|
|
// * TokenManager — the capability-flow store that informModuleToken
|
|
// writes when capability_module mints a token for a
|
|
// (caller, target) pair.
|
|
// We scan every issued token with a constant-time compare and never early
|
|
// out, so neither a match position nor the number of issued tokens leaks
|
|
// through timing.
|
|
bool authorized = false;
|
|
for (auto it = m_tokens.constBegin(); it != m_tokens.constEnd(); ++it) {
|
|
authorized |= constantTimeEquals(authToken, it.value());
|
|
}
|
|
for (const QString& key : TokenManager::instance().getTokenKeys()) {
|
|
authorized |= constantTimeEquals(authToken, TokenManager::instance().getToken(key));
|
|
}
|
|
if (authorized) {
|
|
return true;
|
|
}
|
|
|
|
// Not one of our own issued tokens — give a host-installed validator the
|
|
// chance to accept it for this transport. This is how operator-issued named
|
|
// tokens (validated against the daemon's TokenStore, with expiry and
|
|
// local_only enforced by `transportProtocol`) authorize a call without
|
|
// being pre-registered in the in-process stores above.
|
|
if (m_validator) {
|
|
return m_validator(authToken, transportProtocol);
|
|
}
|
|
return false;
|
|
}
|
|
|
|
namespace {
|
|
// getMethods() returns the module's full interface — both methods and events,
|
|
// each tagged with a "type" ("method"/"event"). Split it back out. An entry
|
|
// with no "type" counts as a method, so modules built against the pre-events
|
|
// SDK (whose getMethods() contains no events) report zero events, not a crash.
|
|
QJsonArray filterInterface(const QJsonArray& interface, bool keepEvents)
|
|
{
|
|
QJsonArray out;
|
|
for (const QJsonValue& v : interface) {
|
|
const bool isEvent =
|
|
v.toObject().value(QStringLiteral("type")).toString() == QStringLiteral("event");
|
|
if (isEvent == keepEvents) out.append(v);
|
|
}
|
|
return out;
|
|
}
|
|
} // namespace
|
|
|
|
QJsonArray ModuleProxy::getPluginInterface()
|
|
{
|
|
if (!m_provider) return QJsonArray();
|
|
|
|
qDebug() << "[LogosProviderObject] ModuleProxy: calling LogosProviderObject::getMethods()";
|
|
return m_provider->getMethods();
|
|
}
|
|
|
|
QJsonArray ModuleProxy::getPluginMethods()
|
|
{
|
|
return filterInterface(getPluginInterface(), /*keepEvents=*/false);
|
|
}
|
|
|
|
QJsonArray ModuleProxy::getPluginEvents()
|
|
{
|
|
return filterInterface(getPluginInterface(), /*keepEvents=*/true);
|
|
}
|
|
|
|
#include "moc_module_proxy.cpp"
|