nyrn
/
openclaw
mirror of https://github.com/openclaw/openclaw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: tighten executable path coverage

This commit is contained in:
Peter Steinberger 2026-03-13 22:07:14 +00:00
parent 0826feb94d
commit fac754041c
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/infra/executable-path.test.ts
View File

@ -47,4 +47,27 @@ describe("executable path helpers", () => {
expect(resolveExecutablePath("runner", { env: { PATH: binDir } })).toBe(pathTool);
expect(resolveExecutablePath("missing", { env: { PATH: binDir } })).toBeUndefined();
});
it("resolves absolute, home-relative, and Path-cased env executables", async () => {
const base = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-exec-path-"));
const homeDir = path.join(base, "home");
const binDir = path.join(base, "bin");
await fs.mkdir(homeDir, { recursive: true });
await fs.mkdir(binDir, { recursive: true });
const homeTool = path.join(homeDir, "home-tool");
const absoluteTool = path.join(base, "absolute-tool");
const pathTool = path.join(binDir, "runner");
await fs.writeFile(homeTool, "#!/bin/sh\nexit 0\n", "utf8");
await fs.writeFile(absoluteTool, "#!/bin/sh\nexit 0\n", "utf8");
await fs.writeFile(pathTool, "#!/bin/sh\nexit 0\n", "utf8");
await fs.chmod(homeTool, 0o755);
await fs.chmod(absoluteTool, 0o755);
await fs.chmod(pathTool, 0o755);
expect(resolveExecutablePath(absoluteTool)).toBe(absoluteTool);
expect(resolveExecutablePath("~/home-tool", { env: { HOME: homeDir } })).toBe(homeTool);
expect(resolveExecutablePath("runner", { env: { Path: binDir } })).toBe(pathTool);
expect(resolveExecutablePath("~/missing-tool", { env: { HOME: homeDir } })).toBeUndefined();
});
});

4
src/infra/executable-path.ts
View File

@ -60,7 +60,9 @@ export function resolveExecutablePath(
rawExecutable: string,
options?: { cwd?: string; env?: NodeJS.ProcessEnv },
): string | undefined {
const expanded = rawExecutable.startsWith("~") ? expandHomePrefix(rawExecutable) : rawExecutable;
const expanded = rawExecutable.startsWith("~")
? expandHomePrefix(rawExecutable, { env: options?.env })
: rawExecutable;
if (expanded.includes("/") || expanded.includes("\\")) {
if (path.isAbsolute(expanded)) {
return isExecutableFile(expanded) ? expanded : undefined;