The extension's fallback transport (docs/05 §4). veloxd now also listens on 127.0.0.1, first free port in 52000-52016, and writes it to <runtime>/ws.port (0600). - rpc/ws_frame — RFC 6455 frame codec. Incremental; reassembles continuation frames; enforces "client frames MUST be masked" (§5.1); caps a reassembled message at 8 MiB. This is the attacker-adjacent parser, so it has its own test table. - rpc/ws_handshake — HTTP upgrade parse, Sec-WebSocket-Accept (SHA-1 + base64 via libcrypto), and the two non-negotiable checks: an Origin header must be present and must be moz-extension:// (a page cannot pair). Version must be 13. - rpc/ws_server — per-connection Handshake -> Open state machine on the shared EventLoop. Token gate: session.pair mints a token behind the approver + rate limiter; session.hello must present a valid one; every other method is -32002 until authed. Privileged methods are refused -32003 by the generated dispatch(). Ping -> Pong; Close echoed. session.hello major-version mismatch -> -32001. - rpc/pairing — PairingApprover interface + EnvAutoApprover dev stub (approves iff VELOX_PAIR_AUTO=1); PairingRateLimiter (5 failures / 60 s per origin, then 60 s lockout -> -32014, survives reconnect); a four-digit code generator. - store/pairings — the pairings table: create() returns the plaintext token once and stores only its SHA-256; find_active_by_token, touch, revoke, list_active. - util/crypto — sha1 / sha256_hex / base64 / random_token over libcrypto. - store/sqlite — pin the DB file (and -wal/-shm) to 0600. - runtime_dir — resolve_data_dir() for $XDG_DATA_HOME/velox (velox.db). - main.cpp — opens + migrates velox.db, starts both transports; a WS bind failure is logged, not fatal (capture must fail open, the Unix socket still serves the GUI/CLI). Real gap, flagged not hidden: the pairing prompt is EnvAutoApprover for now — a GUI dialog / desktop notification is build step 7. Pairing needs VELOX_PAIR_AUTO=1 until then. Tests (ASan+UBSan and TSan clean): veloxd.ws_frame (codec + handshake vectors incl. the RFC 6455 §1.3 accept sample), veloxd.pairings (token create/find/revoke, hash-not-token, rate-limit window + lockout + per-origin isolation + success reset), veloxd.ws_server (full flow: 101 handshake, -32002 gate, deny-then-approve pairing, hello-with-token, -32003 privileged refusal, real download.list). 27 daemon/cli tests green; full tree green. Co-Authored-By: Claude Sonnet 5 <[email protected]> Claude-Session: https://claude.ai/code/session_01Upd9WhG9oppieig5nRDLig
54 lines
1.6 KiB
C++
54 lines
1.6 KiB
C++
#pragma once
|
|
|
|
// Access to the `pairings` table: the WebSocket transport's revocable per-install tokens
|
|
// (docs/05 §4). The plaintext token is returned by create() exactly once and never
|
|
// stored — only its SHA-256 (CLAUDE.md §4).
|
|
|
|
#include <optional>
|
|
#include <string>
|
|
#include <string_view>
|
|
#include <vector>
|
|
|
|
#include "store/sqlite.hpp"
|
|
|
|
namespace velox::daemon::store {
|
|
|
|
struct Pairing {
|
|
std::string pairing_id;
|
|
std::string origin;
|
|
std::string label;
|
|
std::string created_at;
|
|
std::optional<std::string> last_seen_at;
|
|
std::optional<std::string> revoked_at;
|
|
};
|
|
|
|
class Pairings {
|
|
public:
|
|
explicit Pairings(Db& db) : db_(db) {}
|
|
|
|
struct Created {
|
|
std::string pairing_id;
|
|
std::string token; // plaintext — send once, to the client, then forget
|
|
};
|
|
|
|
// Mint a token for `origin`, store its hash + `label`, timestamp `now_iso`.
|
|
DbResult<Created> create(std::string_view origin, std::string_view label,
|
|
std::string_view now_iso);
|
|
|
|
// The active (non-revoked) pairing whose token hashes to this value, if any.
|
|
DbResult<std::optional<Pairing>> find_active_by_token(std::string_view plaintext_token);
|
|
|
|
// Bump last_seen_at. Called on every authenticated connect.
|
|
DbResult<void> touch(std::string_view pairing_id, std::string_view now_iso);
|
|
|
|
// Mark revoked. Returns false if there was no such active pairing.
|
|
DbResult<bool> revoke(std::string_view pairing_id, std::string_view now_iso);
|
|
|
|
DbResult<std::vector<Pairing>> list_active();
|
|
|
|
private:
|
|
Db& db_;
|
|
};
|
|
|
|
} // namespace velox::daemon::store
|