* feat(secrets): expand secret target coverage and gateway tooling * docs(secrets): align gateway and CLI secret docs * chore(protocol): regenerate swift gateway models for secrets methods * fix(config): restore talk apiKey fallback and stabilize runner test * ci(windows): reduce test worker count for shard stability * ci(windows): raise node heap for test shard stability * test(feishu): make proxy env precedence assertion windows-safe * fix(gateway): resolve auth password SecretInput refs for clients * fix(gateway): resolve remote SecretInput credentials for clients * fix(secrets): skip inactive refs in command snapshot assignments * fix(secrets): scope gateway.remote refs to effective auth surfaces * fix(secrets): ignore memory defaults when enabled agents disable search * fix(secrets): honor Google Chat serviceAccountRef inheritance * fix(secrets): address tsgo errors in command and gateway collectors * fix(secrets): avoid auth-store load in providers-only configure * fix(gateway): defer local password ref resolution by precedence * fix(secrets): gate telegram webhook secret refs by webhook mode * fix(secrets): gate slack signing secret refs to http mode * fix(secrets): skip telegram botToken refs when tokenFile is set * fix(secrets): gate discord pluralkit refs by enabled flag * fix(secrets): gate discord voice tts refs by voice enabled * test(secrets): make runtime fixture modes explicit * fix(cli): resolve local qr password secret refs * fix(cli): fail when gateway leaves command refs unresolved * fix(gateway): fail when local password SecretRef is unresolved * fix(gateway): fail when required remote SecretRefs are unresolved * fix(gateway): resolve local password refs only when password can win * fix(cli): skip local password SecretRef resolution on qr token override * test(gateway): cast SecretRef fixtures to OpenClawConfig * test(secrets): activate mode-gated targets in runtime coverage fixture * fix(cron): support SecretInput webhook tokens safely * fix(bluebubbles): support SecretInput passwords across config paths * fix(msteams): make appPassword SecretInput-safe in onboarding/token paths * fix(bluebubbles): align SecretInput schema helper typing * fix(cli): clarify secrets.resolve version-skew errors * refactor(secrets): return structured inactive paths from secrets.resolve * refactor(gateway): type onboarding secret writes as SecretInput * chore(protocol): regenerate swift models for secrets.resolve * feat(secrets): expand extension credential secretref support * fix(secrets): gate web-search refs by active provider * fix(onboarding): detect SecretRef credentials in extension status * fix(onboarding): allow keeping existing ref in secret prompt * fix(onboarding): resolve gateway password SecretRefs for probe and tui * fix(onboarding): honor secret-input-mode for local gateway auth * fix(acp): resolve gateway SecretInput credentials * fix(secrets): gate gateway.remote refs to remote surfaces * test(secrets): cover pattern matching and inactive array refs * docs(secrets): clarify secrets.resolve and remote active surfaces * fix(bluebubbles): keep existing SecretRef during onboarding * fix(tests): resolve CI type errors in new SecretRef coverage * fix(extensions): replace raw fetch with SSRF-guarded fetch * test(secrets): mark gateway remote targets active in runtime coverage * test(infra): normalize home-prefix expectation across platforms * fix(cli): only resolve local qr password refs in password mode * test(cli): cover local qr token mode with unresolved password ref * docs(cli): clarify local qr password ref resolution behavior * refactor(extensions): reuse sdk SecretInput helpers * fix(wizard): resolve onboarding env-template secrets before plaintext * fix(cli): surface secrets.resolve diagnostics in memory and qr * test(secrets): repair post-rebase runtime and fixtures * fix(gateway): skip remote password ref resolution when token wins * fix(secrets): treat tailscale remote gateway refs as active * fix(gateway): allow remote password fallback when token ref is unresolved * fix(gateway): ignore stale local password refs for none and trusted-proxy * fix(gateway): skip remote secret ref resolution on local call paths * test(cli): cover qr remote tailscale secret ref resolution * fix(secrets): align gateway password active-surface with auth inference * fix(cli): resolve inferred local gateway password refs in qr * fix(gateway): prefer resolvable remote password over token ref pre-resolution * test(gateway): cover none and trusted-proxy stale password refs * docs(secrets): sync qr and gateway active-surface behavior * fix: restore stability blockers from pre-release audit * Secrets: fix collector/runtime precedence contradictions * docs: align secrets and web credential docs * fix(rebase): resolve integration regressions after main rebase * fix(node-host): resolve gateway secret refs for auth * fix(secrets): harden secretinput runtime readers * gateway: skip inactive auth secretref resolution * cli: avoid gateway preflight for inactive secret refs * extensions: allow unresolved refs in onboarding status * tests: fix qr-cli module mock hoist ordering * Security: align audit checks with SecretInput resolution * Gateway: resolve local-mode remote fallback secret refs * Node host: avoid resolving inactive password secret refs * Secrets runtime: mark Slack appToken inactive for HTTP mode * secrets: keep inactive gateway remote refs non-blocking * cli: include agent memory secret targets in runtime resolution * docs(secrets): sync docs with active-surface and web search behavior * fix(secrets): keep telegram top-level token refs active for blank account tokens * fix(daemon): resolve gateway password secret refs for probe auth * fix(secrets): skip IRC NickServ ref resolution when NickServ is disabled * fix(secrets): align token inheritance and exec timeout defaults * docs(secrets): clarify active-surface notes in cli docs * cli: require secrets.resolve gateway capability * gateway: log auth secret surface diagnostics * secrets: remove dead provider resolver module * fix(secrets): restore gateway auth precedence and fallback resolution * fix(tests): align plugin runtime mock typings --------- Co-authored-by: Peter Steinberger <steipete@gmail.com>
218 lines
5.9 KiB
TypeScript
218 lines
5.9 KiB
TypeScript
import { beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
|
|
|
|
type GatewayClientCallbacks = {
|
|
onHelloOk?: () => void;
|
|
onConnectError?: (err: Error) => void;
|
|
onClose?: (code: number, reason: string) => void;
|
|
};
|
|
|
|
type GatewayClientAuth = {
|
|
token?: string;
|
|
password?: string;
|
|
};
|
|
type ResolveGatewayCredentialsWithSecretInputs = (params: unknown) => Promise<GatewayClientAuth>;
|
|
|
|
const mockState = {
|
|
gateways: [] as MockGatewayClient[],
|
|
gatewayAuth: [] as GatewayClientAuth[],
|
|
agentSideConnectionCtor: vi.fn(),
|
|
agentStart: vi.fn(),
|
|
resolveGatewayCredentialsWithSecretInputs: vi.fn<ResolveGatewayCredentialsWithSecretInputs>(
|
|
async (_params) => ({
|
|
token: undefined,
|
|
password: undefined,
|
|
}),
|
|
),
|
|
};
|
|
|
|
class MockGatewayClient {
|
|
private callbacks: GatewayClientCallbacks;
|
|
|
|
constructor(opts: GatewayClientCallbacks & GatewayClientAuth) {
|
|
this.callbacks = opts;
|
|
mockState.gatewayAuth.push({ token: opts.token, password: opts.password });
|
|
mockState.gateways.push(this);
|
|
}
|
|
|
|
start(): void {}
|
|
|
|
stop(): void {
|
|
this.callbacks.onClose?.(1000, "gateway stopped");
|
|
}
|
|
|
|
emitHello(): void {
|
|
this.callbacks.onHelloOk?.();
|
|
}
|
|
|
|
emitConnectError(message: string): void {
|
|
this.callbacks.onConnectError?.(new Error(message));
|
|
}
|
|
}
|
|
|
|
vi.mock("@agentclientprotocol/sdk", () => ({
|
|
AgentSideConnection: class {
|
|
constructor(factory: (conn: unknown) => unknown, stream: unknown) {
|
|
mockState.agentSideConnectionCtor(factory, stream);
|
|
factory({});
|
|
}
|
|
},
|
|
ndJsonStream: vi.fn(() => ({ type: "mock-stream" })),
|
|
}));
|
|
|
|
vi.mock("../config/config.js", () => ({
|
|
loadConfig: () => ({
|
|
gateway: {
|
|
mode: "local",
|
|
},
|
|
}),
|
|
}));
|
|
|
|
vi.mock("../gateway/auth.js", () => ({
|
|
resolveGatewayAuth: () => ({}),
|
|
}));
|
|
|
|
vi.mock("../gateway/call.js", () => ({
|
|
buildGatewayConnectionDetails: () => ({
|
|
url: "ws://127.0.0.1:18789",
|
|
}),
|
|
resolveGatewayCredentialsWithSecretInputs: (params: unknown) =>
|
|
mockState.resolveGatewayCredentialsWithSecretInputs(params),
|
|
}));
|
|
|
|
vi.mock("../gateway/client.js", () => ({
|
|
GatewayClient: MockGatewayClient,
|
|
}));
|
|
|
|
vi.mock("./translator.js", () => ({
|
|
AcpGatewayAgent: class {
|
|
start(): void {
|
|
mockState.agentStart();
|
|
}
|
|
|
|
handleGatewayReconnect(): void {}
|
|
|
|
handleGatewayDisconnect(): void {}
|
|
|
|
async handleGatewayEvent(): Promise<void> {}
|
|
},
|
|
}));
|
|
|
|
describe("serveAcpGateway startup", () => {
|
|
let serveAcpGateway: typeof import("./server.js").serveAcpGateway;
|
|
|
|
beforeAll(async () => {
|
|
({ serveAcpGateway } = await import("./server.js"));
|
|
});
|
|
|
|
beforeEach(() => {
|
|
mockState.gateways.length = 0;
|
|
mockState.gatewayAuth.length = 0;
|
|
mockState.agentSideConnectionCtor.mockReset();
|
|
mockState.agentStart.mockReset();
|
|
mockState.resolveGatewayCredentialsWithSecretInputs.mockReset();
|
|
mockState.resolveGatewayCredentialsWithSecretInputs.mockResolvedValue({
|
|
token: undefined,
|
|
password: undefined,
|
|
});
|
|
});
|
|
|
|
it("waits for gateway hello before creating AgentSideConnection", async () => {
|
|
const signalHandlers = new Map<NodeJS.Signals, () => void>();
|
|
const onceSpy = vi.spyOn(process, "once").mockImplementation(((
|
|
signal: NodeJS.Signals,
|
|
handler: () => void,
|
|
) => {
|
|
signalHandlers.set(signal, handler);
|
|
return process;
|
|
}) as typeof process.once);
|
|
|
|
try {
|
|
const servePromise = serveAcpGateway({});
|
|
await Promise.resolve();
|
|
|
|
expect(mockState.agentSideConnectionCtor).not.toHaveBeenCalled();
|
|
const gateway = mockState.gateways[0];
|
|
if (!gateway) {
|
|
throw new Error("Expected mocked gateway instance");
|
|
}
|
|
|
|
gateway.emitHello();
|
|
await vi.waitFor(() => {
|
|
expect(mockState.agentSideConnectionCtor).toHaveBeenCalledTimes(1);
|
|
});
|
|
|
|
signalHandlers.get("SIGINT")?.();
|
|
await servePromise;
|
|
} finally {
|
|
onceSpy.mockRestore();
|
|
}
|
|
});
|
|
|
|
it("rejects startup when gateway connect fails before hello", async () => {
|
|
const onceSpy = vi
|
|
.spyOn(process, "once")
|
|
.mockImplementation(
|
|
((_signal: NodeJS.Signals, _handler: () => void) => process) as typeof process.once,
|
|
);
|
|
|
|
try {
|
|
const servePromise = serveAcpGateway({});
|
|
await Promise.resolve();
|
|
|
|
const gateway = mockState.gateways[0];
|
|
if (!gateway) {
|
|
throw new Error("Expected mocked gateway instance");
|
|
}
|
|
|
|
gateway.emitConnectError("connect failed");
|
|
await expect(servePromise).rejects.toThrow("connect failed");
|
|
expect(mockState.agentSideConnectionCtor).not.toHaveBeenCalled();
|
|
} finally {
|
|
onceSpy.mockRestore();
|
|
}
|
|
});
|
|
|
|
it("passes resolved SecretInput gateway credentials to the ACP gateway client", async () => {
|
|
mockState.resolveGatewayCredentialsWithSecretInputs.mockResolvedValue({
|
|
token: undefined,
|
|
password: "resolved-secret-password",
|
|
});
|
|
const signalHandlers = new Map<NodeJS.Signals, () => void>();
|
|
const onceSpy = vi.spyOn(process, "once").mockImplementation(((
|
|
signal: NodeJS.Signals,
|
|
handler: () => void,
|
|
) => {
|
|
signalHandlers.set(signal, handler);
|
|
return process;
|
|
}) as typeof process.once);
|
|
|
|
try {
|
|
const servePromise = serveAcpGateway({});
|
|
await Promise.resolve();
|
|
|
|
expect(mockState.resolveGatewayCredentialsWithSecretInputs).toHaveBeenCalledWith(
|
|
expect.objectContaining({
|
|
env: process.env,
|
|
}),
|
|
);
|
|
expect(mockState.gatewayAuth[0]).toEqual({
|
|
token: undefined,
|
|
password: "resolved-secret-password",
|
|
});
|
|
|
|
const gateway = mockState.gateways[0];
|
|
if (!gateway) {
|
|
throw new Error("Expected mocked gateway instance");
|
|
}
|
|
gateway.emitHello();
|
|
await vi.waitFor(() => {
|
|
expect(mockState.agentSideConnectionCtor).toHaveBeenCalledTimes(1);
|
|
});
|
|
signalHandlers.get("SIGINT")?.();
|
|
await servePromise;
|
|
} finally {
|
|
onceSpy.mockRestore();
|
|
}
|
|
});
|
|
});
|