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>
59 lines
3.0 KiB
C++
59 lines
3.0 KiB
C++
#ifndef LOGOS_SOCKET_PATHS_H
|
|
#define LOGOS_SOCKET_PATHS_H
|
|
|
|
#include <cstddef>
|
|
#include <string>
|
|
|
|
// Qt-free helpers for making the unix-domain sockets that back the local
|
|
// transport shareable across OS users, and for cleaning up the stale socket
|
|
// files that a hard-killed process leaves behind. Deliberately depends on
|
|
// nothing but POSIX + the C++ standard library so it can be used from both the
|
|
// Qt (qt_remote) and the Qt-free (plain) transport code paths, and unit-tested
|
|
// on its own.
|
|
//
|
|
// The policy is read from the environment so every process in a Logos node's
|
|
// tree — the daemon, the module subprocesses (logos_host), any child it spawns
|
|
// — applies the same rule to every socket it binds without the config having to
|
|
// be threaded through each layer. The daemon exports the vars once next to
|
|
// LOGOS_INSTANCE_ID and they propagate by inheritance.
|
|
namespace logos {
|
|
|
|
// Apply the socket-access policy to an already-bound unix-domain socket file at
|
|
// the ABSOLUTE path `absPath`. Reads two environment variables:
|
|
//
|
|
// LOGOS_SOCKET_GROUP — group name or numeric gid; the socket is chgrp'd to it.
|
|
// LOGOS_SOCKET_MODE — octal mode (e.g. "0660"); the socket is chmod'd to it.
|
|
//
|
|
// Order is chgrp-then-chmod so the transient state is never MORE permissive
|
|
// than the final target (a half-applied policy can only ever be too strict,
|
|
// never too loose — it opens nothing). An unset/empty var leaves that attribute
|
|
// untouched, so the default behaviour (no env) is a no-op and the socket keeps
|
|
// the kernel's `0777 & ~umask` mode. Connecting to an AF_UNIX socket needs
|
|
// WRITE permission on the file, so 0660 is what grants a group member access;
|
|
// the execute bit on a socket inode is inert.
|
|
//
|
|
// Returns true when every requested change succeeded (or nothing was
|
|
// requested). On failure returns false and, if `errOut` is non-null, writes a
|
|
// human-readable reason.
|
|
bool applySocketPerms(const std::string& absPath, std::string* errOut = nullptr);
|
|
|
|
// True iff `absPath` is a unix socket that WE own and whose listener is
|
|
// provably gone. Requires all of: the path exists and is a socket (S_ISSOCK),
|
|
// its owner is our effective uid, and a non-blocking connect() returns
|
|
// ECONNREFUSED or ENOENT. Any other outcome — a successful connect, EACCES,
|
|
// EAGAIN, ETIMEDOUT, a non-socket inode, a foreign owner — is treated as ALIVE
|
|
// and returns false. The predicate fails closed: it never reports a socket dead
|
|
// unless it is sure, so a reaper built on it cannot unlink a live endpoint or a
|
|
// regular file that merely shares the name.
|
|
bool isSocketDead(const std::string& absPath);
|
|
|
|
// Unlink every entry `<dir>/<prefix>...` for which isSocketDead() returns true.
|
|
// Regular files are never removed (only S_ISSOCK inodes pass the predicate), so
|
|
// a large build artefact that happens to match the prefix is safe. Returns the
|
|
// number of socket files actually unlinked. A missing/unreadable `dir` yields 0.
|
|
std::size_t reapStaleSockets(const std::string& dir, const std::string& prefix);
|
|
|
|
} // namespace logos
|
|
|
|
#endif // LOGOS_SOCKET_PATHS_H
|