github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-07 01:11:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

test(cli): dedupe acp program setup and cover token-file errors

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-21 19:54:01 +00:00
parent 7bfbbd6309
commit 00ab894feb
1 changed files with 45 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
src/cli/acp-cli.option-collisions.test.ts
View File

@@ -49,6 +49,23 @@ describe("acp cli option collisions", () => {
} }
} }
function createAcpProgram() {
const program = new Command();
registerAcpCli(program);
return program;
}
async function parseAcp(args: string[]) {
const program = createAcpProgram();
await program.parseAsync(["acp", ...args], { from: "user" });
}
function expectCliError(pattern: RegExp) {
expect(serveAcpGateway).not.toHaveBeenCalled();
expect(defaultRuntime.error).toHaveBeenCalledWith(expect.stringMatching(pattern));
expect(defaultRuntime.exit).toHaveBeenCalledWith(1);
}
beforeAll(async () => { beforeAll(async () => {
({ registerAcpCli } = await import("./acp-cli.js")); ({ registerAcpCli } = await import("./acp-cli.js"));
}); });
@@ -74,17 +91,13 @@ describe("acp cli option collisions", () => {
}); });
it("loads gateway token/password from files", async () => { it("loads gateway token/password from files", async () => {
const { registerAcpCli } = await import("./acp-cli.js");
const program = new Command();
registerAcpCli(program);
await withSecretFiles({ token: "tok_file\n", password: "pw_file\n" }, async (files) => { await withSecretFiles({ token: "tok_file\n", password: "pw_file\n" }, async (files) => {
await program.parseAsync( await parseAcp([
["acp", "--token-file", files.tokenFile ?? "", "--password-file", files.passwordFile ?? ""], "--token-file",
{ files.tokenFile ?? "",
from: "user", "--password-file",
}, files.passwordFile ?? "",
); ]);
}); });
expect(serveAcpGateway).toHaveBeenCalledWith( expect(serveAcpGateway).toHaveBeenCalledWith(
@@ -96,55 +109,23 @@ describe("acp cli option collisions", () => {
}); });
it("rejects mixed secret flags and file flags", async () => { it("rejects mixed secret flags and file flags", async () => {
const { registerAcpCli } = await import("./acp-cli.js");
const program = new Command();
registerAcpCli(program);
await withSecretFiles({ token: "tok_file\n" }, async (files) => { await withSecretFiles({ token: "tok_file\n" }, async (files) => {
await program.parseAsync( await parseAcp(["--token", "tok_inline", "--token-file", files.tokenFile ?? ""]);
["acp", "--token", "tok_inline", "--token-file", files.tokenFile ?? ""],
{
from: "user",
},
);
}); });
expect(serveAcpGateway).not.toHaveBeenCalled(); expectCliError(/Use either --token or --token-file/);
expect(defaultRuntime.error).toHaveBeenCalledWith(
expect.stringMatching(/Use either --token or --token-file/),
);
expect(defaultRuntime.exit).toHaveBeenCalledWith(1);
}); });
it("rejects mixed password flags and file flags", async () => { it("rejects mixed password flags and file flags", async () => {
const { registerAcpCli } = await import("./acp-cli.js");
const program = new Command();
registerAcpCli(program);
await withSecretFiles({ password: "pw_file\n" }, async (files) => { await withSecretFiles({ password: "pw_file\n" }, async (files) => {
await program.parseAsync( await parseAcp(["--password", "pw_inline", "--password-file", files.passwordFile ?? ""]);
["acp", "--password", "pw_inline", "--password-file", files.passwordFile ?? ""],
{
from: "user",
},
);
}); });
expect(serveAcpGateway).not.toHaveBeenCalled(); expectCliError(/Use either --password or --password-file/);
expect(defaultRuntime.error).toHaveBeenCalledWith(
expect.stringMatching(/Use either --password or --password-file/),
);
expect(defaultRuntime.exit).toHaveBeenCalledWith(1);
}); });
it("warns when inline secret flags are used", async () => { it("warns when inline secret flags are used", async () => {
const { registerAcpCli } = await import("./acp-cli.js"); await parseAcp(["--token", "tok_inline", "--password", "pw_inline"]);
const program = new Command();
registerAcpCli(program);
await program.parseAsync(["acp", "--token", "tok_inline", "--password", "pw_inline"], {
from: "user",
});
expect(defaultRuntime.error).toHaveBeenCalledWith( expect(defaultRuntime.error).toHaveBeenCalledWith(
expect.stringMatching(/--token can be exposed via process listings/), expect.stringMatching(/--token can be exposed via process listings/),
@@ -153,4 +134,21 @@ describe("acp cli option collisions", () => {
expect.stringMatching(/--password can be exposed via process listings/), expect.stringMatching(/--password can be exposed via process listings/),
); );
}); });
it("trims token file path before reading", async () => {
await withSecretFiles({ token: "tok_file\n" }, async (files) => {
await parseAcp(["--token-file", ` ${files.tokenFile ?? ""} `]);
});
expect(serveAcpGateway).toHaveBeenCalledWith(
expect.objectContaining({
gatewayToken: "tok_file",
}),
);
});
it("reports missing token-file read errors", async () => {
await parseAcp(["--token-file", "/tmp/openclaw-acp-missing-token.txt"]);
expectCliError(/Failed to read Gateway token file/);
});
}); });