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

fix(daemon): normalize audit paths

Browse Source
This commit is contained in:
Peter Steinberger
2026-01-08 22:28:48 +00:00
parent 3965c5b4d2
commit cdfae0b9d3
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/daemon/runtime-paths.ts
View File

@@ -12,10 +12,15 @@ const VERSION_MANAGER_MARKERS = [
"/nvs/", "/nvs/",
]; ];
function getPathModule(platform: NodeJS.Platform) {
return platform === "win32" ? path.win32 : path.posix;
}
function normalizeForCompare(input: string, platform: NodeJS.Platform): string { function normalizeForCompare(input: string, platform: NodeJS.Platform): string {
const normalized = path.normalize(input); const pathModule = getPathModule(platform);
const normalized = pathModule.normalize(input).replaceAll("\\", "/");
if (platform === "win32") { if (platform === "win32") {
return normalized.replaceAll("\\", "/").toLowerCase(); return normalized.toLowerCase();
} }
return normalized; return normalized;
} }
@@ -31,12 +36,13 @@ function buildSystemNodeCandidates(
return ["/usr/local/bin/node", "/usr/bin/node"]; return ["/usr/local/bin/node", "/usr/bin/node"];
} }
if (platform === "win32") { if (platform === "win32") {
const pathModule = getPathModule(platform);
const programFiles = env.ProgramFiles ?? "C:\\Program Files"; const programFiles = env.ProgramFiles ?? "C:\\Program Files";
const programFilesX86 = const programFilesX86 =
env["ProgramFiles(x86)"] ?? "C:\\Program Files (x86)"; env["ProgramFiles(x86)"] ?? "C:\\Program Files (x86)";
return [ return [
path.join(programFiles, "nodejs", "node.exe"), pathModule.join(programFiles, "nodejs", "node.exe"),
path.join(programFilesX86, "nodejs", "node.exe"), pathModule.join(programFilesX86, "nodejs", "node.exe"),
]; ];
} }
return []; return [];

11
src/daemon/service-audit.ts
View File

@@ -194,10 +194,15 @@ function isBunRuntime(execPath: string): boolean {
return base === "bun" || base === "bun.exe"; return base === "bun" || base === "bun.exe";
} }
function getPathModule(platform: NodeJS.Platform) {
return platform === "win32" ? path.win32 : path.posix;
}
function normalizePathEntry(entry: string, platform: NodeJS.Platform): string { function normalizePathEntry(entry: string, platform: NodeJS.Platform): string {
const normalized = path.normalize(entry); const pathModule = getPathModule(platform);
const normalized = pathModule.normalize(entry).replaceAll("\\", "/");
if (platform === "win32") { if (platform === "win32") {
return normalized.replaceAll("\\", "/").toLowerCase(); return normalized.toLowerCase();
} }
return normalized; return normalized;
} }
@@ -221,7 +226,7 @@ function auditGatewayServicePath(
const expected = getMinimalServicePathParts({ platform }); const expected = getMinimalServicePathParts({ platform });
const parts = servicePath const parts = servicePath
.split(path.delimiter) .split(getPathModule(platform).delimiter)
.map((entry) => entry.trim()) .map((entry) => entry.trim())
.filter(Boolean); .filter(Boolean);
const normalizedParts = parts.map((entry) => const normalizedParts = parts.map((entry) =>