samiandClaude Sonnet 5
6d7c4f7bc4
Introduces the four rpc-layer seams docs/08-porting.md calls for this lane: platform::Wakeup (eventfd), platform::peer_of (SO_PEERCRED/struct ucred, same-UID check preserved unchanged), platform::acquire_instance_lock (abstract-namespace socket), platform::runtime_base_dir/data_base_dir (XDG lookups). Today's Linux code moves unchanged into daemon/src/rpc/platform/linux/; the seam headers carry no OS types and no #ifdef. No fifth interface for timerfd: EventLoop gains a portable add_timer() that folds the next deadline into poll()'s own timeout, replacing both timerfd instances in main.cpp — the loop already computes a deadline, so this needs no per-OS backend at all. Full suite 59/59 green; no #ifdef outside platform/linux/, no behaviour change. Co-Authored-By: Claude Sonnet 5 <[email protected]>
41 lines
1.5 KiB
C++
41 lines
1.5 KiB
C++
// The single-instance lock: isolated by runtime dir, not just by euid. This is the bug a
|
|
// leaked test veloxd exploited — one abstract-socket name per user meant every isolated
|
|
// instance (real daemon, tests, other lanes) fought over the same lock.
|
|
|
|
#include <unistd.h>
|
|
|
|
#include "check.hpp"
|
|
#include "rpc/platform/instance_lock.hpp"
|
|
|
|
using namespace velox::daemon::rpc::platform;
|
|
|
|
void run() {
|
|
// Two different runtime dirs: both acquire the lock independently.
|
|
{
|
|
const int a = acquire_instance_lock("/run/user/1000/velox-test-a");
|
|
const int b = acquire_instance_lock("/run/user/1000/velox-test-b");
|
|
CHECK(a >= 0);
|
|
CHECK(b >= 0);
|
|
if (a >= 0) ::close(a);
|
|
if (b >= 0) ::close(b);
|
|
}
|
|
|
|
// Same runtime dir: the second attempt is refused while the first still holds it.
|
|
{
|
|
const int first = acquire_instance_lock("/run/user/1000/velox-test-shared");
|
|
CHECK(first >= 0);
|
|
const int second = acquire_instance_lock("/run/user/1000/velox-test-shared");
|
|
CHECK(second < 0);
|
|
if (first >= 0) ::close(first);
|
|
if (second >= 0) ::close(second);
|
|
|
|
// Releasing (closing) the fd frees the abstract-namespace name immediately — a
|
|
// third attempt at the same dir succeeds once the first is gone.
|
|
const int third = acquire_instance_lock("/run/user/1000/velox-test-shared");
|
|
CHECK(third >= 0);
|
|
if (third >= 0) ::close(third);
|
|
}
|
|
}
|
|
|
|
TEST_MAIN()
|