github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-09 02:28:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

test(exec): dedupe wrapper boundary regressions

Browse Source
This commit is contained in:
Peter Steinberger
2026-03-08 00:11:57 +00:00
parent 5f50823abf
commit 8a469a12b2
2 changed files with 31 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/infra/system-run-command.test.ts
View File

@@ -41,30 +41,14 @@ describe("system run command helpers", () => {
});
test("extractShellCommandFromArgv unwraps known dispatch wrappers before shell wrappers", () => {
expect(extractShellCommandFromArgv(["/usr/bin/nice", "/bin/bash", "-lc", "echo hi"])).toBe(
"echo hi",
);
expect(
extractShellCommandFromArgv([
"/usr/bin/timeout",
"--signal=TERM",
"5",
"zsh",
"-lc",
"echo hi",
]),
).toBe("echo hi");
expect(
extractShellCommandFromArgv([
"/usr/bin/env",
"/usr/bin/env",
"/usr/bin/env",
"/usr/bin/env",
"/bin/sh",
"-c",
"echo hi",
]),
).toBe("echo hi");
const cases = [
["/usr/bin/nice", "/bin/bash", "-lc", "echo hi"],
["/usr/bin/timeout", "--signal=TERM", "5", "zsh", "-lc", "echo hi"],
["/usr/bin/env", "/usr/bin/env", "/usr/bin/env", "/usr/bin/env", "/bin/sh", "-c", "echo hi"],
];
for (const argv of cases) {
expect(extractShellCommandFromArgv(argv)).toBe("echo hi");
}
});
test("extractShellCommandFromArgv supports fish and pwsh wrappers", () => {

63
src/node-host/invoke-system-run.test.ts
View File

@@ -858,13 +858,14 @@ describe("handleSystemRunInvoke mac app exec host routing", () => {
expectApprovalRequiredDenied({ sendNodeEvent, sendInvokeResult });
});
it("denies env-wrapped shell payloads at the dispatch depth boundary", async () => {
if (process.platform === "win32") {
return;
}
async function expectNestedEnvShellDenied(params: {
depth: number;
markerName: string;
errorLabel: string;
}) {
const { runCommand, sendInvokeResult, sendNodeEvent } = createInvokeSpies({
runCommand: vi.fn(async () => {
throw new Error("runCommand should not be called for depth-boundary shell wrappers");
throw new Error(params.errorLabel);
}),
});
@@ -877,11 +878,11 @@ describe("handleSystemRunInvoke mac app exec host routing", () => {
},
}),
run: async ({ tempHome }) => {
const marker = path.join(tempHome, "depth4-pwned.txt");
const marker = path.join(tempHome, params.markerName);
await runSystemInvoke({
preferMacAppExecHost: false,
command: buildNestedEnvShellCommand({
depth: 4,
depth: params.depth,
payload: `echo PWNED > ${marker}`,
}),
security: "allowlist",
@@ -896,45 +897,27 @@ describe("handleSystemRunInvoke mac app exec host routing", () => {
expect(runCommand).not.toHaveBeenCalled();
expectApprovalRequiredDenied({ sendNodeEvent, sendInvokeResult });
}
it("denies env-wrapped shell payloads at the dispatch depth boundary", async () => {
if (process.platform === "win32") {
return;
}
await expectNestedEnvShellDenied({
depth: 4,
markerName: "depth4-pwned.txt",
errorLabel: "runCommand should not be called for depth-boundary shell wrappers",
});
});
it("denies nested env shell payloads when wrapper depth is exceeded", async () => {
if (process.platform === "win32") {
return;
}
const { runCommand, sendInvokeResult, sendNodeEvent } = createInvokeSpies({
runCommand: vi.fn(async () => {
throw new Error("runCommand should not be called for nested env depth overflow");
}),
await expectNestedEnvShellDenied({
depth: 5,
markerName: "pwned.txt",
errorLabel: "runCommand should not be called for nested env depth overflow",
});
await withTempApprovalsHome({
approvals: createAllowlistOnMissApprovals({
agents: {
main: {
allowlist: [{ pattern: "/usr/bin/env" }],
},
},
}),
run: async ({ tempHome }) => {
const marker = path.join(tempHome, "pwned.txt");
await runSystemInvoke({
preferMacAppExecHost: false,
command: buildNestedEnvShellCommand({
depth: 5,
payload: `echo PWNED > ${marker}`,
}),
security: "allowlist",
ask: "on-miss",
runCommand,
sendInvokeResult,
sendNodeEvent,
});
expect(fs.existsSync(marker)).toBe(false);
},
});
expect(runCommand).not.toHaveBeenCalled();
expectApprovalRequiredDenied({ sendNodeEvent, sendInvokeResult });
});
});