mirror of
https://github.com/logos-co/logos-protocol.git
synced 2026-08-27 20:11:07 +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
7.6 KiB
C++
254 lines
7.6 KiB
C++
// Unit tests for the Qt-free socket-access + stale-socket-reaper helpers
|
|
// (cpp/logos_socket_paths.{h,cpp}). These back the multi-user local transport:
|
|
// applySocketPerms makes a bound socket group-connectable, and
|
|
// isSocketDead/reapStaleSockets clean up the files a hard-killed process leaves
|
|
// behind without ever touching a live socket or an unrelated regular file.
|
|
|
|
#include "logos_socket_paths.h"
|
|
|
|
#include <gtest/gtest.h>
|
|
|
|
#include <cerrno>
|
|
#include <cstdlib>
|
|
#include <cstring>
|
|
#include <string>
|
|
|
|
#include <fcntl.h>
|
|
#include <sys/socket.h>
|
|
#include <sys/stat.h>
|
|
#include <sys/types.h>
|
|
#include <sys/un.h>
|
|
#include <unistd.h>
|
|
|
|
namespace {
|
|
|
|
// A short, unique path under $TMPDIR (fallback /tmp). The AF_UNIX sun_path cap
|
|
// (~104 bytes) means we can't use a deep nix build dir, so keep the tag short.
|
|
std::string sockPath(const char* tag)
|
|
{
|
|
const char* tmp = std::getenv("TMPDIR");
|
|
std::string dir = (tmp && *tmp) ? tmp : "/tmp";
|
|
if (!dir.empty() && dir.back() == '/') dir.pop_back();
|
|
return dir + "/lsp_" + tag + "_" + std::to_string(::getpid()) + ".sock";
|
|
}
|
|
|
|
// bind() a listening AF_UNIX socket at `path`; returns the fd (>=0) or -1.
|
|
int bindListening(const std::string& path)
|
|
{
|
|
::unlink(path.c_str());
|
|
int fd = ::socket(AF_UNIX, SOCK_STREAM, 0);
|
|
if (fd < 0) return -1;
|
|
struct sockaddr_un addr;
|
|
std::memset(&addr, 0, sizeof(addr));
|
|
addr.sun_family = AF_UNIX;
|
|
if (path.size() >= sizeof(addr.sun_path)) { ::close(fd); return -1; }
|
|
std::memcpy(addr.sun_path, path.c_str(), path.size());
|
|
if (::bind(fd, reinterpret_cast<sockaddr*>(&addr), sizeof(addr)) != 0) {
|
|
::close(fd);
|
|
return -1;
|
|
}
|
|
if (::listen(fd, 4) != 0) { ::close(fd); ::unlink(path.c_str()); return -1; }
|
|
return fd;
|
|
}
|
|
|
|
struct EnvGuard {
|
|
const char* name;
|
|
std::string prev;
|
|
bool had;
|
|
EnvGuard(const char* n, const char* v) : name(n) {
|
|
const char* p = std::getenv(n);
|
|
had = p != nullptr;
|
|
if (had) prev = p;
|
|
if (v) ::setenv(n, v, 1); else ::unsetenv(n);
|
|
}
|
|
~EnvGuard() {
|
|
if (had) ::setenv(name, prev.c_str(), 1); else ::unsetenv(name);
|
|
}
|
|
};
|
|
|
|
} // namespace
|
|
|
|
// applySocketPerms with the mode env var set chmods the socket to that mode.
|
|
TEST(SocketPaths, AppliesModeFromEnv)
|
|
{
|
|
const std::string path = sockPath("mode");
|
|
int fd = bindListening(path);
|
|
ASSERT_GE(fd, 0);
|
|
|
|
{
|
|
EnvGuard mode("LOGOS_SOCKET_MODE", "0660");
|
|
EnvGuard grp("LOGOS_SOCKET_GROUP", nullptr);
|
|
std::string err;
|
|
EXPECT_TRUE(logos::applySocketPerms(path, &err)) << err;
|
|
}
|
|
|
|
struct stat st;
|
|
ASSERT_EQ(::lstat(path.c_str(), &st), 0);
|
|
EXPECT_EQ(st.st_mode & 07777, 0660u);
|
|
|
|
::close(fd);
|
|
::unlink(path.c_str());
|
|
}
|
|
|
|
// chgrp to our own effective gid always succeeds (we are a member), so it is a
|
|
// stable, sandbox-safe way to prove the chown path runs.
|
|
TEST(SocketPaths, AppliesGroupFromEnv)
|
|
{
|
|
const std::string path = sockPath("grp");
|
|
int fd = bindListening(path);
|
|
ASSERT_GE(fd, 0);
|
|
|
|
const gid_t gid = ::getegid();
|
|
{
|
|
EnvGuard grp("LOGOS_SOCKET_GROUP", std::to_string(gid).c_str());
|
|
EnvGuard mode("LOGOS_SOCKET_MODE", "0660");
|
|
std::string err;
|
|
EXPECT_TRUE(logos::applySocketPerms(path, &err)) << err;
|
|
}
|
|
|
|
struct stat st;
|
|
ASSERT_EQ(::lstat(path.c_str(), &st), 0);
|
|
EXPECT_EQ(st.st_gid, gid);
|
|
|
|
::close(fd);
|
|
::unlink(path.c_str());
|
|
}
|
|
|
|
// No env vars set -> no-op success, socket keeps its default mode.
|
|
TEST(SocketPaths, NoEnvIsNoOp)
|
|
{
|
|
const std::string path = sockPath("noop");
|
|
int fd = bindListening(path);
|
|
ASSERT_GE(fd, 0);
|
|
|
|
EnvGuard grp("LOGOS_SOCKET_GROUP", nullptr);
|
|
EnvGuard mode("LOGOS_SOCKET_MODE", nullptr);
|
|
EXPECT_TRUE(logos::applySocketPerms(path));
|
|
|
|
::close(fd);
|
|
::unlink(path.c_str());
|
|
}
|
|
|
|
// With the policy set, a path that isn't a socket we own is refused rather than
|
|
// chmod'd — guards against a malformed URL producing a stray path.
|
|
TEST(SocketPaths, RefusesNonSocketPath)
|
|
{
|
|
const std::string path = sockPath("notsock");
|
|
::unlink(path.c_str());
|
|
int fd = ::open(path.c_str(), O_CREAT | O_WRONLY, 0644);
|
|
ASSERT_GE(fd, 0);
|
|
::close(fd);
|
|
|
|
EnvGuard grp("LOGOS_SOCKET_GROUP", nullptr);
|
|
EnvGuard mode("LOGOS_SOCKET_MODE", "0660");
|
|
std::string err;
|
|
EXPECT_FALSE(logos::applySocketPerms(path, &err));
|
|
EXPECT_FALSE(err.empty());
|
|
|
|
// The file's mode is unchanged (still 0644, not 0660).
|
|
struct stat st;
|
|
ASSERT_EQ(::lstat(path.c_str(), &st), 0);
|
|
EXPECT_EQ(st.st_mode & 07777, 0644u);
|
|
::unlink(path.c_str());
|
|
}
|
|
|
|
// A malformed mode is rejected (returns false) and changes nothing.
|
|
TEST(SocketPaths, RejectsBadMode)
|
|
{
|
|
const std::string path = sockPath("badmode");
|
|
int fd = bindListening(path);
|
|
ASSERT_GE(fd, 0);
|
|
|
|
EnvGuard grp("LOGOS_SOCKET_GROUP", nullptr);
|
|
EnvGuard mode("LOGOS_SOCKET_MODE", "not-octal");
|
|
std::string err;
|
|
EXPECT_FALSE(logos::applySocketPerms(path, &err));
|
|
EXPECT_FALSE(err.empty());
|
|
|
|
::close(fd);
|
|
::unlink(path.c_str());
|
|
}
|
|
|
|
// A socket with a live listener is NOT dead.
|
|
TEST(SocketPaths, LiveSocketIsNotDead)
|
|
{
|
|
const std::string path = sockPath("live");
|
|
int fd = bindListening(path);
|
|
ASSERT_GE(fd, 0);
|
|
|
|
EXPECT_FALSE(logos::isSocketDead(path));
|
|
|
|
::close(fd);
|
|
::unlink(path.c_str());
|
|
}
|
|
|
|
// After the listener closes, the leftover socket file IS dead (connect ->
|
|
// ECONNREFUSED). This is exactly the leaked-socket case.
|
|
TEST(SocketPaths, ClosedSocketIsDead)
|
|
{
|
|
const std::string path = sockPath("dead");
|
|
int fd = bindListening(path);
|
|
ASSERT_GE(fd, 0);
|
|
::close(fd); // file remains on disk, no listener
|
|
|
|
EXPECT_TRUE(logos::isSocketDead(path));
|
|
::unlink(path.c_str());
|
|
}
|
|
|
|
// A regular file that merely shares the naming prefix is never "dead" — the
|
|
// reaper must not delete a build artefact like logos_execution_zone-1.0.0.lgx.
|
|
TEST(SocketPaths, RegularFileIsNeverDead)
|
|
{
|
|
const std::string path = sockPath("regular");
|
|
::unlink(path.c_str());
|
|
int fd = ::open(path.c_str(), O_CREAT | O_WRONLY, 0644);
|
|
ASSERT_GE(fd, 0);
|
|
::write(fd, "not a socket", 12);
|
|
::close(fd);
|
|
|
|
EXPECT_FALSE(logos::isSocketDead(path));
|
|
::unlink(path.c_str());
|
|
}
|
|
|
|
// reapStaleSockets removes only the dead socket, keeps the live one, and never
|
|
// touches the regular file.
|
|
TEST(SocketPaths, ReaperRemovesOnlyDeadSockets)
|
|
{
|
|
const char* tmp = std::getenv("TMPDIR");
|
|
std::string dir = (tmp && *tmp) ? tmp : "/tmp";
|
|
if (!dir.empty() && dir.back() == '/') dir.pop_back();
|
|
|
|
const std::string prefix = "lspreap_" + std::to_string(::getpid()) + "_";
|
|
const std::string deadPath = dir + "/" + prefix + "dead.sock";
|
|
const std::string livePath = dir + "/" + prefix + "live.sock";
|
|
const std::string filePath = dir + "/" + prefix + "file";
|
|
|
|
int deadFd = bindListening(deadPath);
|
|
ASSERT_GE(deadFd, 0);
|
|
::close(deadFd); // leaves a stale socket file
|
|
|
|
int liveFd = bindListening(livePath);
|
|
ASSERT_GE(liveFd, 0); // keep listening
|
|
|
|
::unlink(filePath.c_str());
|
|
int rf = ::open(filePath.c_str(), O_CREAT | O_WRONLY, 0644);
|
|
ASSERT_GE(rf, 0);
|
|
::close(rf);
|
|
|
|
// An empty prefix is refused outright (would sweep every dead socket we
|
|
// own in dir) — nothing removed.
|
|
EXPECT_EQ(logos::reapStaleSockets(dir, ""), 0u);
|
|
|
|
const std::size_t removed = logos::reapStaleSockets(dir, prefix);
|
|
EXPECT_EQ(removed, 1u);
|
|
|
|
struct stat st;
|
|
EXPECT_NE(::lstat(deadPath.c_str(), &st), 0); // dead socket gone
|
|
EXPECT_EQ(::lstat(livePath.c_str(), &st), 0); // live socket kept
|
|
EXPECT_EQ(::lstat(filePath.c_str(), &st), 0); // regular file kept
|
|
|
|
::close(liveFd);
|
|
::unlink(livePath.c_str());
|
|
::unlink(filePath.c_str());
|
|
}
|