Plugin subagent dispatch used a hardcoded synthetic client carrying operator.admin, operator.approvals, and operator.pairing for all runtime.subagent.* calls. Plugin HTTP routes with auth:"plugin" require no gateway auth by design, so an unauthenticated external request could drive admin-only gateway methods (sessions.delete, agent.run) through the subagent runtime. Propagate the real gateway client into the plugin runtime request scope when one is available. Plugin HTTP routes now run inside a scoped runtime client: auth:"plugin" routes receive a non-admin synthetic operator.write client; gateway-authenticated routes retain admin-capable scopes. The security boundary is enforced at the HTTP handler level. Fixes GHSA-xw77-45gv-p728
239 lines
7.9 KiB
TypeScript
239 lines
7.9 KiB
TypeScript
import os from "node:os";
|
|
import path from "node:path";
|
|
import { describe, expect, it } from "vitest";
|
|
import {
|
|
loadOrCreateDeviceIdentity,
|
|
publicKeyRawBase64UrlFromPem,
|
|
signDevicePayload,
|
|
} from "../infra/device-identity.js";
|
|
import { withEnvAsync } from "../test-utils/env.js";
|
|
import { buildDeviceAuthPayload } from "./device-auth.js";
|
|
import { validateTalkConfigResult } from "./protocol/index.js";
|
|
import {
|
|
connectOk,
|
|
installGatewayTestHooks,
|
|
readConnectChallengeNonce,
|
|
rpcReq,
|
|
} from "./test-helpers.js";
|
|
import { withServer } from "./test-with-server.js";
|
|
|
|
installGatewayTestHooks({ scope: "suite" });
|
|
|
|
type GatewaySocket = Parameters<Parameters<typeof withServer>[0]>[0];
|
|
const TALK_CONFIG_DEVICE_PATH = path.join(
|
|
os.tmpdir(),
|
|
`openclaw-talk-config-device-${process.pid}.json`,
|
|
);
|
|
const TALK_CONFIG_DEVICE = loadOrCreateDeviceIdentity(TALK_CONFIG_DEVICE_PATH);
|
|
|
|
async function createFreshOperatorDevice(scopes: string[], nonce: string) {
|
|
const signedAtMs = Date.now();
|
|
const payload = buildDeviceAuthPayload({
|
|
deviceId: TALK_CONFIG_DEVICE.deviceId,
|
|
clientId: "test",
|
|
clientMode: "test",
|
|
role: "operator",
|
|
scopes,
|
|
signedAtMs,
|
|
token: "secret",
|
|
nonce,
|
|
});
|
|
|
|
return {
|
|
id: TALK_CONFIG_DEVICE.deviceId,
|
|
publicKey: publicKeyRawBase64UrlFromPem(TALK_CONFIG_DEVICE.publicKeyPem),
|
|
signature: signDevicePayload(TALK_CONFIG_DEVICE.privateKeyPem, payload),
|
|
signedAt: signedAtMs,
|
|
nonce,
|
|
};
|
|
}
|
|
|
|
async function connectOperator(ws: GatewaySocket, scopes: string[]) {
|
|
const nonce = await readConnectChallengeNonce(ws);
|
|
expect(nonce).toBeTruthy();
|
|
await connectOk(ws, {
|
|
token: "secret",
|
|
scopes,
|
|
device: await createFreshOperatorDevice(scopes, String(nonce)),
|
|
});
|
|
}
|
|
|
|
async function writeTalkConfig(config: {
|
|
apiKey?: string | { source: "env" | "file" | "exec"; provider: string; id: string };
|
|
voiceId?: string;
|
|
silenceTimeoutMs?: number;
|
|
}) {
|
|
const { writeConfigFile } = await import("../config/config.js");
|
|
await writeConfigFile({ talk: config });
|
|
}
|
|
|
|
describe("gateway talk.config", () => {
|
|
it("returns redacted talk config for read scope", async () => {
|
|
const { writeConfigFile } = await import("../config/config.js");
|
|
await writeConfigFile({
|
|
talk: {
|
|
voiceId: "voice-123",
|
|
apiKey: "secret-key-abc", // pragma: allowlist secret
|
|
silenceTimeoutMs: 1500,
|
|
},
|
|
session: {
|
|
mainKey: "main-test",
|
|
},
|
|
ui: {
|
|
seamColor: "#112233",
|
|
},
|
|
});
|
|
|
|
await withServer(async (ws) => {
|
|
await connectOperator(ws, ["operator.read"]);
|
|
const res = await rpcReq<{
|
|
config?: {
|
|
talk?: {
|
|
provider?: string;
|
|
providers?: {
|
|
elevenlabs?: { voiceId?: string; apiKey?: string };
|
|
};
|
|
resolved?: {
|
|
provider?: string;
|
|
config?: { voiceId?: string; apiKey?: string };
|
|
};
|
|
apiKey?: string;
|
|
voiceId?: string;
|
|
silenceTimeoutMs?: number;
|
|
};
|
|
};
|
|
}>(ws, "talk.config", {});
|
|
expect(res.ok).toBe(true);
|
|
expect(res.payload?.config?.talk?.provider).toBe("elevenlabs");
|
|
expect(res.payload?.config?.talk?.providers?.elevenlabs?.voiceId).toBe("voice-123");
|
|
expect(res.payload?.config?.talk?.providers?.elevenlabs?.apiKey).toBe(
|
|
"__OPENCLAW_REDACTED__",
|
|
);
|
|
expect(res.payload?.config?.talk?.resolved?.provider).toBe("elevenlabs");
|
|
expect(res.payload?.config?.talk?.resolved?.config?.voiceId).toBe("voice-123");
|
|
expect(res.payload?.config?.talk?.resolved?.config?.apiKey).toBe("__OPENCLAW_REDACTED__");
|
|
expect(res.payload?.config?.talk?.voiceId).toBe("voice-123");
|
|
expect(res.payload?.config?.talk?.apiKey).toBe("__OPENCLAW_REDACTED__");
|
|
expect(res.payload?.config?.talk?.silenceTimeoutMs).toBe(1500);
|
|
});
|
|
});
|
|
|
|
it("requires operator.talk.secrets for includeSecrets", async () => {
|
|
await writeTalkConfig({ apiKey: "secret-key-abc" }); // pragma: allowlist secret
|
|
|
|
await withServer(async (ws) => {
|
|
await connectOperator(ws, ["operator.read"]);
|
|
const res = await rpcReq(ws, "talk.config", { includeSecrets: true });
|
|
expect(res.ok).toBe(false);
|
|
expect(res.error?.message).toContain("missing scope: operator.talk.secrets");
|
|
});
|
|
});
|
|
|
|
it("returns secrets for operator.talk.secrets scope", async () => {
|
|
await writeTalkConfig({ apiKey: "secret-key-abc" }); // pragma: allowlist secret
|
|
|
|
await withServer(async (ws) => {
|
|
await connectOperator(ws, ["operator.read", "operator.write", "operator.talk.secrets"]);
|
|
const res = await rpcReq<{ config?: { talk?: { apiKey?: string } } }>(ws, "talk.config", {
|
|
includeSecrets: true,
|
|
});
|
|
expect(res.ok).toBe(true);
|
|
expect(res.payload?.config?.talk?.apiKey).toBe("secret-key-abc");
|
|
});
|
|
});
|
|
|
|
it("returns Talk SecretRef payloads that satisfy the protocol schema", async () => {
|
|
await writeTalkConfig({
|
|
apiKey: {
|
|
source: "env",
|
|
provider: "default",
|
|
id: "ELEVENLABS_API_KEY",
|
|
},
|
|
});
|
|
|
|
await withEnvAsync({ ELEVENLABS_API_KEY: "env-elevenlabs-key" }, async () => {
|
|
await withServer(async (ws) => {
|
|
await connectOperator(ws, ["operator.read", "operator.write", "operator.talk.secrets"]);
|
|
const res = await rpcReq<{
|
|
config?: {
|
|
talk?: {
|
|
apiKey?: { source?: string; provider?: string; id?: string };
|
|
providers?: {
|
|
elevenlabs?: {
|
|
apiKey?: { source?: string; provider?: string; id?: string };
|
|
};
|
|
};
|
|
resolved?: {
|
|
provider?: string;
|
|
config?: {
|
|
apiKey?: { source?: string; provider?: string; id?: string };
|
|
};
|
|
};
|
|
};
|
|
};
|
|
}>(ws, "talk.config", {
|
|
includeSecrets: true,
|
|
});
|
|
expect(res.ok).toBe(true);
|
|
expect(validateTalkConfigResult(res.payload)).toBe(true);
|
|
expect(res.payload?.config?.talk?.apiKey).toEqual({
|
|
source: "env",
|
|
provider: "default",
|
|
id: "ELEVENLABS_API_KEY",
|
|
});
|
|
expect(res.payload?.config?.talk?.providers?.elevenlabs?.apiKey).toEqual({
|
|
source: "env",
|
|
provider: "default",
|
|
id: "ELEVENLABS_API_KEY",
|
|
});
|
|
expect(res.payload?.config?.talk?.resolved?.provider).toBe("elevenlabs");
|
|
expect(res.payload?.config?.talk?.resolved?.config?.apiKey).toEqual({
|
|
source: "env",
|
|
provider: "default",
|
|
id: "ELEVENLABS_API_KEY",
|
|
});
|
|
});
|
|
});
|
|
});
|
|
|
|
it("prefers normalized provider payload over conflicting legacy talk keys", async () => {
|
|
const { writeConfigFile } = await import("../config/config.js");
|
|
await writeConfigFile({
|
|
talk: {
|
|
provider: "elevenlabs",
|
|
providers: {
|
|
elevenlabs: {
|
|
voiceId: "voice-normalized",
|
|
},
|
|
},
|
|
voiceId: "voice-legacy",
|
|
},
|
|
});
|
|
|
|
await withServer(async (ws) => {
|
|
await connectOperator(ws, ["operator.read"]);
|
|
const res = await rpcReq<{
|
|
config?: {
|
|
talk?: {
|
|
provider?: string;
|
|
providers?: {
|
|
elevenlabs?: { voiceId?: string };
|
|
};
|
|
resolved?: {
|
|
provider?: string;
|
|
config?: { voiceId?: string };
|
|
};
|
|
voiceId?: string;
|
|
};
|
|
};
|
|
}>(ws, "talk.config", {});
|
|
expect(res.ok).toBe(true);
|
|
expect(res.payload?.config?.talk?.provider).toBe("elevenlabs");
|
|
expect(res.payload?.config?.talk?.providers?.elevenlabs?.voiceId).toBe("voice-normalized");
|
|
expect(res.payload?.config?.talk?.resolved?.provider).toBe("elevenlabs");
|
|
expect(res.payload?.config?.talk?.resolved?.config?.voiceId).toBe("voice-normalized");
|
|
expect(res.payload?.config?.talk?.voiceId).toBe("voice-normalized");
|
|
});
|
|
});
|
|
});
|