app-builder-lib 27.0.0-alpha.12 → 27.0.0-alpha.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/asar/asarUtil.js +1 -1
- package/dist/asar/asarUtil.js.map +1 -1
- package/dist/codeSign/certInfo.d.ts +4 -1
- package/dist/codeSign/certInfo.d.ts.map +1 -1
- package/dist/codeSign/certInfo.js +5 -3
- package/dist/codeSign/certInfo.js.map +1 -1
- package/dist/codeSign/forceCodeSigning.d.ts +22 -0
- package/dist/codeSign/forceCodeSigning.d.ts.map +1 -0
- package/dist/codeSign/forceCodeSigning.js +18 -0
- package/dist/codeSign/forceCodeSigning.js.map +1 -0
- package/dist/codeSign/mac/macCodeSign.d.ts +13 -1
- package/dist/codeSign/mac/macCodeSign.d.ts.map +1 -1
- package/dist/codeSign/mac/macCodeSign.js +29 -2
- package/dist/codeSign/mac/macCodeSign.js.map +1 -1
- package/dist/codeSign/mac/macSignatureVerifier.d.ts +23 -0
- package/dist/codeSign/mac/macSignatureVerifier.d.ts.map +1 -0
- package/dist/codeSign/mac/macSignatureVerifier.js +96 -0
- package/dist/codeSign/mac/macSignatureVerifier.js.map +1 -0
- package/dist/codeSign/win/authenticodeSignature.d.ts +14 -2
- package/dist/codeSign/win/authenticodeSignature.d.ts.map +1 -1
- package/dist/codeSign/win/authenticodeSignature.js +78 -30
- package/dist/codeSign/win/authenticodeSignature.js.map +1 -1
- package/dist/codeSign/win/pkcs11SignManager.d.ts.map +1 -1
- package/dist/codeSign/win/pkcs11SignManager.js +4 -3
- package/dist/codeSign/win/pkcs11SignManager.js.map +1 -1
- package/dist/codeSign/win/publisherName.d.ts +31 -0
- package/dist/codeSign/win/publisherName.d.ts.map +1 -0
- package/dist/codeSign/win/publisherName.js +78 -0
- package/dist/codeSign/win/publisherName.js.map +1 -0
- package/dist/codeSign/win/signtoolBaseSignManager.d.ts +16 -9
- package/dist/codeSign/win/signtoolBaseSignManager.d.ts.map +1 -1
- package/dist/codeSign/win/signtoolBaseSignManager.js +46 -35
- package/dist/codeSign/win/signtoolBaseSignManager.js.map +1 -1
- package/dist/codeSign/win/verifyUpdatePublisher.d.ts.map +1 -1
- package/dist/codeSign/win/verifyUpdatePublisher.js +7 -4
- package/dist/codeSign/win/verifyUpdatePublisher.js.map +1 -1
- package/dist/codeSign/win/windowsSignAzureManager.d.ts +1 -1
- package/dist/codeSign/win/windowsSignAzureManager.d.ts.map +1 -1
- package/dist/codeSign/win/windowsSignAzureManager.js +24 -6
- package/dist/codeSign/win/windowsSignAzureManager.js.map +1 -1
- package/dist/configuration.d.ts +46 -3
- package/dist/configuration.d.ts.map +1 -1
- package/dist/configuration.js.map +1 -1
- package/dist/electron/mac/asarIntegrityDigest.js +2 -2
- package/dist/electron/mac/asarIntegrityDigest.js.map +1 -1
- package/dist/electron/mac/electronMacUtils.d.ts +3 -2
- package/dist/electron/mac/electronMacUtils.d.ts.map +1 -1
- package/dist/electron/mac/electronMacUtils.js +3 -2
- package/dist/electron/mac/electronMacUtils.js.map +1 -1
- package/dist/fileMatcher.d.ts.map +1 -1
- package/dist/fileMatcher.js +4 -2
- package/dist/fileMatcher.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -3
- package/dist/index.js.map +1 -1
- package/dist/indexInternal.d.ts +7 -2
- package/dist/indexInternal.d.ts.map +1 -1
- package/dist/indexInternal.js +6 -2
- package/dist/indexInternal.js.map +1 -1
- package/dist/linuxPackager.js +1 -1
- package/dist/linuxPackager.js.map +1 -1
- package/dist/macPackager.d.ts +26 -0
- package/dist/macPackager.d.ts.map +1 -1
- package/dist/macPackager.js +168 -12
- package/dist/macPackager.js.map +1 -1
- package/dist/options/PlatformSpecificBuildOptions.d.ts +15 -12
- package/dist/options/PlatformSpecificBuildOptions.d.ts.map +1 -1
- package/dist/options/PlatformSpecificBuildOptions.js.map +1 -1
- package/dist/options/SquirrelWindowsOptions.d.ts +3 -0
- package/dist/options/SquirrelWindowsOptions.d.ts.map +1 -1
- package/dist/options/SquirrelWindowsOptions.js.map +1 -1
- package/dist/options/macOptions.d.ts +7 -2
- package/dist/options/macOptions.d.ts.map +1 -1
- package/dist/options/macOptions.js.map +1 -1
- package/dist/options/winOptions.d.ts +61 -15
- package/dist/options/winOptions.d.ts.map +1 -1
- package/dist/options/winOptions.js +20 -0
- package/dist/options/winOptions.js.map +1 -1
- package/dist/packager.d.ts +1 -0
- package/dist/packager.d.ts.map +1 -1
- package/dist/packager.js +7 -2
- package/dist/packager.js.map +1 -1
- package/dist/platformPackager.d.ts +14 -5
- package/dist/platformPackager.d.ts.map +1 -1
- package/dist/platformPackager.js +44 -13
- package/dist/platformPackager.js.map +1 -1
- package/dist/publish/PublishManager.d.ts +3 -0
- package/dist/publish/PublishManager.d.ts.map +1 -1
- package/dist/publish/PublishManager.js +50 -16
- package/dist/publish/PublishManager.js.map +1 -1
- package/dist/publish/manifestUploadCheck.d.ts +10 -0
- package/dist/publish/manifestUploadCheck.d.ts.map +1 -0
- package/dist/publish/manifestUploadCheck.js +75 -0
- package/dist/publish/manifestUploadCheck.js.map +1 -0
- package/dist/publish/updateInfoBuilder.d.ts.map +1 -1
- package/dist/publish/updateInfoBuilder.js +51 -17
- package/dist/publish/updateInfoBuilder.js.map +1 -1
- package/dist/publish/updateManifestVerifier.d.ts +22 -0
- package/dist/publish/updateManifestVerifier.d.ts.map +1 -0
- package/dist/publish/updateManifestVerifier.js +65 -0
- package/dist/publish/updateManifestVerifier.js.map +1 -0
- package/dist/targets/ArchiveTarget.d.ts.map +1 -1
- package/dist/targets/ArchiveTarget.js +6 -2
- package/dist/targets/ArchiveTarget.js.map +1 -1
- package/dist/targets/archive.d.ts.map +1 -1
- package/dist/targets/archive.js +3 -3
- package/dist/targets/archive.js.map +1 -1
- package/dist/targets/linux/FlatpakTarget.js +5 -5
- package/dist/targets/linux/FlatpakTarget.js.map +1 -1
- package/dist/targets/linux/FpmTarget.d.ts.map +1 -1
- package/dist/targets/linux/FpmTarget.js +10 -7
- package/dist/targets/linux/FpmTarget.js.map +1 -1
- package/dist/targets/linux/LinuxTargetHelper.js +1 -1
- package/dist/targets/linux/LinuxTargetHelper.js.map +1 -1
- package/dist/targets/linux/appimage/AppImageTarget.d.ts.map +1 -1
- package/dist/targets/linux/appimage/AppImageTarget.js +6 -1
- package/dist/targets/linux/appimage/AppImageTarget.js.map +1 -1
- package/dist/targets/linux/appimage/appImageUtil.js +9 -9
- package/dist/targets/linux/appimage/appImageUtil.js.map +1 -1
- package/dist/targets/linux/flatpakBundle.d.ts.map +1 -1
- package/dist/targets/linux/flatpakBundle.js +25 -20
- package/dist/targets/linux/flatpakBundle.js.map +1 -1
- package/dist/targets/linux/snap/coreLegacy.d.ts.map +1 -1
- package/dist/targets/linux/snap/coreLegacy.js +22 -6
- package/dist/targets/linux/snap/coreLegacy.js.map +1 -1
- package/dist/targets/linux/snap/snapPlugs.d.ts +2 -2
- package/dist/targets/linux/snap/snapPlugs.d.ts.map +1 -1
- package/dist/targets/linux/snap/snapPlugs.js +1 -1
- package/dist/targets/linux/snap/snapPlugs.js.map +1 -1
- package/dist/targets/linux/snap/snapcraftBuilder.d.ts.map +1 -1
- package/dist/targets/linux/snap/snapcraftBuilder.js +19 -17
- package/dist/targets/linux/snap/snapcraftBuilder.js.map +1 -1
- package/dist/targets/mac/MacTargetHelper.d.ts +15 -3
- package/dist/targets/mac/MacTargetHelper.d.ts.map +1 -1
- package/dist/targets/mac/MacTargetHelper.js +96 -13
- package/dist/targets/mac/MacTargetHelper.js.map +1 -1
- package/dist/targets/mac/pkg.d.ts.map +1 -1
- package/dist/targets/mac/pkg.js +7 -5
- package/dist/targets/mac/pkg.js.map +1 -1
- package/dist/targets/win/nsis/NsisTarget.d.ts.map +1 -1
- package/dist/targets/win/nsis/NsisTarget.js +8 -2
- package/dist/targets/win/nsis/NsisTarget.js.map +1 -1
- package/dist/targets/win/nsis/nsisOptions.d.ts +1 -1
- package/dist/targets/win/nsis/nsisOptions.js.map +1 -1
- package/dist/toolsets/nsis.js +1 -1
- package/dist/toolsets/nsis.js.map +1 -1
- package/dist/toolsets/wine.d.ts +3 -0
- package/dist/toolsets/wine.d.ts.map +1 -1
- package/dist/toolsets/wine.js +14 -5
- package/dist/toolsets/wine.js.map +1 -1
- package/dist/util/appFileCopier.d.ts.map +1 -1
- package/dist/util/appFileCopier.js +9 -3
- package/dist/util/appFileCopier.js.map +1 -1
- package/dist/util/buildOutputVerifier.d.ts +40 -0
- package/dist/util/buildOutputVerifier.d.ts.map +1 -0
- package/dist/util/buildOutputVerifier.js +420 -0
- package/dist/util/buildOutputVerifier.js.map +1 -0
- package/dist/util/config/fileOptions.js +2 -2
- package/dist/util/config/fileOptions.js.map +1 -1
- package/dist/util/config/legacyConfigGuard.d.ts.map +1 -1
- package/dist/util/config/legacyConfigGuard.js +2 -2
- package/dist/util/config/legacyConfigGuard.js.map +1 -1
- package/dist/util/config/legacyOptions.d.ts +9 -2
- package/dist/util/config/legacyOptions.d.ts.map +1 -1
- package/dist/util/config/legacyOptions.js +8 -2
- package/dist/util/config/legacyOptions.js.map +1 -1
- package/dist/util/electronGet.d.ts.map +1 -1
- package/dist/util/electronGet.js +3 -1
- package/dist/util/electronGet.js.map +1 -1
- package/dist/util/flags.d.ts.map +1 -1
- package/dist/util/flags.js +3 -9
- package/dist/util/flags.js.map +1 -1
- package/dist/util/mac/macosIconComposer.d.ts.map +1 -1
- package/dist/util/mac/macosIconComposer.js +6 -5
- package/dist/util/mac/macosIconComposer.js.map +1 -1
- package/dist/util/macroExpander.js +1 -1
- package/dist/util/macroExpander.js.map +1 -1
- package/dist/util/nativeBinaryVerifier.d.ts.map +1 -1
- package/dist/util/nativeBinaryVerifier.js +3 -1
- package/dist/util/nativeBinaryVerifier.js.map +1 -1
- package/dist/util/packageMetadata.js +1 -1
- package/dist/util/packageMetadata.js.map +1 -1
- package/dist/util/removedEnvVars.d.ts +2 -0
- package/dist/util/removedEnvVars.d.ts.map +1 -1
- package/dist/util/removedEnvVars.js +15 -1
- package/dist/util/removedEnvVars.js.map +1 -1
- package/dist/util/streamSpawnToFile.d.ts +3 -1
- package/dist/util/streamSpawnToFile.d.ts.map +1 -1
- package/dist/util/streamSpawnToFile.js +6 -2
- package/dist/util/streamSpawnToFile.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/dist/version.js.map +1 -1
- package/dist/vm/ParallelsVm.d.ts +10 -0
- package/dist/vm/ParallelsVm.d.ts.map +1 -1
- package/dist/vm/ParallelsVm.js +22 -8
- package/dist/vm/ParallelsVm.js.map +1 -1
- package/dist/vm/PwshVm.d.ts +0 -1
- package/dist/vm/PwshVm.d.ts.map +1 -1
- package/dist/vm/PwshVm.js +10 -15
- package/dist/vm/PwshVm.js.map +1 -1
- package/dist/vm/WineVm.d.ts.map +1 -1
- package/dist/vm/WineVm.js +4 -4
- package/dist/vm/WineVm.js.map +1 -1
- package/dist/vm/vm.d.ts +9 -3
- package/dist/vm/vm.d.ts.map +1 -1
- package/dist/vm/vm.js +40 -32
- package/dist/vm/vm.js.map +1 -1
- package/dist/winPackager.d.ts +16 -1
- package/dist/winPackager.d.ts.map +1 -1
- package/dist/winPackager.js +77 -19
- package/dist/winPackager.js.map +1 -1
- package/package.json +9 -9
- package/scheme.json +497 -23
- package/templates/nsis/include/allowOnlyOneInstallerInstance.nsh +14 -9
- package/dist/vm/MonoVm.d.ts +0 -9
- package/dist/vm/MonoVm.d.ts.map +0 -1
- package/dist/vm/MonoVm.js +0 -16
- package/dist/vm/MonoVm.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ParallelsVm.js","sourceRoot":"","sources":["../../src/vm/ParallelsVm.ts"],"names":[],"mappings":"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","sourcesContent":["import { DebugLogger, ExtraSpawnOptions, exec, log, sanitizeDirPath, spawn, stripSensitiveEnvVars } from \"builder-util\"\nimport { ExecFileOptions, SpawnOptions, execFileSync } from \"child_process\"\nimport { homedir } from \"os\"\nimport { VmManager } from \"./vm.js\"\n\n/** @internal */\nexport async function parseVmList(debugLogger: DebugLogger) {\n // do not log output if debug - it is huge, logged using debugLogger\n let rawList = await exec(\"prlctl\", [\"list\", \"-i\", \"-s\", \"name\"], undefined, false)\n debugLogger.add(\"parallels.list\", rawList)\n\n rawList = rawList.substring(rawList.indexOf(\"ID:\"))\n\n // let match: Array<string> | null\n const result: Array<ParallelsVm> = []\n for (const info of rawList\n .split(\"\\n\\n\")\n .map(it => it.trim())\n .filter(it => it.length > 0)) {\n const vm: any = {}\n for (const line of info.split(\"\\n\")) {\n const meta = /^([^:(\"]+): (.*)$/.exec(line)\n if (meta == null) {\n continue\n }\n\n const key = meta[1].toLowerCase()\n if (key === \"id\" || key === \"os\" || key === \"name\" || key === \"state\" || key === \"name\") {\n vm[key] = meta[2].trim()\n }\n }\n result.push(vm)\n }\n return result\n}\n\nexport class ParallelsVmManager extends VmManager {\n private startPromise: Promise<any>\n\n private isExitHookAdded = false\n\n constructor(private readonly vm: ParallelsVm) {\n super()\n\n this.startPromise = this.doStartVm()\n }\n\n get pathSep(): string {\n return \"/\"\n }\n\n private handleExecuteError(error: Error): any {\n if (error.message.includes(\"Unable to open new session in this virtual machine\")) {\n throw new Error(`Please ensure that your are logged in \"${this.vm.name}\" parallels virtual machine. In the future please do not stop VM, but suspend.\\n\\n${error.message}`)\n }\n\n log.warn(\"ensure that 'Share folders' is set to 'All Disks', see https://goo.gl/E6XphP\")\n throw error\n }\n\n async exec(file: string, args: Array<string>, options?: ExecFileOptions): Promise<string> {\n await this.ensureThatVmStarted()\n // Merge caller-supplied env onto the base environment, so extra vars don't strip PATH and `prlctl` itself stays resolvable.\n const mergedOptions = options?.env != null ? { ...options, env: { ...stripSensitiveEnvVars(process.env), ...options.env } } : options\n // it is important to use \"--current-user\" to execute command under logged in user - to access certs.\n return await exec(\"prlctl\", [\"exec\", this.vm.id, \"--current-user\", file.startsWith(\"/\") ? macPathToParallelsWindows(file) : file].concat(args), mergedOptions).catch(error =>\n this.handleExecuteError(error)\n )\n }\n\n async spawn(file: string, args: Array<string>, options?: SpawnOptions, extraOptions?: ExtraSpawnOptions): Promise<any> {\n await this.ensureThatVmStarted()\n return await spawn(\"prlctl\", [\"exec\", this.vm.id, file].concat(args), options, extraOptions).catch(error => this.handleExecuteError(error))\n }\n\n private async doStartVm() {\n const vmId = this.vm.id\n const state = this.vm.state\n if (state === \"running\") {\n return\n }\n\n if (!this.isExitHookAdded) {\n this.isExitHookAdded = true\n const stopArgs = [\"suspend\", vmId]\n // Suspend the VM on normal exit and on termination signals.\n // SIGTERM/SIGINT use async exec(); the synchronous 'exit' fallback fires\n // after all async callbacks have already resolved, so execFileSync is safe.\n const suspendAsync = () => exec(\"prlctl\", stopArgs).catch(() => {})\n const suspendSync = () => {\n try {\n execFileSync(\"prlctl\", stopArgs)\n } catch {\n /* best-effort */\n }\n }\n process.once(\"SIGTERM\", () => {\n void suspendAsync()\n })\n process.once(\"SIGINT\", () => {\n void suspendAsync()\n })\n process.once(\"exit\", suspendSync)\n }\n await exec(\"prlctl\", [\"start\", vmId])\n }\n\n private ensureThatVmStarted() {\n let startPromise = this.startPromise\n if (startPromise == null) {\n startPromise = this.doStartVm()\n this.startPromise = startPromise\n }\n return startPromise\n }\n\n toVmFile(file: string): string {\n // https://stackoverflow.com/questions/4742992/cannot-access-network-drive-in-powershell-running-as-administrator\n return macPathToParallelsWindows(file)\n }\n}\n\nexport function macPathToParallelsWindows(file: string) {\n if (file.startsWith(\"C:\\\\\")) {\n return file\n }\n if (!file.startsWith(\"/\")) {\n throw new Error(`Invalid path for Parallels VM execution: \"${file}\"`)\n }\n // Validate the raw host path up-front and reject control bytes plus shell/UNC-significant\n // metacharacters BEFORE it is concatenated into the \\\\Mac\\... path passed to `prlctl exec`. The\n // `/`→`\\` conversion below only adds backslashes (not in the deny-set), so validating the input here\n // is the single sanitizing barrier for the value that reaches the command.\n // (CodeQL js/shell-command-constructed-from-input — sanitize the tainted input at the source.)\n // eslint-disable-next-line no-control-regex\n if (/[\\x00-\\x1F\\x7F\"*?<>|]/.test(file)) {\n throw new Error(`Invalid path for Parallels VM execution: \"${file}\"`)\n }\n // sanitizeDirPath additionally rejects null/newline and resolves the path; the input is already\n // validated above, so the resulting UNC path is safe to hand to prlctl.\n const sanitized = sanitizeDirPath(file)\n // \\\\Mac\\Home maps to the current user's home directory and is always accessible\n // in both --current-user and SYSTEM exec contexts (unlike \\\\Mac\\Host which requires\n // \"All Disks\" sharing to be enabled in Parallels preferences).\n const home = homedir()\n // codeql[js/shell-command-constructed-from-input] - `file` is validated above (control bytes + shell/UNC metacharacters rejected) and resolved via sanitizeDirPath; the resulting UNC path is passed to prlctl as a discrete execFile argv element (array args, no shell), so no shell interpretation occurs\n const uncPath = sanitized.startsWith(home + \"/\")\n ? \"\\\\\\\\Mac\\\\Home\\\\\" + sanitized.substring(home.length + 1).replace(/\\//g, \"\\\\\")\n : \"\\\\\\\\Mac\\\\Host\\\\\" + sanitized.replace(/\\//g, \"\\\\\")\n return uncPath\n}\n\nexport interface ParallelsVm {\n id: string\n name: string\n os: \"win-10\" | \"win-11\" | \"ubuntu\" | \"elementary\"\n state: \"running\" | \"suspended\" | \"stopped\"\n}\n"]}
|
|
1
|
+
{"version":3,"file":"ParallelsVm.js","sourceRoot":"","sources":["../../src/vm/ParallelsVm.ts"],"names":[],"mappings":"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","sourcesContent":["import { DebugLogger, Executables, ExtraSpawnOptions, exec, log, sanitizeDirPath, spawn, stripSensitiveEnvVars } from \"builder-util\"\nimport { ExecFileOptions, SpawnOptions, execFileSync } from \"child_process\"\nimport { homedir } from \"os\"\nimport { VmManager } from \"./vm.js\"\n\n/** The same executables inside a Parallels Windows guest, at the locations of a default Windows installation. */\nexport const PARALLELS_GUEST_WINDOWS_POWERSHELL = \"C:\\\\Windows\\\\System32\\\\WindowsPowerShell\\\\v1.0\\\\powershell.exe\"\nexport const PARALLELS_GUEST_PWSH = \"C:\\\\Program Files\\\\PowerShell\\\\7\\\\pwsh.exe\"\n\n/** @internal */\nexport async function parseVmList(debugLogger: DebugLogger) {\n // prlctl by absolute path; when Parallels Desktop is not installed this throws, which callers treat as \"no Parallels VM\"\n const prlctl = Executables.resolve(\"prlctl\")\n // do not log output if debug - it is huge, logged using debugLogger\n let rawList = await exec(prlctl, [\"list\", \"-i\", \"-s\", \"name\"], undefined, false)\n debugLogger.add(\"parallels.list\", rawList)\n\n rawList = rawList.substring(rawList.indexOf(\"ID:\"))\n\n // let match: Array<string> | null\n const result: Array<ParallelsVm> = []\n for (const info of rawList\n .split(\"\\n\\n\")\n .map(it => it.trim())\n .filter(it => it.length > 0)) {\n const vm: any = {}\n for (const line of info.split(\"\\n\")) {\n const meta = /^([^:(\"]+): (.*)$/.exec(line)\n if (meta == null) {\n continue\n }\n\n const key = meta[1].toLowerCase()\n if (key === \"id\" || key === \"os\" || key === \"name\" || key === \"state\" || key === \"name\") {\n vm[key] = meta[2].trim()\n }\n }\n result.push(vm)\n }\n return result\n}\n\nexport class ParallelsVmManager extends VmManager {\n private startPromise: Promise<any>\n\n private isExitHookAdded = false\n\n private readonly prlctl: string\n\n constructor(private readonly vm: ParallelsVm) {\n super()\n this.prlctl = Executables.resolve(\"prlctl\")\n\n this.startPromise = this.doStartVm()\n }\n\n get pathSep(): string {\n return \"/\"\n }\n\n private handleExecuteError(error: Error): any {\n if (error.message.includes(\"Unable to open new session in this virtual machine\")) {\n throw new Error(`Please ensure that your are logged in \"${this.vm.name}\" parallels virtual machine. In the future please do not stop VM, but suspend.\\n\\n${error.message}`)\n }\n\n log.warn(\"ensure that 'Share folders' is set to 'All Disks', see https://goo.gl/E6XphP\")\n throw error\n }\n\n async exec(file: string, args: Array<string>, options?: ExecFileOptions): Promise<string> {\n await this.ensureThatVmStarted()\n // Merge caller-supplied env onto the base environment, so extra vars don't strip the variables `prlctl` relies on (HOME, etc.).\n const mergedOptions = options?.env != null ? { ...options, env: { ...stripSensitiveEnvVars(process.env), ...options.env } } : options\n // it is important to use \"--current-user\" to execute command under logged in user - to access certs.\n return await exec(this.prlctl, [\"exec\", this.vm.id, \"--current-user\", file.startsWith(\"/\") ? macPathToParallelsWindows(file) : file].concat(args), mergedOptions).catch(error =>\n this.handleExecuteError(error)\n )\n }\n\n async spawn(file: string, args: Array<string>, options?: SpawnOptions, extraOptions?: ExtraSpawnOptions): Promise<any> {\n await this.ensureThatVmStarted()\n return await spawn(this.prlctl, [\"exec\", this.vm.id, file].concat(args), options, extraOptions).catch(error => this.handleExecuteError(error))\n }\n\n private async doStartVm() {\n const vmId = this.vm.id\n const state = this.vm.state\n if (state === \"running\") {\n return\n }\n\n if (!this.isExitHookAdded) {\n this.isExitHookAdded = true\n const stopArgs = [\"suspend\", vmId]\n // Suspend the VM on normal exit and on termination signals.\n // SIGTERM/SIGINT use async exec(); the synchronous 'exit' fallback fires\n // after all async callbacks have already resolved, so execFileSync is safe.\n const suspendAsync = () => exec(this.prlctl, stopArgs).catch(() => {})\n const suspendSync = () => {\n try {\n execFileSync(this.prlctl, stopArgs)\n } catch {\n /* best-effort */\n }\n }\n process.once(\"SIGTERM\", () => {\n void suspendAsync()\n })\n process.once(\"SIGINT\", () => {\n void suspendAsync()\n })\n process.once(\"exit\", suspendSync)\n }\n await exec(this.prlctl, [\"start\", vmId])\n }\n\n private ensureThatVmStarted() {\n let startPromise = this.startPromise\n if (startPromise == null) {\n startPromise = this.doStartVm()\n this.startPromise = startPromise\n }\n return startPromise\n }\n\n // The guest's environment is not visible from the host, so the location of a default Windows installation is used. PowerShell 7\n // is not: `prlctl exec` passes its arguments to the guest without quoting, so a path containing a space cannot be started.\n protected windowsPowerShellPaths() {\n return {\n powershell: PARALLELS_GUEST_WINDOWS_POWERSHELL,\n pwsh: { unavailable: `PowerShell 7 (${PARALLELS_GUEST_PWSH}) is not used in a Parallels VM, because prlctl exec cannot start a path that contains a space` },\n }\n }\n\n toVmFile(file: string): string {\n // https://stackoverflow.com/questions/4742992/cannot-access-network-drive-in-powershell-running-as-administrator\n return macPathToParallelsWindows(file)\n }\n}\n\nexport function macPathToParallelsWindows(file: string) {\n if (file.startsWith(\"C:\\\\\")) {\n return file\n }\n if (!file.startsWith(\"/\")) {\n throw new Error(`Invalid path for Parallels VM execution: \"${file}\"`)\n }\n // Validate the raw host path up-front and reject control bytes plus shell/UNC-significant\n // metacharacters BEFORE it is concatenated into the \\\\Mac\\... path passed to `prlctl exec`. The\n // `/`→`\\` conversion below only adds backslashes (not in the deny-set), so validating the input here\n // is the single sanitizing barrier for the value that reaches the command.\n // (CodeQL js/shell-command-constructed-from-input — sanitize the tainted input at the source.)\n // eslint-disable-next-line no-control-regex\n if (/[\\x00-\\x1F\\x7F\"*?<>|]/.test(file)) {\n throw new Error(`Invalid path for Parallels VM execution: \"${file}\"`)\n }\n // sanitizeDirPath additionally rejects null/newline and resolves the path; the input is already\n // validated above, so the resulting UNC path is safe to hand to prlctl.\n const sanitized = sanitizeDirPath(file)\n // \\\\Mac\\Home maps to the current user's home directory and is always accessible\n // in both --current-user and SYSTEM exec contexts (unlike \\\\Mac\\Host which requires\n // \"All Disks\" sharing to be enabled in Parallels preferences).\n const home = homedir()\n // codeql[js/shell-command-constructed-from-input] - `file` is validated above (control bytes + shell/UNC metacharacters rejected) and resolved via sanitizeDirPath; the resulting UNC path is passed to prlctl as a discrete execFile argv element (array args, no shell), so no shell interpretation occurs\n const uncPath = sanitized.startsWith(home + \"/\")\n ? \"\\\\\\\\Mac\\\\Home\\\\\" + sanitized.substring(home.length + 1).replace(/\\//g, \"\\\\\")\n : \"\\\\\\\\Mac\\\\Host\\\\\" + sanitized.replace(/\\//g, \"\\\\\")\n return uncPath\n}\n\nexport interface ParallelsVm {\n id: string\n name: string\n os: \"win-10\" | \"win-11\" | \"ubuntu\" | \"elementary\"\n state: \"running\" | \"suspended\" | \"stopped\"\n}\n"]}
|
package/dist/vm/PwshVm.d.ts
CHANGED
package/dist/vm/PwshVm.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PwshVm.d.ts","sourceRoot":"","sources":["../../src/vm/PwshVm.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAA;AAC/B,OAAO,
|
|
1
|
+
{"version":3,"file":"PwshVm.d.ts","sourceRoot":"","sources":["../../src/vm/PwshVm.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAA;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAEnC,qBAAa,aAAc,SAAQ,SAAS;IAG1C,QAAQ,CAAC,iBAAiB,eAMzB;CACF"}
|
package/dist/vm/PwshVm.js
CHANGED
|
@@ -1,21 +1,16 @@
|
|
|
1
|
-
import { log } from "builder-util";
|
|
1
|
+
import { Executables, log } from "builder-util";
|
|
2
2
|
import { Lazy } from "lazy-val";
|
|
3
|
-
import {
|
|
3
|
+
import { VmManager } from "./vm.js";
|
|
4
4
|
export class PwshVmManager extends VmManager {
|
|
5
5
|
constructor() {
|
|
6
|
-
super();
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
}
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
mac: "https://learn.microsoft.com/en-us/powershell/scripting/install/installing-powershell-on-macos",
|
|
15
|
-
linux: "https://learn.microsoft.com/en-us/powershell/scripting/install/installing-powershell-on-linux",
|
|
16
|
-
}, errorMessage);
|
|
17
|
-
throw new Error(errorMessage);
|
|
18
|
-
});
|
|
6
|
+
super(...arguments);
|
|
7
|
+
// pwsh by absolute path (toolsets.executables.pwsh or its default install location), never looked up on PATH
|
|
8
|
+
// (a configuration error rejects the promise, like any other failure to find PowerShell)
|
|
9
|
+
this.powershellCommand = new Lazy(() => Promise.resolve().then(() => {
|
|
10
|
+
const pwsh = Executables.resolve("pwsh");
|
|
11
|
+
log.info({ path: pwsh }, "using PowerShell 7");
|
|
12
|
+
return pwsh;
|
|
13
|
+
}));
|
|
19
14
|
}
|
|
20
15
|
}
|
|
21
16
|
//# sourceMappingURL=PwshVm.js.map
|
package/dist/vm/PwshVm.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PwshVm.js","sourceRoot":"","sources":["../../src/vm/PwshVm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"PwshVm.js","sourceRoot":"","sources":["../../src/vm/PwshVm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAA;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAEnC,MAAM,OAAO,aAAc,SAAQ,SAAS;IAA5C;;QACE,6GAA6G;QAC7G,yFAAyF;QAChF,sBAAiB,GAAG,IAAI,IAAI,CAAS,GAAG,EAAE,CACjD,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;YAC1B,MAAM,IAAI,GAAG,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;YACxC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,oBAAoB,CAAC,CAAA;YAC9C,OAAO,IAAI,CAAA;QACb,CAAC,CAAC,CACH,CAAA;IACH,CAAC;CAAA","sourcesContent":["import { Executables, log } from \"builder-util\"\nimport { Lazy } from \"lazy-val\"\nimport { VmManager } from \"./vm.js\"\n\nexport class PwshVmManager extends VmManager {\n // pwsh by absolute path (toolsets.executables.pwsh or its default install location), never looked up on PATH\n // (a configuration error rejects the promise, like any other failure to find PowerShell)\n readonly powershellCommand = new Lazy<string>(() =>\n Promise.resolve().then(() => {\n const pwsh = Executables.resolve(\"pwsh\")\n log.info({ path: pwsh }, \"using PowerShell 7\")\n return pwsh\n })\n )\n}\n"]}
|
package/dist/vm/WineVm.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WineVm.d.ts","sourceRoot":"","sources":["../../src/vm/WineVm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,iBAAiB,
|
|
1
|
+
{"version":3,"file":"WineVm.d.ts","sourceRoot":"","sources":["../../src/vm/WineVm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,iBAAiB,EAAyB,MAAM,cAAc,CAAA;AAE7E,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAE7D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAEnD,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AASnC,qBAAa,aAAc,SAAQ,SAAS;IAExC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBADjB,WAAW,EAAE,aAAa,CAAC,MAAM,CAAC,EAClC,iBAAiB,EAAE,MAAM;IAK5C,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,EAAE,eAAe,EAAE,gBAAgB,UAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAK5G,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,EAAE,YAAY,EAAE,YAAY,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC;IAIhH,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;YAIhB,QAAQ;CAavB"}
|
package/dist/vm/WineVm.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { exec } from "builder-util";
|
|
1
|
+
import { exec, stripSensitiveEnvVars } from "builder-util";
|
|
2
2
|
import * as path from "path";
|
|
3
3
|
import { getWineToolset } from "../toolsets/wine.js";
|
|
4
4
|
import { VmManager } from "./vm.js";
|
|
@@ -27,9 +27,9 @@ export class WineVmManager extends VmManager {
|
|
|
27
27
|
return exec(target, appArgs, options);
|
|
28
28
|
}
|
|
29
29
|
const { execPath: wineExe, env: wineEnv } = await getWineToolset(toolset, this.buildResourcesDir);
|
|
30
|
-
// Preserve the base process environment (PATH, HOME, TMPDIR, etc.) so Wine and child
|
|
31
|
-
//
|
|
32
|
-
return exec(wineExe, [target, ...appArgs], { ...options, env: { ...process.env, ...wineEnv, ...options.env } });
|
|
30
|
+
// Preserve the base process environment (PATH, HOME, TMPDIR, etc.) so Wine and child tools start correctly, without credentials:
|
|
31
|
+
// a caller passes those it needs. Wine env vars override the base; caller options.env wins last.
|
|
32
|
+
return exec(wineExe, [target, ...appArgs], { ...options, env: { ...stripSensitiveEnvVars(process.env), ...wineEnv, ...options.env } });
|
|
33
33
|
}
|
|
34
34
|
}
|
|
35
35
|
//# sourceMappingURL=WineVm.js.map
|
package/dist/vm/WineVm.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WineVm.js","sourceRoot":"","sources":["../../src/vm/WineVm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAqB,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"WineVm.js","sourceRoot":"","sources":["../../src/vm/WineVm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAqB,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAG7E,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;AAE5B,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AASnC,MAAM,OAAO,aAAc,SAAQ,SAAS;IAC1C,YACmB,WAAkC,EAClC,iBAAyB;QAE1C,KAAK,EAAE,CAAA;QAHU,gBAAW,GAAX,WAAW,CAAuB;QAClC,sBAAiB,GAAjB,iBAAiB,CAAQ;IAG5C,CAAC;IAED,IAAI,CAAC,IAAY,EAAE,IAAmB,EAAE,OAAyB,EAAE,gBAAgB,GAAG,IAAI;QACxF,OAAO,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAA;IACnF,CAAC;IAED,6DAA6D;IAC7D,KAAK,CAAC,IAAY,EAAE,IAAmB,EAAE,OAAsB,EAAE,YAAgC;QAC/F,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAA;IAChC,CAAC;IAED,QAAQ,CAAC,IAAY;QACnB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IACpC,CAAC;IAEO,KAAK,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,GAAG,EAAE,EAAE,OAAO,GAAG,EAAE,EAAE,OAAO,EAAe;QACvF,IAAI,OAAO,CAAC,OAAO,IAAI,IAAI,EAAE,CAAC;YAC5B,YAAY;YACZ,OAAO,CAAC,OAAO,GAAG,GAAG,GAAG,IAAI,CAAA;QAC9B,CAAC;QACD,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;QACvC,CAAC;QACD,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,MAAM,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAA;QACjG,iIAAiI;QACjI,iGAAiG;QACjG,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,MAAM,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE,GAAG,OAAO,EAAE,GAAG,EAAE,EAAE,GAAG,qBAAqB,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,GAAG,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;IACxI,CAAC;CACF","sourcesContent":["import { exec, ExtraSpawnOptions, stripSensitiveEnvVars } from \"builder-util\"\nimport { Nullish } from \"builder-util-runtime\"\nimport { ExecFileOptions, SpawnOptions } from \"child_process\"\nimport * as path from \"path\"\nimport { ToolsetConfig } from \"../configuration.js\"\nimport { getWineToolset } from \"../toolsets/wine.js\"\nimport { VmManager } from \"./vm.js\"\n\ntype WineOptions = {\n file: string\n appArgs?: Array<string>\n options?: ExecFileOptions\n toolset: ToolsetConfig[\"wine\"] | Nullish\n}\n\nexport class WineVmManager extends VmManager {\n constructor(\n private readonly wineToolset: ToolsetConfig[\"wine\"],\n private readonly buildResourcesDir: string\n ) {\n super()\n }\n\n exec(file: string, args: Array<string>, options?: ExecFileOptions, _isLogOutIfDebug = true): Promise<string> {\n return this.execWine({ file, appArgs: args, options, toolset: this.wineToolset })\n }\n\n // eslint-disable-next-line @typescript-eslint/no-unused-vars\n spawn(file: string, args: Array<string>, options?: SpawnOptions, extraOptions?: ExtraSpawnOptions): Promise<any> {\n throw new Error(\"Unsupported\")\n }\n\n toVmFile(file: string): string {\n return path.win32.join(\"Z:\", file)\n }\n\n private async execWine({ file: target, appArgs = [], options = {}, toolset }: WineOptions): Promise<string> {\n if (options.timeout == null) {\n // 2 minutes\n options.timeout = 120 * 1000\n }\n if (process.platform === \"win32\") {\n return exec(target, appArgs, options)\n }\n const { execPath: wineExe, env: wineEnv } = await getWineToolset(toolset, this.buildResourcesDir)\n // Preserve the base process environment (PATH, HOME, TMPDIR, etc.) so Wine and child tools start correctly, without credentials:\n // a caller passes those it needs. Wine env vars override the base; caller options.env wins last.\n return exec(wineExe, [target, ...appArgs], { ...options, env: { ...stripSensitiveEnvVars(process.env), ...wineEnv, ...options.env } })\n }\n}\n"]}
|
package/dist/vm/vm.d.ts
CHANGED
|
@@ -7,11 +7,17 @@ export declare class VmManager {
|
|
|
7
7
|
exec(file: string, args: Array<string>, options?: ExecFileOptions, isLogOutIfDebug?: boolean): Promise<string>;
|
|
8
8
|
spawn(file: string, args: Array<string>, options?: SpawnOptions, extraOptions?: ExtraSpawnOptions): Promise<any>;
|
|
9
9
|
toVmFile(file: string): string;
|
|
10
|
+
protected windowsPowerShellPaths(): {
|
|
11
|
+
powershell: string;
|
|
12
|
+
pwsh: {
|
|
13
|
+
path: string;
|
|
14
|
+
} | {
|
|
15
|
+
unavailable: string;
|
|
16
|
+
};
|
|
17
|
+
};
|
|
10
18
|
readonly powershellCommand: Lazy<string>;
|
|
11
19
|
}
|
|
12
|
-
export declare function getWindowsVm(debugLogger: DebugLogger): Promise<VmManager>;
|
|
20
|
+
export declare function getWindowsVm(debugLogger: DebugLogger, wineToolset?: ToolsetConfig["wine"]): Promise<VmManager>;
|
|
13
21
|
export declare function getWindowsExecVm(debugLogger: DebugLogger, wineToolset: ToolsetConfig["wine"], buildResourcesDir: string): Promise<VmManager>;
|
|
14
22
|
export declare function getLinuxVm(debugLogger: DebugLogger): Promise<VmManager | undefined>;
|
|
15
|
-
export declare const isPwshAvailable: Lazy<boolean>;
|
|
16
|
-
export declare const isCommandAvailable: (command: string, args: string[]) => Promise<boolean>;
|
|
17
23
|
//# sourceMappingURL=vm.d.ts.map
|
package/dist/vm/vm.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vm.d.ts","sourceRoot":"","sources":["../../src/vm/vm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"vm.d.ts","sourceRoot":"","sources":["../../src/vm/vm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAqB,iBAAiB,EAAgE,MAAM,cAAc,CAAA;AAC9I,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAC7D,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAA;AAE/B,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAGnD,qBAAa,SAAS;IACpB,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,EAAE,eAAe,EAAE,eAAe,UAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAO3G,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,EAAE,YAAY,EAAE,YAAY,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC;IAIhH,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAM9B,SAAS,CAAC,sBAAsB,IAAI;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE;YAAE,IAAI,EAAE,MAAM,CAAA;SAAE,GAAG;YAAE,WAAW,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE;IAU5G,QAAQ,CAAC,iBAAiB,eAgBxB;CACH;AAED,wBAAsB,YAAY,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,CAkBpH;AAID,wBAAsB,gBAAgB,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,aAAa,CAAC,MAAM,CAAC,EAAE,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAWlJ;AAYD,wBAAsB,UAAU,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAczF"}
|
package/dist/vm/vm.js
CHANGED
|
@@ -1,27 +1,36 @@
|
|
|
1
|
-
import { exec, InvalidConfigurationError, log, spawn } from "builder-util";
|
|
1
|
+
import { exec, Executables, InvalidConfigurationError, log, spawn, stripSensitiveEnvVars } from "builder-util";
|
|
2
2
|
import { Lazy } from "lazy-val";
|
|
3
3
|
import * as path from "path";
|
|
4
4
|
export class VmManager {
|
|
5
5
|
constructor() {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
6
|
+
// PowerShell 7 when it is installed, else Windows PowerShell — both by absolute path, never looked up on PATH
|
|
7
|
+
this.powershellCommand = new Lazy(async () => {
|
|
8
|
+
const { powershell, pwsh } = this.windowsPowerShellPaths();
|
|
9
|
+
let reason;
|
|
10
|
+
if ("path" in pwsh) {
|
|
11
|
+
try {
|
|
12
|
+
await this.exec(pwsh.path, ["-NoProfile", "-NonInteractive", "-Command", "exit 0"]);
|
|
13
|
+
log.info({ path: pwsh.path }, "using PowerShell 7");
|
|
14
|
+
return pwsh.path;
|
|
15
|
+
}
|
|
16
|
+
catch {
|
|
17
|
+
reason = `PowerShell 7 at ${pwsh.path} did not run`;
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
else {
|
|
21
|
+
reason = pwsh.unavailable;
|
|
22
|
+
}
|
|
23
|
+
log.warn({ path: powershell }, `${reason}; using Windows PowerShell`);
|
|
24
|
+
return powershell;
|
|
16
25
|
});
|
|
17
26
|
}
|
|
18
27
|
get pathSep() {
|
|
19
28
|
return path.sep;
|
|
20
29
|
}
|
|
21
30
|
exec(file, args, options, isLogOutIfDebug = true) {
|
|
22
|
-
// Mirror WineVmManager: merge caller-supplied env
|
|
23
|
-
// the
|
|
24
|
-
const mergedOptions = options?.env != null ? { ...options, env: { ...process.env, ...options.env } } : options;
|
|
31
|
+
// Mirror WineVmManager: merge caller-supplied env onto the base environment so extra vars don't strip it (PATH, SystemRoot, etc.)
|
|
32
|
+
// on native Windows. Like the environment of a call without one, the base has no credentials: a caller passes those it needs.
|
|
33
|
+
const mergedOptions = options?.env != null ? { ...options, env: { ...stripSensitiveEnvVars(process.env), ...options.env } } : options;
|
|
25
34
|
return exec(file, args, mergedOptions, isLogOutIfDebug);
|
|
26
35
|
}
|
|
27
36
|
spawn(file, args, options, extraOptions) {
|
|
@@ -30,21 +39,31 @@ export class VmManager {
|
|
|
30
39
|
toVmFile(file) {
|
|
31
40
|
return file;
|
|
32
41
|
}
|
|
42
|
+
// Absolute path of Windows PowerShell on the machine this manager runs commands on, and of PowerShell 7 — or, as a sentence, why
|
|
43
|
+
// PowerShell 7 is not used there
|
|
44
|
+
windowsPowerShellPaths() {
|
|
45
|
+
// PowerShell 7 is optional, unless toolsets.executables.pwsh has a location for this operating system: then it has to be found there
|
|
46
|
+
const pwsh = Executables.isConfigured("pwsh") ? Executables.resolve("pwsh") : Executables.find("pwsh");
|
|
47
|
+
return {
|
|
48
|
+
powershell: Executables.resolve("powershell"),
|
|
49
|
+
pwsh: pwsh == null ? { unavailable: "PowerShell 7 (pwsh) is not installed at its default install location" } : { path: pwsh },
|
|
50
|
+
};
|
|
51
|
+
}
|
|
33
52
|
}
|
|
34
|
-
export async function getWindowsVm(debugLogger) {
|
|
53
|
+
export async function getWindowsVm(debugLogger, wineToolset) {
|
|
35
54
|
const parallelsVmModule = await import("./ParallelsVm.js");
|
|
36
55
|
let vmList = [];
|
|
37
56
|
try {
|
|
38
57
|
vmList = await parseWindowsVmList(debugLogger);
|
|
39
58
|
}
|
|
40
59
|
catch (_error) {
|
|
41
|
-
if ((
|
|
60
|
+
if (Executables.find("pwsh") != null && isWineAvailable(wineToolset)) {
|
|
42
61
|
const vmModule = await import("./PwshVm.js");
|
|
43
62
|
return new vmModule.PwshVmManager();
|
|
44
63
|
}
|
|
45
64
|
}
|
|
46
65
|
if (vmList.length === 0) {
|
|
47
|
-
throw new InvalidConfigurationError(
|
|
66
|
+
throw new InvalidConfigurationError(`Cannot find suitable Parallels Desktop virtual machine (Windows 10 is required) and cannot find \`pwsh\` and \`wine\` locally. electron-builder starts them only from an absolute path, never from PATH: from their default install locations, or from toolsets.executables.pwsh and toolsets.executables.wine`);
|
|
48
67
|
}
|
|
49
68
|
return new parallelsVmModule.ParallelsVmManager(preferRunningVm(vmList));
|
|
50
69
|
}
|
|
@@ -86,19 +105,8 @@ export async function getLinuxVm(debugLogger) {
|
|
|
86
105
|
return undefined;
|
|
87
106
|
}
|
|
88
107
|
}
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
return isCommandAvailable("pwsh", ["--version"]);
|
|
94
|
-
});
|
|
95
|
-
export const isCommandAvailable = async (command, args) => {
|
|
96
|
-
try {
|
|
97
|
-
await exec(command, args);
|
|
98
|
-
return true;
|
|
99
|
-
}
|
|
100
|
-
catch {
|
|
101
|
-
return false;
|
|
102
|
-
}
|
|
103
|
-
};
|
|
108
|
+
// Without running anything: a custom Wine bundle is configured, or the host Wine is found (it is never looked up on PATH)
|
|
109
|
+
function isWineAvailable(wineToolset) {
|
|
110
|
+
return (typeof wineToolset === "object" && wineToolset != null) || Executables.find("wine") != null;
|
|
111
|
+
}
|
|
104
112
|
//# sourceMappingURL=vm.js.map
|
package/dist/vm/vm.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vm.js","sourceRoot":"","sources":["../../src/vm/vm.ts"],"names":[],"mappings":"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","sourcesContent":["import { DebugLogger, exec, ExtraSpawnOptions, InvalidConfigurationError, log, spawn } from \"builder-util\"\nimport { ExecFileOptions, SpawnOptions } from \"child_process\"\nimport { Lazy } from \"lazy-val\"\nimport * as path from \"path\"\nimport { ToolsetConfig } from \"../configuration.js\"\nimport { ParallelsVm } from \"./ParallelsVm.js\"\nexport class VmManager {\n get pathSep(): string {\n return path.sep\n }\n\n exec(file: string, args: Array<string>, options?: ExecFileOptions, isLogOutIfDebug = true): Promise<string> {\n // Mirror WineVmManager: merge caller-supplied env with process.env so extra vars don't strip\n // the base environment (PATH, SystemRoot, etc.) on native Windows.\n const mergedOptions = options?.env != null ? { ...options, env: { ...process.env, ...options.env } } : options\n return exec(file, args, mergedOptions, isLogOutIfDebug)\n }\n\n spawn(file: string, args: Array<string>, options?: SpawnOptions, extraOptions?: ExtraSpawnOptions): Promise<any> {\n return spawn(file, args, options, extraOptions)\n }\n\n toVmFile(file: string): string {\n return file\n }\n\n readonly powershellCommand = new Lazy(() => {\n return this.exec(\"powershell.exe\", [\"-NoProfile\", \"-NonInteractive\", \"-Command\", `Get-Command pwsh.exe`])\n .then(() => {\n log.info(null, \"identified pwsh.exe\")\n return \"pwsh.exe\"\n })\n .catch(() => {\n log.info(null, \"unable to find pwsh.exe, falling back to powershell.exe\")\n return \"powershell.exe\"\n })\n })\n}\n\nexport async function getWindowsVm(debugLogger: DebugLogger): Promise<VmManager> {\n const parallelsVmModule = await import(\"./ParallelsVm.js\")\n let vmList: ParallelsVm[] = []\n try {\n vmList = await parseWindowsVmList(debugLogger)\n } catch (_error) {\n if ((await isPwshAvailable.value) && (await isWineAvailable.value)) {\n const vmModule = await import(\"./PwshVm.js\")\n return new vmModule.PwshVmManager()\n }\n }\n if (vmList.length === 0) {\n throw new InvalidConfigurationError(\"Cannot find suitable Parallels Desktop virtual machine (Windows 10 is required) and cannot access `pwsh` and `wine` locally\")\n }\n\n return new parallelsVmModule.ParallelsVmManager(preferRunningVm(vmList))\n}\n\n// Runs Windows executables: natively on Windows, else in a Parallels Windows VM when one exists, else via wine.\n// Unlike getWindowsVm, it never falls back to PwshVmManager, which runs the file natively and requires pwsh.\nexport async function getWindowsExecVm(debugLogger: DebugLogger, wineToolset: ToolsetConfig[\"wine\"], buildResourcesDir: string): Promise<VmManager> {\n if (process.platform === \"win32\") {\n return new VmManager()\n }\n const vmList = await parseWindowsVmList(debugLogger).catch(() => [])\n if (vmList.length > 0) {\n const parallelsVmModule = await import(\"./ParallelsVm.js\")\n return new parallelsVmModule.ParallelsVmManager(preferRunningVm(vmList))\n }\n const wineVmModule = await import(\"./WineVm.js\")\n return new wineVmModule.WineVmManager(wineToolset, buildResourcesDir)\n}\n\nasync function parseWindowsVmList(debugLogger: DebugLogger): Promise<ParallelsVm[]> {\n const parallelsVmModule = await import(\"./ParallelsVm.js\")\n return (await parallelsVmModule.parseVmList(debugLogger)).filter(it => [\"win-10\", \"win-11\"].includes(it.os))\n}\n\n// prefer running or suspended vm\nfunction preferRunningVm(vmList: ParallelsVm[]): ParallelsVm {\n return vmList.find(it => it.state === \"running\") || vmList.find(it => it.state === \"suspended\") || vmList[0]\n}\n\nexport async function getLinuxVm(debugLogger: DebugLogger): Promise<VmManager | undefined> {\n if (process.platform !== \"darwin\") {\n return undefined\n }\n try {\n const parallelsVmModule = await import(\"./ParallelsVm.js\")\n const vmList = (await parallelsVmModule.parseVmList(debugLogger)).filter(it => it.os === \"ubuntu\")\n if (vmList.length === 0) {\n return undefined\n }\n return new parallelsVmModule.ParallelsVmManager(preferRunningVm(vmList))\n } catch {\n return undefined\n }\n}\n\nconst isWineAvailable = new Lazy(async () => {\n return isCommandAvailable(\"wine\", [\"--version\"])\n})\n\nexport const isPwshAvailable = new Lazy(async () => {\n return isCommandAvailable(\"pwsh\", [\"--version\"])\n})\n\nexport const isCommandAvailable = async (command: string, args: string[]) => {\n try {\n await exec(command, args)\n return true\n } catch {\n return false\n }\n}\n"]}
|
|
1
|
+
{"version":3,"file":"vm.js","sourceRoot":"","sources":["../../src/vm/vm.ts"],"names":[],"mappings":"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","sourcesContent":["import { DebugLogger, exec, Executables, ExtraSpawnOptions, InvalidConfigurationError, log, spawn, stripSensitiveEnvVars } from \"builder-util\"\nimport { ExecFileOptions, SpawnOptions } from \"child_process\"\nimport { Lazy } from \"lazy-val\"\nimport * as path from \"path\"\nimport { ToolsetConfig } from \"../configuration.js\"\nimport { ParallelsVm } from \"./ParallelsVm.js\"\n\nexport class VmManager {\n get pathSep(): string {\n return path.sep\n }\n\n exec(file: string, args: Array<string>, options?: ExecFileOptions, isLogOutIfDebug = true): Promise<string> {\n // Mirror WineVmManager: merge caller-supplied env onto the base environment so extra vars don't strip it (PATH, SystemRoot, etc.)\n // on native Windows. Like the environment of a call without one, the base has no credentials: a caller passes those it needs.\n const mergedOptions = options?.env != null ? { ...options, env: { ...stripSensitiveEnvVars(process.env), ...options.env } } : options\n return exec(file, args, mergedOptions, isLogOutIfDebug)\n }\n\n spawn(file: string, args: Array<string>, options?: SpawnOptions, extraOptions?: ExtraSpawnOptions): Promise<any> {\n return spawn(file, args, options, extraOptions)\n }\n\n toVmFile(file: string): string {\n return file\n }\n\n // Absolute path of Windows PowerShell on the machine this manager runs commands on, and of PowerShell 7 — or, as a sentence, why\n // PowerShell 7 is not used there\n protected windowsPowerShellPaths(): { powershell: string; pwsh: { path: string } | { unavailable: string } } {\n // PowerShell 7 is optional, unless toolsets.executables.pwsh has a location for this operating system: then it has to be found there\n const pwsh = Executables.isConfigured(\"pwsh\") ? Executables.resolve(\"pwsh\") : Executables.find(\"pwsh\")\n return {\n powershell: Executables.resolve(\"powershell\"),\n pwsh: pwsh == null ? { unavailable: \"PowerShell 7 (pwsh) is not installed at its default install location\" } : { path: pwsh },\n }\n }\n\n // PowerShell 7 when it is installed, else Windows PowerShell — both by absolute path, never looked up on PATH\n readonly powershellCommand = new Lazy(async () => {\n const { powershell, pwsh } = this.windowsPowerShellPaths()\n let reason: string\n if (\"path\" in pwsh) {\n try {\n await this.exec(pwsh.path, [\"-NoProfile\", \"-NonInteractive\", \"-Command\", \"exit 0\"])\n log.info({ path: pwsh.path }, \"using PowerShell 7\")\n return pwsh.path\n } catch {\n reason = `PowerShell 7 at ${pwsh.path} did not run`\n }\n } else {\n reason = pwsh.unavailable\n }\n log.warn({ path: powershell }, `${reason}; using Windows PowerShell`)\n return powershell\n })\n}\n\nexport async function getWindowsVm(debugLogger: DebugLogger, wineToolset?: ToolsetConfig[\"wine\"]): Promise<VmManager> {\n const parallelsVmModule = await import(\"./ParallelsVm.js\")\n let vmList: ParallelsVm[] = []\n try {\n vmList = await parseWindowsVmList(debugLogger)\n } catch (_error) {\n if (Executables.find(\"pwsh\") != null && isWineAvailable(wineToolset)) {\n const vmModule = await import(\"./PwshVm.js\")\n return new vmModule.PwshVmManager()\n }\n }\n if (vmList.length === 0) {\n throw new InvalidConfigurationError(\n `Cannot find suitable Parallels Desktop virtual machine (Windows 10 is required) and cannot find \\`pwsh\\` and \\`wine\\` locally. electron-builder starts them only from an absolute path, never from PATH: from their default install locations, or from toolsets.executables.pwsh and toolsets.executables.wine`\n )\n }\n\n return new parallelsVmModule.ParallelsVmManager(preferRunningVm(vmList))\n}\n\n// Runs Windows executables: natively on Windows, else in a Parallels Windows VM when one exists, else via wine.\n// Unlike getWindowsVm, it never falls back to PwshVmManager, which runs the file natively and requires pwsh.\nexport async function getWindowsExecVm(debugLogger: DebugLogger, wineToolset: ToolsetConfig[\"wine\"], buildResourcesDir: string): Promise<VmManager> {\n if (process.platform === \"win32\") {\n return new VmManager()\n }\n const vmList = await parseWindowsVmList(debugLogger).catch(() => [])\n if (vmList.length > 0) {\n const parallelsVmModule = await import(\"./ParallelsVm.js\")\n return new parallelsVmModule.ParallelsVmManager(preferRunningVm(vmList))\n }\n const wineVmModule = await import(\"./WineVm.js\")\n return new wineVmModule.WineVmManager(wineToolset, buildResourcesDir)\n}\n\nasync function parseWindowsVmList(debugLogger: DebugLogger): Promise<ParallelsVm[]> {\n const parallelsVmModule = await import(\"./ParallelsVm.js\")\n return (await parallelsVmModule.parseVmList(debugLogger)).filter(it => [\"win-10\", \"win-11\"].includes(it.os))\n}\n\n// prefer running or suspended vm\nfunction preferRunningVm(vmList: ParallelsVm[]): ParallelsVm {\n return vmList.find(it => it.state === \"running\") || vmList.find(it => it.state === \"suspended\") || vmList[0]\n}\n\nexport async function getLinuxVm(debugLogger: DebugLogger): Promise<VmManager | undefined> {\n if (process.platform !== \"darwin\") {\n return undefined\n }\n try {\n const parallelsVmModule = await import(\"./ParallelsVm.js\")\n const vmList = (await parallelsVmModule.parseVmList(debugLogger)).filter(it => it.os === \"ubuntu\")\n if (vmList.length === 0) {\n return undefined\n }\n return new parallelsVmModule.ParallelsVmManager(preferRunningVm(vmList))\n } catch {\n return undefined\n }\n}\n\n// Without running anything: a custom Wine bundle is configured, or the host Wine is found (it is never looked up on PATH)\nfunction isWineAvailable(wineToolset: ToolsetConfig[\"wine\"] | undefined): boolean {\n return (typeof wineToolset === \"object\" && wineToolset != null) || Executables.find(\"wine\") != null\n}\n"]}
|
package/dist/winPackager.d.ts
CHANGED
|
@@ -6,7 +6,7 @@ import { AfterPackContext } from "./configuration.js";
|
|
|
6
6
|
import { Target } from "./core.js";
|
|
7
7
|
import { RequestedExecutionLevel, WindowsConfiguration } from "./options/winOptions.js";
|
|
8
8
|
import { Packager } from "./packager.js";
|
|
9
|
-
import { PlatformPackager } from "./platformPackager.js";
|
|
9
|
+
import { DoPackOptions, PlatformPackager } from "./platformPackager.js";
|
|
10
10
|
import { VmManager } from "./vm/vm.js";
|
|
11
11
|
export declare class WinPackager extends PlatformPackager<WindowsConfiguration> {
|
|
12
12
|
_iconPath: Lazy<string | null>;
|
|
@@ -22,6 +22,21 @@ export declare class WinPackager extends PlatformPackager<WindowsConfiguration>
|
|
|
22
22
|
doGetCscPassword(): string | Nullish;
|
|
23
23
|
signIf(file: string): Promise<SigningResult>;
|
|
24
24
|
private _sign;
|
|
25
|
+
/**
|
|
26
|
+
* Reads the Authenticode signature of a file back under forceCodeSigning, so that a signer which reported success
|
|
27
|
+
* without signing the file (a custom `win.sign.sign` hook that signs another path, a tool that exits 0) fails the
|
|
28
|
+
* build. Only Authenticode file types are read. Any status but HashMismatch passes, since the build host may not trust
|
|
29
|
+
* the signing chain that the users' machines trust. A signature that cannot be read fails on Windows - where it is read
|
|
30
|
+
* with the API electron-updater verifies updates with - and only warns elsewhere.
|
|
31
|
+
*/
|
|
32
|
+
private verifySignedFile;
|
|
33
|
+
protected doPack(packOptions: DoPackOptions<WindowsConfiguration>): Promise<void>;
|
|
34
|
+
/**
|
|
35
|
+
* electron-builder does not sign a prepackaged app (doPack returns early for it, so signApp never runs), so under
|
|
36
|
+
* forceCodeSigning its executable must already carry a signature: the targets would otherwise wrap an unsigned app in
|
|
37
|
+
* a signed installer.
|
|
38
|
+
*/
|
|
39
|
+
private verifyPrepackagedExecutable;
|
|
25
40
|
signAndEditResources(file: string, arch: Arch, outDir: string, internalName?: string | null, requestedExecutionLevel?: RequestedExecutionLevel | null): Promise<SigningResult>;
|
|
26
41
|
private shouldSignFile;
|
|
27
42
|
protected createTransformerForExtraFiles(packContext: AfterPackContext): FileTransformer | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"winPackager.d.ts","sourceRoot":"","sources":["../src/winPackager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAA+B,eAAe,EAAwC,MAAM,cAAc,CAAA;AAEvH,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAI9C,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"winPackager.d.ts","sourceRoot":"","sources":["../src/winPackager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAA+B,eAAe,EAAwC,MAAM,cAAc,CAAA;AAEvH,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAI9C,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAA;AAM/B,OAAO,EAA0D,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAGhH,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAwB,MAAM,EAAE,MAAM,WAAW,CAAA;AACxD,OAAO,EAA4B,uBAAuB,EAA6D,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAC5K,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAiB,aAAa,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAatF,OAAO,EAAkC,SAAS,EAAE,MAAM,YAAY,CAAA;AAOtE,qBAAa,WAAY,SAAQ,gBAAgB,CAAC,oBAAoB,CAAC;IACrE,SAAS,sBAA+C;IAExD,QAAQ,CAAC,EAAE,kBAA4J;IAEvK,QAAQ,CAAC,MAAM,kBAAoH;IAEnI,QAAQ,CAAC,cAAc,4DAIrB;IAGF,OAAO,CAAC,YAAY,CAAmD;IAEvE,IAAI,8BAA8B,IAAI,OAAO,CAE5C;gBAEW,IAAI,EAAE,QAAQ;IAI1B,IAAI,aAAa,IAAI,KAAK,CAAC,MAAM,CAAC,CAEjC;IAED,aAAa,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,KAAK,IAAI,GAAG,IAAI;IA2DhH,WAAW;IAIX,gBAAgB,IAAI,MAAM,GAAG,OAAO;IAM9B,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;YA2BpC,KAAK;IAkBnB;;;;;;OAMG;YACW,gBAAgB;cAsBd,MAAM,CAAC,WAAW,EAAE,aAAa,CAAC,oBAAoB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAOvF;;;;OAIG;YACW,2BAA2B;IAenC,oBAAoB,CACxB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,EAC5B,uBAAuB,CAAC,EAAE,uBAAuB,GAAG,IAAI,GACvD,OAAO,CAAC,aAAa,CAAC;IA4FzB,OAAO,CAAC,cAAc;IAItB,SAAS,CAAC,8BAA8B,CAAC,WAAW,EAAE,gBAAgB,GAAG,eAAe,GAAG,IAAI;cAgB/E,OAAO,CAAC,WAAW,EAAE,gBAAgB,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC;IA0C/F,OAAO,CAAC,iBAAiB;CAG1B"}
|
package/dist/winPackager.js
CHANGED
|
@@ -6,11 +6,13 @@ import { readdir } from "fs/promises";
|
|
|
6
6
|
import { Lazy } from "lazy-val";
|
|
7
7
|
import * as path from "path";
|
|
8
8
|
import { readAsarHeader } from "./asar/asar.js";
|
|
9
|
+
import { forceCodeSigningError, VERIFICATION_FAILED_ERROR_CODE } from "./codeSign/forceCodeSigning.js";
|
|
10
|
+
import { authenticodeSignatureProblem, isAuthenticodeFileType, readAuthenticodeSigner } from "./codeSign/win/authenticodeSignature.js";
|
|
9
11
|
import { createSignManager } from "./codeSign/win/signManager.js";
|
|
10
12
|
import { combineSignResults, isSignResultSigned } from "./codeSign/signResult.js";
|
|
11
13
|
import { signWindows } from "./codeSign/win/windowsCodeSign.js";
|
|
12
14
|
import { DIR_TARGET, Platform } from "./core.js";
|
|
13
|
-
import { isWindowsSigningDisabled, resolveWindowsSigningConfiguration } from "./options/winOptions.js";
|
|
15
|
+
import { isWindowsSigningDisabled, resolveWindowsSigningConfiguration, shouldSignWindowsFile } from "./options/winOptions.js";
|
|
14
16
|
import { chooseNotNull, PlatformPackager } from "./platformPackager.js";
|
|
15
17
|
import MsixTarget from "./targets/win/MsixTarget.js";
|
|
16
18
|
import AppXTarget from "./targets/win/AppxTarget.js";
|
|
@@ -26,6 +28,8 @@ import { editWindowsResources } from "./util/win/resEdit.js";
|
|
|
26
28
|
import { time } from "./util/timer.js";
|
|
27
29
|
import { getWindowsExecVm, getWindowsVm, VmManager } from "./vm/vm.js";
|
|
28
30
|
const _require = createRequire(import.meta.url);
|
|
31
|
+
const SIGNING_DISABLED_WITH_FORCE_CODE_SIGNING = "Signing is disabled (`sign: false`) but `forceCodeSigning` is enabled. Remove one of these options.";
|
|
32
|
+
const SIGN_IN_PLACE_HINT = "A custom win.sign.sign hook must sign the file at configuration.path in place.";
|
|
29
33
|
export class WinPackager extends PlatformPackager {
|
|
30
34
|
get isForceCodeSigningVerification() {
|
|
31
35
|
return this.platformSpecificBuildOptions.verifyUpdateCodeSignature !== false;
|
|
@@ -33,7 +37,7 @@ export class WinPackager extends PlatformPackager {
|
|
|
33
37
|
constructor(info) {
|
|
34
38
|
super(info, Platform.WINDOWS);
|
|
35
39
|
this._iconPath = new Lazy(() => this.getOrConvertIcon("ico"));
|
|
36
|
-
this.vm = new Lazy(() => (process.platform === "win32" ? Promise.resolve(new VmManager()) : getWindowsVm(this.debugLogger)));
|
|
40
|
+
this.vm = new Lazy(() => (process.platform === "win32" ? Promise.resolve(new VmManager()) : getWindowsVm(this.debugLogger, this.config.toolsets?.wine)));
|
|
37
41
|
// Like `vm`, but for running Windows executables: falls back to wine rather than PwshVmManager (which runs files natively)
|
|
38
42
|
this.execVm = new Lazy(() => getWindowsExecVm(this.debugLogger, this.config.toolsets?.wine, this.buildResourcesDir));
|
|
39
43
|
this.signingManager = new Lazy(async () => {
|
|
@@ -111,10 +115,20 @@ export class WinPackager extends PlatformPackager {
|
|
|
111
115
|
async signIf(file) {
|
|
112
116
|
const logFields = { file: log.filePath(file) };
|
|
113
117
|
if (!this.shouldSignFile(file, true)) {
|
|
114
|
-
|
|
118
|
+
if (this.forceCodeSigning) {
|
|
119
|
+
// an explicit signExts exclusion is honored under forceCodeSigning, but not silently
|
|
120
|
+
log.warn({ ...logFields, reason: "excluded by signExts" }, "file is not signed although forceCodeSigning is enabled");
|
|
121
|
+
}
|
|
122
|
+
else {
|
|
123
|
+
log.info(logFields, "file signing skipped via signExts configuration");
|
|
124
|
+
}
|
|
115
125
|
return "skipped:filtered";
|
|
116
126
|
}
|
|
117
127
|
if (isWindowsSigningDisabled(this.platformSpecificBuildOptions)) {
|
|
128
|
+
// also reached by targets of a prepackaged app, which never runs signApp's check
|
|
129
|
+
if (this.forceCodeSigning) {
|
|
130
|
+
throw new InvalidConfigurationError(SIGNING_DISABLED_WITH_FORCE_CODE_SIGNING);
|
|
131
|
+
}
|
|
118
132
|
log.info(logFields, "file signing disabled (`sign: false` or `sign: null`)");
|
|
119
133
|
return "skipped:disabled";
|
|
120
134
|
}
|
|
@@ -133,8 +147,63 @@ export class WinPackager extends PlatformPackager {
|
|
|
133
147
|
if (!isSignResultSigned(result) && this.forceCodeSigning) {
|
|
134
148
|
throw new InvalidConfigurationError(`App is not signed and "forceCodeSigning" is set to true, please ensure that code signing configuration is correct, please see https://electron.build/docs/features/code-signing`);
|
|
135
149
|
}
|
|
150
|
+
if (this.forceCodeSigning) {
|
|
151
|
+
await this.verifySignedFile(file, "the signed file", SIGN_IN_PLACE_HINT);
|
|
152
|
+
}
|
|
136
153
|
return result;
|
|
137
154
|
}
|
|
155
|
+
/**
|
|
156
|
+
* Reads the Authenticode signature of a file back under forceCodeSigning, so that a signer which reported success
|
|
157
|
+
* without signing the file (a custom `win.sign.sign` hook that signs another path, a tool that exits 0) fails the
|
|
158
|
+
* build. Only Authenticode file types are read. Any status but HashMismatch passes, since the build host may not trust
|
|
159
|
+
* the signing chain that the users' machines trust. A signature that cannot be read fails on Windows - where it is read
|
|
160
|
+
* with the API electron-updater verifies updates with - and only warns elsewhere.
|
|
161
|
+
*/
|
|
162
|
+
async verifySignedFile(file, subject, hint) {
|
|
163
|
+
if (!isAuthenticodeFileType(file)) {
|
|
164
|
+
log.debug({ file: log.filePath(file) }, "signature not read back: not an Authenticode file type");
|
|
165
|
+
return;
|
|
166
|
+
}
|
|
167
|
+
const signer = await this.readAuthenticodeSignature(file);
|
|
168
|
+
const problem = authenticodeSignatureProblem(signer);
|
|
169
|
+
if (problem == null) {
|
|
170
|
+
return;
|
|
171
|
+
}
|
|
172
|
+
if (signer.type === "unreadable" && process.platform !== "win32") {
|
|
173
|
+
log.warn({ file: log.filePath(file), reason: signer.reason }, "cannot read the Authenticode signature back on this host, so forceCodeSigning does not verify it");
|
|
174
|
+
return;
|
|
175
|
+
}
|
|
176
|
+
throw forceCodeSigningError(`forceCodeSigning is enabled, but ${subject} ${log.filePath(file)} ${problem}. ${hint}`, VERIFICATION_FAILED_ERROR_CODE);
|
|
177
|
+
}
|
|
178
|
+
/** @internal reads the Authenticode signature of a file back for {@link verifySignedFile}; tests replace it */
|
|
179
|
+
readAuthenticodeSignature(file) {
|
|
180
|
+
return readAuthenticodeSigner(file);
|
|
181
|
+
}
|
|
182
|
+
async doPack(packOptions) {
|
|
183
|
+
if (this.packagerOptions.prepackaged != null && this.forceCodeSigning) {
|
|
184
|
+
await this.verifyPrepackagedExecutable(packOptions.appOutDir);
|
|
185
|
+
}
|
|
186
|
+
await super.doPack(packOptions);
|
|
187
|
+
}
|
|
188
|
+
/**
|
|
189
|
+
* electron-builder does not sign a prepackaged app (doPack returns early for it, so signApp never runs), so under
|
|
190
|
+
* forceCodeSigning its executable must already carry a signature: the targets would otherwise wrap an unsigned app in
|
|
191
|
+
* a signed installer.
|
|
192
|
+
*/
|
|
193
|
+
async verifyPrepackagedExecutable(appOutDir) {
|
|
194
|
+
if (isWindowsSigningDisabled(this.platformSpecificBuildOptions)) {
|
|
195
|
+
throw new InvalidConfigurationError(SIGNING_DISABLED_WITH_FORCE_CODE_SIGNING);
|
|
196
|
+
}
|
|
197
|
+
const exe = path.join(appOutDir, `${this.appInfo.productFilename}.exe`);
|
|
198
|
+
if (!this.shouldSignFile(exe, true)) {
|
|
199
|
+
log.warn({ file: log.filePath(exe), reason: "excluded by signExts" }, "the prepackaged app's executable is not verified although forceCodeSigning is enabled");
|
|
200
|
+
return;
|
|
201
|
+
}
|
|
202
|
+
if (!(await exists(exe))) {
|
|
203
|
+
throw forceCodeSigningError(`forceCodeSigning is enabled, but the prepackaged app has no ${log.filePath(exe)} whose signature could be verified.`);
|
|
204
|
+
}
|
|
205
|
+
await this.verifySignedFile(exe, "the executable of the prepackaged app", "electron-builder does not sign a prepackaged app: sign it before packaging it.");
|
|
206
|
+
}
|
|
138
207
|
async signAndEditResources(file, arch, outDir, internalName, requestedExecutionLevel) {
|
|
139
208
|
const appInfo = this.appInfo;
|
|
140
209
|
const files = [];
|
|
@@ -195,6 +264,9 @@ export class WinPackager extends PlatformPackager {
|
|
|
195
264
|
if (await buildCacheManager.copyIfValid(await digest(hash, files))) {
|
|
196
265
|
timer.end();
|
|
197
266
|
// the cache is only used when signing is configured (cscInfo != null), so the restored executable was signed when it was cached
|
|
267
|
+
if (this.forceCodeSigning && this.shouldSignFile(file, true)) {
|
|
268
|
+
await this.verifySignedFile(file, "the executable restored from the build cache", "Clear the build cache (or set ELECTRON_BUILDER_DISABLE_BUILD_CACHE=true) and build again.");
|
|
269
|
+
}
|
|
198
270
|
return "signed";
|
|
199
271
|
}
|
|
200
272
|
timer.end();
|
|
@@ -209,21 +281,7 @@ export class WinPackager extends PlatformPackager {
|
|
|
209
281
|
return signResult;
|
|
210
282
|
}
|
|
211
283
|
shouldSignFile(file, fallbackValue = false) {
|
|
212
|
-
|
|
213
|
-
const signExts = this.platformSpecificBuildOptions.signExts;
|
|
214
|
-
if (!signExts?.length) {
|
|
215
|
-
return isExe || fallbackValue;
|
|
216
|
-
}
|
|
217
|
-
// process patterns ( !exe => exclude .exe, .dll => include .dll )
|
|
218
|
-
// we process first to allow literal negatives in case a filename matches "help!.txt" or similar
|
|
219
|
-
if (signExts.some(ext => file.endsWith(ext))) {
|
|
220
|
-
return true;
|
|
221
|
-
}
|
|
222
|
-
// process negative patterns
|
|
223
|
-
if (signExts.some(ext => ext.startsWith("!") && file.endsWith(ext.substring(1)))) {
|
|
224
|
-
return false;
|
|
225
|
-
}
|
|
226
|
-
return isExe || fallbackValue;
|
|
284
|
+
return shouldSignWindowsFile(file, this.platformSpecificBuildOptions.signExts, fallbackValue);
|
|
227
285
|
}
|
|
228
286
|
createTransformerForExtraFiles(packContext) {
|
|
229
287
|
if (isWindowsSigningDisabled(this.platformSpecificBuildOptions)) {
|
|
@@ -243,7 +301,7 @@ export class WinPackager extends PlatformPackager {
|
|
|
243
301
|
const exeFileName = `${this.appInfo.productFilename}.exe`;
|
|
244
302
|
const signingDisabled = isWindowsSigningDisabled(this.platformSpecificBuildOptions);
|
|
245
303
|
if (signingDisabled && this.forceCodeSigning) {
|
|
246
|
-
throw new InvalidConfigurationError(
|
|
304
|
+
throw new InvalidConfigurationError(SIGNING_DISABLED_WITH_FORCE_CODE_SIGNING);
|
|
247
305
|
}
|
|
248
306
|
const results = [];
|
|
249
307
|
const files = await readdir(packContext.appOutDir);
|