let5see/clawdbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: sanitize windows node argv

Browse Source
This commit is contained in:
Peter Steinberger
2026-01-19 14:16:45 +00:00
parent d9c20f6fa5
commit cb2add8459
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/cli/run-main.ts
View File

@@ -52,13 +52,19 @@ export async function runCli(argv: string[] = process.argv) {
function stripWindowsNodeExec(argv: string[]): string[] { function stripWindowsNodeExec(argv: string[]): string[] {
if (process.platform !== "win32") return argv; if (process.platform !== "win32") return argv;
const normalizeArg = (value: string): string => value.replace(/^"+|"+$/g, ""); const normalizeArg = (value: string): string => value.replace(/^"+|"+$/g, "");
const execPath = normalizeArg(process.execPath); const normalizeCandidate = (value: string): string => normalizeArg(value).replace(/^\\\\\\?\\/, "");
const execPath = normalizeCandidate(process.execPath);
const execPathLower = execPath.toLowerCase(); const execPathLower = execPath.toLowerCase();
const execBase = path.basename(execPath).toLowerCase(); const execBase = path.basename(execPath).toLowerCase();
const isExecPath = (value: string | undefined): boolean => { const isExecPath = (value: string | undefined): boolean => {
if (!value) return false; if (!value) return false;
const lower = normalizeArg(value).toLowerCase(); const lower = normalizeCandidate(value).toLowerCase();
return lower === execPathLower || path.basename(lower) === execBase; return (
lower === execPathLower ||
path.basename(lower) === execBase ||
lower.endsWith("\\node.exe") ||
lower.endsWith("/node.exe")
);
}; };
const filtered = argv.filter((arg, index) => index === 0 || !isExecPath(arg)); const filtered = argv.filter((arg, index) => index === 0 || !isExecPath(arg));
if (filtered.length < 3) return filtered; if (filtered.length < 3) return filtered;

14
src/entry.ts
View File

@@ -60,14 +60,20 @@ function ensureExperimentalWarningSuppressed(): boolean {
function normalizeWindowsArgv(argv: string[]): string[] { function normalizeWindowsArgv(argv: string[]): string[] {
if (process.platform !== "win32") return argv; if (process.platform !== "win32") return argv;
if (argv.length < 3) return argv; if (argv.length < 3) return argv;
const execPath = process.execPath; const normalizeArg = (value: string): string => value.replace(/^"+|"+$/g, "");
const normalizeCandidate = (value: string): string => normalizeArg(value).replace(/^\\\\\\?\\/, "");
const execPath = normalizeCandidate(process.execPath);
const execPathLower = execPath.toLowerCase(); const execPathLower = execPath.toLowerCase();
const execBase = path.basename(execPath).toLowerCase(); const execBase = path.basename(execPath).toLowerCase();
const normalizeArg = (value: string): string => value.replace(/^"+|"+$/g, "");
const isExecPath = (value: string | undefined): boolean => { const isExecPath = (value: string | undefined): boolean => {
if (!value) return false; if (!value) return false;
const lower = normalizeArg(value).toLowerCase(); const lower = normalizeCandidate(value).toLowerCase();
return lower === execPathLower || path.basename(lower) === execBase; return (
lower === execPathLower ||
path.basename(lower) === execBase ||
lower.endsWith("\\node.exe") ||
lower.endsWith("/node.exe")
);
}; };
const arg1 = path.basename(argv[1] ?? "").toLowerCase(); const arg1 = path.basename(argv[1] ?? "").toLowerCase();
const arg2 = path.basename(argv[2] ?? "").toLowerCase(); const arg2 = path.basename(argv[2] ?? "").toLowerCase();