test(agents): dedupe exec preflight fixtures and cover quoted-path skip
This commit is contained in:
@@ -6,80 +6,97 @@ import { createExecTool } from "./bash-tools.exec.js";
|
||||
|
||||
const isWin = process.platform === "win32";
|
||||
|
||||
describe("exec script preflight", () => {
|
||||
const describeNonWin = isWin ? describe.skip : describe;
|
||||
|
||||
async function withTempDir(prefix: string, run: (dir: string) => Promise<void>) {
|
||||
const dir = await fs.mkdtemp(path.join(os.tmpdir(), prefix));
|
||||
try {
|
||||
await run(dir);
|
||||
} finally {
|
||||
await fs.rm(dir, { recursive: true, force: true });
|
||||
}
|
||||
}
|
||||
|
||||
describeNonWin("exec script preflight", () => {
|
||||
it("blocks shell env var injection tokens in python scripts before execution", async () => {
|
||||
if (isWin) {
|
||||
return;
|
||||
}
|
||||
await withTempDir("openclaw-exec-preflight-", async (tmp) => {
|
||||
const pyPath = path.join(tmp, "bad.py");
|
||||
|
||||
const tmp = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-exec-preflight-"));
|
||||
const pyPath = path.join(tmp, "bad.py");
|
||||
await fs.writeFile(
|
||||
pyPath,
|
||||
[
|
||||
"import json",
|
||||
"# model accidentally wrote shell syntax:",
|
||||
"payload = $DM_JSON",
|
||||
"print(payload)",
|
||||
].join("\n"),
|
||||
"utf-8",
|
||||
);
|
||||
|
||||
await fs.writeFile(
|
||||
pyPath,
|
||||
[
|
||||
"import json",
|
||||
"# model accidentally wrote shell syntax:",
|
||||
"payload = $DM_JSON",
|
||||
"print(payload)",
|
||||
].join("\n"),
|
||||
"utf-8",
|
||||
);
|
||||
const tool = createExecTool({ host: "gateway", security: "full", ask: "off" });
|
||||
|
||||
const tool = createExecTool({ host: "gateway", security: "full", ask: "off" });
|
||||
|
||||
await expect(
|
||||
tool.execute("call1", {
|
||||
command: "python bad.py",
|
||||
workdir: tmp,
|
||||
}),
|
||||
).rejects.toThrow(/exec preflight: detected likely shell variable injection \(\$DM_JSON\)/);
|
||||
await expect(
|
||||
tool.execute("call1", {
|
||||
command: "python bad.py",
|
||||
workdir: tmp,
|
||||
}),
|
||||
).rejects.toThrow(/exec preflight: detected likely shell variable injection \(\$DM_JSON\)/);
|
||||
});
|
||||
});
|
||||
|
||||
it("blocks obvious shell-as-js output before node execution", async () => {
|
||||
if (isWin) {
|
||||
return;
|
||||
}
|
||||
await withTempDir("openclaw-exec-preflight-", async (tmp) => {
|
||||
const jsPath = path.join(tmp, "bad.js");
|
||||
|
||||
const tmp = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-exec-preflight-"));
|
||||
const jsPath = path.join(tmp, "bad.js");
|
||||
await fs.writeFile(
|
||||
jsPath,
|
||||
['NODE "$TMPDIR/hot.json"', "console.log('hi')"].join("\n"),
|
||||
"utf-8",
|
||||
);
|
||||
|
||||
await fs.writeFile(
|
||||
jsPath,
|
||||
['NODE "$TMPDIR/hot.json"', "console.log('hi')"].join("\n"),
|
||||
"utf-8",
|
||||
);
|
||||
const tool = createExecTool({ host: "gateway", security: "full", ask: "off" });
|
||||
|
||||
const tool = createExecTool({ host: "gateway", security: "full", ask: "off" });
|
||||
await expect(
|
||||
tool.execute("call1", {
|
||||
command: "node bad.js",
|
||||
workdir: tmp,
|
||||
}),
|
||||
).rejects.toThrow(
|
||||
/exec preflight: (detected likely shell variable injection|JS file starts with shell syntax)/,
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
await expect(
|
||||
tool.execute("call1", {
|
||||
command: "node bad.js",
|
||||
it("skips preflight when script token is quoted and unresolved by fast parser", async () => {
|
||||
await withTempDir("openclaw-exec-preflight-", async (tmp) => {
|
||||
const jsPath = path.join(tmp, "bad.js");
|
||||
await fs.writeFile(jsPath, "const value = $DM_JSON;", "utf-8");
|
||||
|
||||
const tool = createExecTool({ host: "gateway", security: "full", ask: "off" });
|
||||
const result = await tool.execute("call-quoted", {
|
||||
command: 'node "bad.js"',
|
||||
workdir: tmp,
|
||||
}),
|
||||
).rejects.toThrow(
|
||||
/exec preflight: (detected likely shell variable injection|JS file starts with shell syntax)/,
|
||||
);
|
||||
});
|
||||
const text = result.content.find((block) => block.type === "text")?.text ?? "";
|
||||
expect(text).not.toMatch(/exec preflight:/);
|
||||
});
|
||||
});
|
||||
|
||||
it("skips preflight file reads for script paths outside the workdir", async () => {
|
||||
if (isWin) {
|
||||
return;
|
||||
}
|
||||
await withTempDir("openclaw-exec-preflight-parent-", async (parent) => {
|
||||
const outsidePath = path.join(parent, "outside.js");
|
||||
const workdir = path.join(parent, "workdir");
|
||||
await fs.mkdir(workdir, { recursive: true });
|
||||
await fs.writeFile(outsidePath, "const value = $DM_JSON;", "utf-8");
|
||||
|
||||
const parent = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-exec-preflight-parent-"));
|
||||
const outsidePath = path.join(parent, "outside.js");
|
||||
const workdir = path.join(parent, "workdir");
|
||||
await fs.mkdir(workdir, { recursive: true });
|
||||
await fs.writeFile(outsidePath, "const value = $DM_JSON;", "utf-8");
|
||||
const tool = createExecTool({ host: "gateway", security: "full", ask: "off" });
|
||||
|
||||
const tool = createExecTool({ host: "gateway", security: "full", ask: "off" });
|
||||
|
||||
const result = await tool.execute("call-outside", {
|
||||
command: "node ../outside.js",
|
||||
workdir,
|
||||
const result = await tool.execute("call-outside", {
|
||||
command: "node ../outside.js",
|
||||
workdir,
|
||||
});
|
||||
const text = result.content.find((block) => block.type === "text")?.text ?? "";
|
||||
expect(text).not.toMatch(/exec preflight:/);
|
||||
});
|
||||
const text = result.content.find((block) => block.type === "text")?.text ?? "";
|
||||
expect(text).not.toMatch(/exec preflight:/);
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user