mirror of
https://gh-proxy.org/https://github.com/klinsmaya/multica.git
synced 2026-11-08 09:26:50 +08:00
* fix(daemon): enforce runtime ownership on daemon routes (MUL-8154) /api/daemon/* accepts any workspace member's PAT/JWT, and authorization only checked workspace membership. Any member could claim another member's tasks (receiving the agent's custom_env, MCP config and an owner-scoped task token), write task results/messages, and take a runtime over by re-registering its daemon_id. - Runtime-level check on every runtime/task daemon route, HTTP heartbeat, deregister, batch claim (and so the WS claim RPC) and the WS handshake: user credentials must own the runtime (NULL owner fails closed); daemon tokens must match a non-empty runtime daemon_id. - Register: pre-check that every existing row on the daemon_id belongs to the caller, plus a required_owner_id fence in both upserts (incl. the failed-profile path) so a concurrent registration cannot win the row. Daemon-token registration keeps the existing owner. - Legacy merge: only for user-credential registrations, and only when the caller owns both rows, verified on the FOR UPDATE-locked rows. - Tasks without a runtime are not writable through daemon routes; status stays readable. - GetTaskStatus / WS lease queries carry runtime owner/daemon so the hot paths keep one round trip. Co-authored-by: multica-agent <[email protected]> * test(daemon): authenticate fixtures as the runtime owner (MUL-8154) Most handler tests drove daemon routes with a daemon token whose daemon_id did not match the fixture runtime, relying on the workspace-wide token scope this fix removes. They now authenticate the way real daemons do, with the runtime owner's user credential (newOwnerDaemonRequest). Tests about daemon token scoping keep mdt_ and get fixtures with a matching daemon_id; the ownerless-runtime tests also assert that a user credential is refused. Co-authored-by: multica-agent <[email protected]> * fix(daemon): serialize registration per daemon and keep Qoder WS claims working (MUL-8154) Review of #9423: - P1: the owner pre-check and the per-provider/profile upserts hit different conflict keys, so two members registering different providers of the same daemon could both pass the pre-check and both insert, leaving one daemon with two owners (and a daemon token for either runtime reaching the other's). Registration now runs the pre-check and every runtime write in one transaction under a pg_advisory_xact_lock on (workspace_id, daemon_id), on a single connection so queued registrations cannot starve the holder. Legacy merges, analytics and the register event run after commit; failed-profile records use savepoints so they stay best-effort. - P2: the Qoder revocation check read the Authorization header, which the WS RPC bridge's in-process request does not carry, so valid Qoder WS claims silently returned nothing. DaemonAuth now records the mdt_ token hash in the request context, the WS identity keeps it, the RPC bridge re-attaches it, and the check validates that hash on every call (revocation still applies to an open connection). - Regression tests for cross-provider and provider+profile concurrent registration, and for valid/revoked Qoder credentials over WS RPC. Co-authored-by: multica-agent <[email protected]> * fix(daemon): bind daemon tokens to the runtime owner they were issued for (MUL-8154) Second review of #9423: a daemon_id can be re-registered by another member after its runtimes are deleted, and a daemon token was bound only to (workspace, daemon_id), so the previous owner's Remote MCP token reached the new owner's runtime (heartbeat, claim, owner-scoped task token). - daemon_token.owner_id (migration 588). Remote MCP tokens are bound to the locked runtime owner inside FinalizeTaskClaim; live tokens are backfilled only where their daemon has exactly one owner. - DaemonAuth carries the owner binding (DB and cache; cache key bumped to v2 so pre-upgrade entries are never read), the WS identity keeps it and the RPC bridge replays it. - Daemon-token authorization now also requires token owner == runtime owner. Qoder-managed tokens stay unbound (governed by cloud_agent_connection), and user credentials can no longer register the reserved qoder-managed-* ids. - Tests: the reuse lifecycle over HTTP, a new WS handshake and an already open WS connection; the reserved daemon_id; the concurrency barrier now hooks the registration transaction (TxStarter) so the interleaving is real. Co-authored-by: multica-agent <[email protected]> * fix(daemon): owner-bind daemon-token registration; drop unsafe token backfill (MUL-8154) Third review of #9423: - Migration 588 no longer backfills daemon_token.owner_id from the daemon's current owner: that owner may be a later re-registrant, which re-bound the previous owner's live token to them. Existing non-Qoder tokens stay NULL and are refused (24h Remote MCP credentials, re-issued on the next claim). - owner_id is a plain UUID column, no foreign key / cascade (AGENTS.md). - Register via a non-Qoder daemon token now uses the token's owner for the in-transaction pre-check and the SQL owner fence, and refuses unbound tokens. Qoder keeps its connection-based check; daemon tokens still never trigger legacy merges. - Tests: an old owner's bound token and an unbound legacy token can neither register over nor heartbeat the replacement owner's runtime. Co-authored-by: multica-agent <[email protected]> * fix(daemon): grant the Qoder registration exemption only with a live connection (MUL-8154) Fourth review of #9423: register skipped the token owner binding for any qoder-managed-* daemon token, but checked the Qoder connection only when the body declared a qoder_cloud runtime. A pre-upgrade Remote MCP token under that prefix (no owner, no connection) could register type=claude and rewrite another member's runtime. Register now verifies the token against a live cloud_agent_connection before anything else whenever the token is in the Qoder namespace, regardless of the declared runtimes, and restricts that namespace to the bridge's own shape: a built-in qoder_cloud runtime, no custom profiles, no failed_profiles. Test covers built-in, custom-profile, failed-profiles-only and qoder_cloud bodies with an unconnected token, plus the connected token's allowed and refused shapes. Co-authored-by: multica-agent <[email protected]> --------- Co-authored-by: multica-eve <[email protected]> Co-authored-by: multica-agent <[email protected]>
271 lines
11 KiB
Go
271 lines
11 KiB
Go
package handler
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"strings"
|
|
"testing"
|
|
)
|
|
|
|
// patchRuntimeCustomName is a small helper that PATCHes /api/runtimes/:id with
|
|
// a custom_name body as the given actor and returns the recorder.
|
|
func patchRuntimeCustomName(actorID, runtimeID string, body map[string]any) *httptest.ResponseRecorder {
|
|
w := httptest.NewRecorder()
|
|
req := newRequestAs(actorID, http.MethodPatch, "/api/runtimes/"+runtimeID, body)
|
|
req = withURLParam(req, "runtimeId", runtimeID)
|
|
testHandler.UpdateAgentRuntime(w, req)
|
|
return w
|
|
}
|
|
|
|
// TestUpdateAgentRuntime_CustomNamePatchApplies covers the single-runtime
|
|
// rename path (MUL-4217): a PATCH carrying custom_name sets it, an empty
|
|
// string clears it back to NULL, and an over-long value is rejected with 400.
|
|
func TestUpdateAgentRuntime_CustomNamePatchApplies(t *testing.T) {
|
|
if testHandler == nil {
|
|
t.Skip("database not available")
|
|
}
|
|
|
|
runtimeID, runtimeOwnerID, plainMemberID := runtimeVisibilityFixture(t)
|
|
|
|
// Owner sets a custom name.
|
|
w := patchRuntimeCustomName(runtimeOwnerID, runtimeID, map[string]any{"custom_name": " Prod Box "})
|
|
if w.Code != http.StatusOK {
|
|
t.Fatalf("PATCH custom_name: expected 200, got %d: %s", w.Code, w.Body.String())
|
|
}
|
|
var resp AgentRuntimeResponse
|
|
if err := json.NewDecoder(w.Body).Decode(&resp); err != nil {
|
|
t.Fatalf("decode response: %v", err)
|
|
}
|
|
if resp.CustomName == nil || *resp.CustomName != "Prod Box" {
|
|
t.Fatalf("custom_name: got %v, want trimmed \"Prod Box\"", resp.CustomName)
|
|
}
|
|
// The raw daemon name is preserved alongside the override.
|
|
if resp.Name != "Visibility Test Runtime" {
|
|
t.Fatalf("name should be untouched by rename: got %q", resp.Name)
|
|
}
|
|
|
|
// Empty string clears the override back to NULL.
|
|
w = patchRuntimeCustomName(runtimeOwnerID, runtimeID, map[string]any{"custom_name": " "})
|
|
if w.Code != http.StatusOK {
|
|
t.Fatalf("PATCH clear custom_name: expected 200, got %d: %s", w.Code, w.Body.String())
|
|
}
|
|
resp = AgentRuntimeResponse{}
|
|
if err := json.NewDecoder(w.Body).Decode(&resp); err != nil {
|
|
t.Fatalf("decode response: %v", err)
|
|
}
|
|
if resp.CustomName != nil {
|
|
t.Fatalf("custom_name should be cleared to null, got %q", *resp.CustomName)
|
|
}
|
|
|
|
// Over-long name is rejected before any mutation.
|
|
w = patchRuntimeCustomName(runtimeOwnerID, runtimeID, map[string]any{"custom_name": strings.Repeat("x", maxRuntimeCustomNameLen+1)})
|
|
if w.Code != http.StatusBadRequest {
|
|
t.Fatalf("PATCH over-long custom_name: expected 400, got %d: %s", w.Code, w.Body.String())
|
|
}
|
|
|
|
// Plain member cannot rename someone else's runtime.
|
|
w = patchRuntimeCustomName(plainMemberID, runtimeID, map[string]any{"custom_name": "hijack"})
|
|
if w.Code != http.StatusForbidden {
|
|
t.Fatalf("PATCH custom_name as plain member: expected 403, got %d: %s", w.Code, w.Body.String())
|
|
}
|
|
}
|
|
|
|
// TestUpdateAgentRuntime_CustomNameMachineFanout verifies that
|
|
// apply_to_machine renames every runtime sharing a daemon_id, so a machine
|
|
// hosting several provider runtimes can be labelled in one action.
|
|
func TestUpdateAgentRuntime_CustomNameMachineFanout(t *testing.T) {
|
|
if testHandler == nil {
|
|
t.Skip("database not available")
|
|
}
|
|
|
|
_, runtimeOwnerID, _ := runtimeVisibilityFixture(t)
|
|
ctx := context.Background()
|
|
|
|
const daemonID = "custom-name-test-daemon"
|
|
makeRuntime := func(provider string) string {
|
|
var id string
|
|
if err := testPool.QueryRow(ctx, `
|
|
INSERT INTO agent_runtime (
|
|
workspace_id, daemon_id, name, runtime_mode, provider, status,
|
|
device_info, metadata, owner_id, visibility, last_seen_at
|
|
)
|
|
VALUES ($1, $2, $3, 'local', $4, 'online', 'host', '{}'::jsonb, $5, 'private', now())
|
|
RETURNING id
|
|
`, testWorkspaceID, daemonID, provider+" (host)", provider, runtimeOwnerID).Scan(&id); err != nil {
|
|
t.Fatalf("create runtime %s: %v", provider, err)
|
|
}
|
|
t.Cleanup(func() {
|
|
testPool.Exec(context.Background(), `DELETE FROM agent_runtime WHERE id = $1`, id)
|
|
})
|
|
return id
|
|
}
|
|
|
|
idA := makeRuntime("ccn_a")
|
|
idB := makeRuntime("ccn_b")
|
|
|
|
w := patchRuntimeCustomName(runtimeOwnerID, idA, map[string]any{
|
|
"custom_name": "Bohan's MacBook",
|
|
"apply_to_machine": true,
|
|
})
|
|
if w.Code != http.StatusOK {
|
|
t.Fatalf("PATCH machine rename: expected 200, got %d: %s", w.Code, w.Body.String())
|
|
}
|
|
|
|
// Both runtimes on the daemon must now carry the name.
|
|
for _, id := range []string{idA, idB} {
|
|
var name *string
|
|
if err := testPool.QueryRow(ctx, `SELECT custom_name FROM agent_runtime WHERE id = $1`, id).Scan(&name); err != nil {
|
|
t.Fatalf("read custom_name for %s: %v", id, err)
|
|
}
|
|
if name == nil || *name != "Bohan's MacBook" {
|
|
t.Fatalf("runtime %s custom_name = %v, want machine name applied", id, name)
|
|
}
|
|
}
|
|
}
|
|
|
|
// registerRuntimeOnDaemon registers a single built-in runtime for a daemon via
|
|
// the daemon-token path and returns the first runtime object from the response.
|
|
func registerRuntimeOnDaemon(t *testing.T, daemonID, provider string) map[string]any {
|
|
t.Helper()
|
|
w := httptest.NewRecorder()
|
|
req := newOwnerDaemonRequest("POST", "/api/daemon/register", map[string]any{
|
|
"workspace_id": testWorkspaceID,
|
|
"daemon_id": daemonID,
|
|
"device_name": "host",
|
|
"runtimes": []map[string]any{
|
|
{"name": provider + " (host)", "type": provider, "version": "1.0.0", "status": "online"},
|
|
},
|
|
})
|
|
testHandler.DaemonRegister(w, req)
|
|
if w.Code != http.StatusOK {
|
|
t.Fatalf("register %s: expected 200, got %d: %s", provider, w.Code, w.Body.String())
|
|
}
|
|
var resp map[string]any
|
|
if err := json.NewDecoder(w.Body).Decode(&resp); err != nil {
|
|
t.Fatalf("decode register response: %v", err)
|
|
}
|
|
runtimes, ok := resp["runtimes"].([]any)
|
|
if !ok || len(runtimes) == 0 {
|
|
t.Fatalf("register %s: no runtimes in response: %v", provider, resp)
|
|
}
|
|
return runtimes[0].(map[string]any)
|
|
}
|
|
|
|
// TestDaemonRegister_PreservesCustomNameInResponse guards Elon's finding that
|
|
// the register handler reconstructed the response row by hand and dropped
|
|
// custom_name, so a re-registering (heartbeat/reconnect) runtime that already
|
|
// had a custom name came back as custom_name: null — inconsistent with
|
|
// list/get/update.
|
|
func TestDaemonRegister_PreservesCustomNameInResponse(t *testing.T) {
|
|
if testHandler == nil {
|
|
t.Skip("database not available")
|
|
}
|
|
ctx := context.Background()
|
|
const daemonID = "custom-name-register-preserve"
|
|
t.Cleanup(func() {
|
|
testPool.Exec(context.Background(), `DELETE FROM agent_runtime WHERE daemon_id = $1`, daemonID)
|
|
})
|
|
|
|
first := registerRuntimeOnDaemon(t, daemonID, "claude")
|
|
runtimeID := first["id"].(string)
|
|
|
|
// Simulate a rename, then re-register (the upsert preserves custom_name).
|
|
if _, err := testPool.Exec(ctx, `UPDATE agent_runtime SET custom_name = 'Prod Box' WHERE id = $1`, runtimeID); err != nil {
|
|
t.Fatalf("set custom_name: %v", err)
|
|
}
|
|
|
|
again := registerRuntimeOnDaemon(t, daemonID, "claude")
|
|
if again["custom_name"] != "Prod Box" {
|
|
t.Fatalf("register response custom_name = %v, want \"Prod Box\" (must not be dropped)", again["custom_name"])
|
|
}
|
|
}
|
|
|
|
// TestDaemonRegister_NewRuntimeInheritsMachineName guards Elon's finding that a
|
|
// machine's custom name looked "lost" once a new provider registered on it:
|
|
// the new runtime landed with custom_name = null. It should instead inherit
|
|
// the machine's shared name so the machine title stays stable.
|
|
func TestDaemonRegister_NewRuntimeInheritsMachineName(t *testing.T) {
|
|
if testHandler == nil {
|
|
t.Skip("database not available")
|
|
}
|
|
ctx := context.Background()
|
|
const daemonID = "custom-name-register-inherit"
|
|
t.Cleanup(func() {
|
|
testPool.Exec(context.Background(), `DELETE FROM agent_runtime WHERE daemon_id = $1`, daemonID)
|
|
})
|
|
|
|
// Provider A registers, then the whole machine is named.
|
|
first := registerRuntimeOnDaemon(t, daemonID, "claude")
|
|
idA := first["id"].(string)
|
|
if _, err := testPool.Exec(ctx, `UPDATE agent_runtime SET custom_name = 'Bohan MacBook' WHERE id = $1`, idA); err != nil {
|
|
t.Fatalf("name machine: %v", err)
|
|
}
|
|
|
|
// A brand-new provider on the same machine must inherit the machine name —
|
|
// both in the response and persisted.
|
|
second := registerRuntimeOnDaemon(t, daemonID, "codex")
|
|
if second["custom_name"] != "Bohan MacBook" {
|
|
t.Fatalf("new runtime response custom_name = %v, want inherited \"Bohan MacBook\"", second["custom_name"])
|
|
}
|
|
var persisted *string
|
|
if err := testPool.QueryRow(ctx, `SELECT custom_name FROM agent_runtime WHERE id = $1`, second["id"].(string)).Scan(&persisted); err != nil {
|
|
t.Fatalf("read persisted custom_name: %v", err)
|
|
}
|
|
if persisted == nil || *persisted != "Bohan MacBook" {
|
|
t.Fatalf("persisted custom_name = %v, want inherited \"Bohan MacBook\"", persisted)
|
|
}
|
|
}
|
|
|
|
// TestDaemonRegister_FailedProfileInheritsMachineName guards the same-class
|
|
// gap Elon flagged on re-review: the failed-custom-profile branch also writes a
|
|
// daemon_id-scoped agent_runtime row, so it must inherit the machine name too —
|
|
// otherwise enabling a custom runtime that can't resolve on a named machine
|
|
// lands a custom_name=NULL row and drags the machine title back to the hostname.
|
|
func TestDaemonRegister_FailedProfileInheritsMachineName(t *testing.T) {
|
|
if testHandler == nil {
|
|
t.Skip("database not available")
|
|
}
|
|
ctx := context.Background()
|
|
const daemonID = "custom-name-register-failed-profile"
|
|
t.Cleanup(func() {
|
|
testPool.Exec(context.Background(), `DELETE FROM agent_runtime WHERE daemon_id = $1`, daemonID)
|
|
})
|
|
|
|
// A named machine: register a normal runtime, then name the whole machine.
|
|
first := registerRuntimeOnDaemon(t, daemonID, "claude")
|
|
if _, err := testPool.Exec(ctx, `UPDATE agent_runtime SET custom_name = 'Bohan MacBook' WHERE id = $1`, first["id"].(string)); err != nil {
|
|
t.Fatalf("name machine: %v", err)
|
|
}
|
|
|
|
// A custom runtime profile fails to resolve on this machine.
|
|
profileID := insertRuntimeProfileFixture(t, ctx, "Custom Codex", "codex", "missing-codex")
|
|
|
|
w := httptest.NewRecorder()
|
|
req := newDaemonTokenRequest("POST", "/api/daemon/register", map[string]any{
|
|
"workspace_id": testWorkspaceID,
|
|
"daemon_id": daemonID,
|
|
"device_name": "host",
|
|
"failed_profiles": []map[string]any{
|
|
{"profile_id": profileID, "command_name": "missing-codex", "reason": "command not found on PATH"},
|
|
},
|
|
}, testWorkspaceID, daemonID)
|
|
testHandler.DaemonRegister(w, req)
|
|
if w.Code != http.StatusOK {
|
|
t.Fatalf("register failed profile: expected 200, got %d: %s", w.Code, w.Body.String())
|
|
}
|
|
|
|
// The failed-profile row must have inherited the machine name.
|
|
var name *string
|
|
if err := testPool.QueryRow(ctx, `
|
|
SELECT custom_name FROM agent_runtime
|
|
WHERE workspace_id = $1 AND daemon_id = $2 AND profile_id = $3
|
|
`, testWorkspaceID, daemonID, profileID).Scan(&name); err != nil {
|
|
t.Fatalf("read failed-profile custom_name: %v", err)
|
|
}
|
|
if name == nil || *name != "Bohan MacBook" {
|
|
t.Fatalf("failed-profile custom_name = %v, want inherited \"Bohan MacBook\"", name)
|
|
}
|
|
}
|