diff --git a/browser-companion/scripts/archive-tool.cjs b/browser-companion/scripts/archive-tool.cjs new file mode 100644 index 00000000..1917cc22 --- /dev/null +++ b/browser-companion/scripts/archive-tool.cjs @@ -0,0 +1,16 @@ +"use strict"; +const fs=require("node:fs"); +const path=require("node:path"); + +// On Windows, PowerShell/nvm may omit System32 from PATH. Never fall back +// to an unrelated tar.exe when producing or verifying release artifacts. +function archiveTool({platform=process.platform,systemRoot=process.env.SystemRoot,exists=fs.existsSync}={}) { + if(platform!=="win32")return "tar"; + const root=systemRoot||"C:\\Windows"; + if(!/^[A-Za-z]:[\\/]/.test(root) || root.split(/[\\/]/).includes("..") || root.includes("\0")) + throw new Error("Windows system directory must be a local absolute drive path without traversal"); + const executable=path.win32.join(root,"System32","tar.exe"); + if(!exists(executable))throw new Error("Windows System32 tar.exe is unavailable"); + return executable; +} +module.exports={archiveTool}; \ No newline at end of file diff --git a/browser-companion/scripts/package.cjs b/browser-companion/scripts/package.cjs index 5734ed0c..12575812 100644 --- a/browser-companion/scripts/package.cjs +++ b/browser-companion/scripts/package.cjs @@ -4,6 +4,7 @@ const { spawnSync } = require("node:child_process"); const fs = require("node:fs"); const os = require("node:os"); const path = require("node:path"); +const { archiveTool } = require("./archive-tool.cjs"); const { installChrome } = require("./install-chrome.cjs"); const { stageWindowsApplication } = require("./package-stage.cjs"); @@ -182,9 +183,9 @@ try { fs.rmSync(artifact, { force:true }); if (targetPlatform === "win32") { const zipOptions=process.env.CODEXIFY_BROWSER_FAST_LOCAL_PACKAGE==="1"?["--options","zip:compression-level=1"]:[]; - runChecked("tar", ["-a", "-cf", artifact,...zipOptions, "-C", packageStage, packageRootName]); + runChecked(archiveTool(), ["-a", "-cf", artifact,...zipOptions, "-C", packageStage, packageRootName]); } else { - runChecked("tar", ["-czf", artifact, "-C", packageStage, packageRootName], { + runChecked(archiveTool(), ["-czf", artifact, "-C", packageStage, packageRootName], { env:{ ...process.env, COPYFILE_DISABLE:"1" }, }); } diff --git a/browser-companion/scripts/smoke-package.cjs b/browser-companion/scripts/smoke-package.cjs index 86ace6cf..d64457f7 100644 --- a/browser-companion/scripts/smoke-package.cjs +++ b/browser-companion/scripts/smoke-package.cjs @@ -3,6 +3,7 @@ const { spawnSync } = require("node:child_process"); const fs = require("node:fs"); const os = require("node:os"); const path = require("node:path"); +const { archiveTool } = require("./archive-tool.cjs"); const root = path.resolve(__dirname, ".."); const repositoryRoot = path.resolve(root, ".."); @@ -52,7 +53,7 @@ const descriptor = path.join(scratch, "browser", "descriptor.json"); try { const extract = path.join(scratch, "extract"); fs.mkdirSync(extract); - run("tar", process.platform === "win32" + run(archiveTool(), process.platform === "win32" ? ["-xf", artifact, "-C", extract] : ["-xzf", artifact, "-C", extract], { timeout:PACKAGE_EXTRACTION_TIMEOUT_MS }); const packageRoot = path.join(extract, packageRootName); diff --git a/browser-companion/tests/archive-tool.node.cjs b/browser-companion/tests/archive-tool.node.cjs new file mode 100644 index 00000000..f7f942ca --- /dev/null +++ b/browser-companion/tests/archive-tool.node.cjs @@ -0,0 +1,30 @@ +"use strict"; +const test=require("node:test"); +const assert=require("node:assert/strict"); +const path=require("node:path"); +const {archiveTool}=require("../scripts/archive-tool.cjs"); + +test("non-Windows packaging continues to use PATH tar",()=>{ + assert.equal(archiveTool({platform:"linux",exists:()=>{throw new Error("must not probe")}}),"tar"); +}); +test("Windows resolves the OS-owned tar.exe even if PATH omits System32",()=>{ + let checked; + const expected=path.win32.join("C:\\Windows","System32","tar.exe"); + assert.equal(archiveTool({platform:"win32",systemRoot:"C:\\Windows",exists:p=>{checked=p;return true}}),expected); + assert.equal(checked,expected); +}); +test("Windows system root can contain spaces",()=>{ + const expected=path.win32.join("C:\\Windows Dir","System32","tar.exe"); + assert.equal(archiveTool({platform:"win32",systemRoot:"C:\\Windows Dir",exists:()=>true}),expected); +}); +test("Windows rejects a missing native tar.exe instead of searching arbitrary PATH",()=>{ + assert.throws(()=>archiveTool({platform:"win32",systemRoot:"C:\\Windows",exists:()=>false}),/unavailable/); +}); +test("Windows rejects a relative system directory",()=>{ + assert.throws(()=>archiveTool({platform:"win32",systemRoot:"relative",exists:()=>true}),/local absolute drive/); +}); +test("Windows rejects remote UNC roots and traversal in SystemRoot",()=>{ + for(const root of ["\\\\server\\share", "C:\\Windows\\..\\Temp", "\\Windows"]){ + assert.throws(()=>archiveTool({platform:"win32",systemRoot:root,exists:()=>true}),/local absolute drive/); + } +}); \ No newline at end of file