app-builder-lib 27.0.0-alpha.11 → 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 +83 -0
- package/dist/codeSign/win/authenticodeSignature.d.ts.map +1 -0
- package/dist/codeSign/win/authenticodeSignature.js +289 -0
- package/dist/codeSign/win/authenticodeSignature.js.map +1 -0
- 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 +27 -9
- package/dist/codeSign/win/signtoolBaseSignManager.d.ts.map +1 -1
- package/dist/codeSign/win/signtoolBaseSignManager.js +80 -49
- package/dist/codeSign/win/signtoolBaseSignManager.js.map +1 -1
- package/dist/codeSign/win/verifyUpdatePublisher.d.ts +25 -0
- package/dist/codeSign/win/verifyUpdatePublisher.d.ts.map +1 -0
- package/dist/codeSign/win/verifyUpdatePublisher.js +101 -0
- package/dist/codeSign/win/verifyUpdatePublisher.js.map +1 -0
- 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 +56 -12
- package/dist/configuration.d.ts.map +1 -1
- package/dist/configuration.js.map +1 -1
- package/dist/electron/ElectronFramework.d.ts +15 -0
- package/dist/electron/ElectronFramework.d.ts.map +1 -1
- package/dist/electron/ElectronFramework.js +33 -2
- package/dist/electron/ElectronFramework.js.map +1 -1
- package/dist/electron/mac/asarIntegrityDigest.d.ts +10 -0
- package/dist/electron/mac/asarIntegrityDigest.d.ts.map +1 -0
- package/dist/electron/mac/asarIntegrityDigest.js +122 -0
- package/dist/electron/mac/asarIntegrityDigest.js.map +1 -0
- package/dist/electron/mac/electronMac.js +1 -28
- package/dist/electron/mac/electronMac.js.map +1 -1
- package/dist/electron/mac/electronMacUtils.d.ts +9 -0
- package/dist/electron/mac/electronMacUtils.d.ts.map +1 -1
- package/dist/electron/mac/electronMacUtils.js +37 -0
- package/dist/electron/mac/electronMacUtils.js.map +1 -1
- package/dist/fileMatcher.d.ts +34 -11
- package/dist/fileMatcher.d.ts.map +1 -1
- package/dist/fileMatcher.js +125 -36
- package/dist/fileMatcher.js.map +1 -1
- package/dist/forge-maker.d.ts +64 -0
- package/dist/forge-maker.d.ts.map +1 -1
- package/dist/forge-maker.js +104 -2
- package/dist/forge-maker.js.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -4
- package/dist/index.js.map +1 -1
- package/dist/indexInternal.d.ts +9 -3
- package/dist/indexInternal.d.ts.map +1 -1
- package/dist/indexInternal.js +8 -3
- 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 +32 -0
- package/dist/macPackager.d.ts.map +1 -1
- package/dist/macPackager.js +215 -13
- package/dist/macPackager.js.map +1 -1
- package/dist/options/FuseOptionsV1.d.ts +4 -0
- package/dist/options/FuseOptionsV1.d.ts.map +1 -1
- package/dist/options/FuseOptionsV1.js.map +1 -1
- package/dist/options/PlatformSpecificBuildOptions.d.ts +93 -21
- 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 +22 -3
- package/dist/options/macOptions.d.ts.map +1 -1
- package/dist/options/macOptions.js.map +1 -1
- package/dist/options/winOptions.d.ts +68 -19
- 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 +3 -0
- package/dist/packager.d.ts.map +1 -1
- package/dist/packager.js +11 -2
- package/dist/packager.js.map +1 -1
- package/dist/platformPackager.d.ts +18 -7
- package/dist/platformPackager.d.ts.map +1 -1
- package/dist/platformPackager.js +56 -15
- package/dist/platformPackager.js.map +1 -1
- package/dist/publish/PublishManager.d.ts +4 -0
- package/dist/publish/PublishManager.d.ts.map +1 -1
- package/dist/publish/PublishManager.js +106 -28
- 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 +6 -0
- package/dist/targets/archive.d.ts.map +1 -1
- package/dist/targets/archive.js +15 -5
- package/dist/targets/archive.js.map +1 -1
- package/dist/targets/differentialUpdateInfoBuilder.d.ts.map +1 -1
- package/dist/targets/differentialUpdateInfoBuilder.js +4 -0
- package/dist/targets/differentialUpdateInfoBuilder.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 +12 -17
- 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/core24.d.ts.map +1 -1
- package/dist/targets/linux/snap/core24.js +2 -9
- package/dist/targets/linux/snap/core24.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 +21 -3
- package/dist/targets/mac/MacTargetHelper.d.ts.map +1 -1
- package/dist/targets/mac/MacTargetHelper.js +140 -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 +8 -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 +15 -3
- 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/winCodeSign.d.ts +14 -1
- package/dist/toolsets/winCodeSign.d.ts.map +1 -1
- package/dist/toolsets/winCodeSign.js +14 -1
- package/dist/toolsets/winCodeSign.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 +15 -11
- 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/config.d.ts.map +1 -1
- package/dist/util/config/config.js +9 -1
- package/dist/util/config/config.js.map +1 -1
- package/dist/util/config/fileOptions.d.ts +22 -0
- package/dist/util/config/fileOptions.d.ts.map +1 -1
- package/dist/util/config/fileOptions.js +92 -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 +20 -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 +12 -10
- package/scheme.json +662 -50
- package/templates/nsis/include/allowOnlyOneInstallerInstance.nsh +14 -9
- package/templates/nsis/installSection.nsh +5 -0
- 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
package/dist/macPackager.js
CHANGED
|
@@ -1,14 +1,19 @@
|
|
|
1
1
|
import { createRequire } from "node:module";
|
|
2
2
|
const _require = createRequire(import.meta.url);
|
|
3
|
-
import { Arch, copyFile, deepAssign, exec, exists, getArchSuffix, InvalidConfigurationError, log, orIfFileNotExist, sanitizeDirPath, unlinkIfExists, use, } from "builder-util";
|
|
3
|
+
import { Arch, copyFile, deepAssign, exec, Executables, exists, getArchSuffix, InvalidConfigurationError, isEmptyOrSpaces, log, orIfFileNotExist, sanitizeDirPath, unlinkIfExists, use, } from "builder-util";
|
|
4
4
|
import { MemoLazy } from "builder-util-runtime";
|
|
5
5
|
import * as fs from "fs/promises";
|
|
6
6
|
import { mkdir, readdir } from "fs/promises";
|
|
7
7
|
import { Lazy } from "lazy-val";
|
|
8
8
|
import * as path from "path";
|
|
9
|
+
import * as semver from "semver";
|
|
9
10
|
import { AppInfo } from "./appInfo.js";
|
|
11
|
+
import { embedAsarIntegrityDigest, FIRST_ELECTRON_MAJOR_WITH_ASAR_INTEGRITY_DIGEST } from "./electron/mac/asarIntegrityDigest.js";
|
|
10
12
|
import { assertSafeHelperName } from "./electron/mac/electronMacUtils.js";
|
|
11
|
-
import {
|
|
13
|
+
import { forceCodeSigningError, forceCodeSigningOverrideHint, VERIFICATION_FAILED_ERROR_CODE } from "./codeSign/forceCodeSigning.js";
|
|
14
|
+
import { isAutoDiscoveryCodeSignIdentity } from "./util/flags.js";
|
|
15
|
+
import { createKeychain, isSignAllowed, macSigningUnavailableError, removeKeychain, sign } from "./codeSign/mac/macCodeSign.js";
|
|
16
|
+
import { validateStapledTicket, verifyMacCodeSignature } from "./codeSign/mac/macSignatureVerifier.js";
|
|
12
17
|
import { combineSignResults, isSignResultSigned } from "./codeSign/signResult.js";
|
|
13
18
|
import { DIR_TARGET, Platform } from "./core.js";
|
|
14
19
|
import { MacTargetHelper } from "./targets/mac/MacTargetHelper.js";
|
|
@@ -16,6 +21,7 @@ import { chooseNotNull, PlatformPackager } from "./platformPackager.js";
|
|
|
16
21
|
import { ArchiveTarget } from "./targets/ArchiveTarget.js";
|
|
17
22
|
import { PkgTarget, prepareProductBuildArgs } from "./targets/mac/pkg.js";
|
|
18
23
|
import { createCommonTarget, NoOpTarget } from "./targets/targetFactory.js";
|
|
24
|
+
import { isPlainObject, replaceMergedExcludedExts } from "./util/config/fileOptions.js";
|
|
19
25
|
import { isMacOsHighSierra } from "./util/mac/macosVersion.js";
|
|
20
26
|
import { buildSingleArchFilesPattern, collectIdenticalSingleArchMachOFiles, collectSingleArchPackageNames } from "./util/archCompatibility.js";
|
|
21
27
|
import { expandMacro as doExpandMacro } from "./util/macroExpander.js";
|
|
@@ -24,6 +30,16 @@ import { makeUniversalApp } from "@electron/universal";
|
|
|
24
30
|
function isElectronSignOptions(sign) {
|
|
25
31
|
return typeof sign === "object" && sign !== null;
|
|
26
32
|
}
|
|
33
|
+
/**
|
|
34
|
+
* Merges the mac → mas (→ masDev) cascade. `deepAssign` merges a later layer into a nested object it took from an earlier one, so each
|
|
35
|
+
* layer's `fileOptions` is copied first: merging the mas configuration must not change the `fileOptions` of the mac one. A later layer's
|
|
36
|
+
* `fileOptions.excludedExts` replaces an earlier one (see replaceMergedExcludedExts).
|
|
37
|
+
*/
|
|
38
|
+
function mergeMasConfig(...layers) {
|
|
39
|
+
const config = deepAssign({}, ...layers.map(it => (it != null && isPlainObject(it.fileOptions) ? { ...it, fileOptions: { ...it.fileOptions } } : it)));
|
|
40
|
+
replaceMergedExcludedExts(config, layers);
|
|
41
|
+
return config;
|
|
42
|
+
}
|
|
27
43
|
export class MacPackager extends PlatformPackager {
|
|
28
44
|
constructor(info) {
|
|
29
45
|
super(info, Platform.MAC);
|
|
@@ -55,6 +71,108 @@ export class MacPackager extends PlatformPackager {
|
|
|
55
71
|
});
|
|
56
72
|
this._iconPath = new Lazy(() => this.getOrConvertIcon("icns"));
|
|
57
73
|
this.helper = new MacTargetHelper(this);
|
|
74
|
+
info.onTargetsCreated(plans => this.checkForceCodeSigningAtBuildStart(plans));
|
|
75
|
+
}
|
|
76
|
+
/**
|
|
77
|
+
* Fails a forceCodeSigning build at build start, before anything is packed, when the macOS app could not be signed or
|
|
78
|
+
* notarized: on a host other than macOS, in a pull-request build without CSC_FOR_PULL_REQUEST, or without notarization
|
|
79
|
+
* credentials; and a build with `mac.notarize: true` without notarization credentials, where notarization can happen.
|
|
80
|
+
* sign() and notarizeIfProvided keep their own checks for callers that never emit `targetsCreated`.
|
|
81
|
+
*/
|
|
82
|
+
checkForceCodeSigningAtBuildStart(plans) {
|
|
83
|
+
const ownPlans = plans.filter(it => it.packager === this);
|
|
84
|
+
// each flavor that is built, with its own forceCodeSigning: the macOS app (and its pkg), and every MAS target
|
|
85
|
+
const flavors = new Set();
|
|
86
|
+
for (const { targets } of ownPlans) {
|
|
87
|
+
if (MacPackager.packsNonMasApp(targets) || targets.some(it => it.name === "pkg")) {
|
|
88
|
+
flavors.add("mac");
|
|
89
|
+
}
|
|
90
|
+
for (const target of targets) {
|
|
91
|
+
if (MacTargetHelper.isMasTarget(target.name)) {
|
|
92
|
+
flavors.add(MacTargetHelper.getPlatformTypeFromTarget(target.name));
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
for (const flavor of flavors) {
|
|
97
|
+
if (!this.forceCodeSigningFor(flavor)) {
|
|
98
|
+
continue;
|
|
99
|
+
}
|
|
100
|
+
const unavailable = macSigningUnavailableError(flavor === "mac" ? "the macOS app" : `the ${flavor} app`, this.forceCodeSigningOverrideHintFor(flavor));
|
|
101
|
+
if (unavailable != null) {
|
|
102
|
+
throw unavailable;
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
if (!flavors.has("mac")) {
|
|
106
|
+
return;
|
|
107
|
+
}
|
|
108
|
+
// the non-MAS app is notarized when it is packed (never for a prepackaged one), and the pkg installer always
|
|
109
|
+
const prepackaged = this.packagerOptions.prepackaged != null;
|
|
110
|
+
const packsApp = ownPlans.some(({ targets }) => !prepackaged && MacPackager.packsNonMasApp(targets));
|
|
111
|
+
const packsPkg = ownPlans.some(({ targets }) => targets.some(it => it.name === "pkg"));
|
|
112
|
+
const notarize = this.platformSpecificBuildOptions.notarize;
|
|
113
|
+
if ((!packsApp && !packsPkg) || notarize === false) {
|
|
114
|
+
return;
|
|
115
|
+
}
|
|
116
|
+
// the credentials are read (getNotarizeOptions also rejects an incomplete set) only where they are required
|
|
117
|
+
if (this.forceCodeSigning) {
|
|
118
|
+
if (MacTargetHelper.getNotarizeOptions("") == null) {
|
|
119
|
+
throw MacTargetHelper.missingNotarizationCredentialsError();
|
|
120
|
+
}
|
|
121
|
+
return;
|
|
122
|
+
}
|
|
123
|
+
// notarize: true requires notarization where it runs: the app only when sign() signs it, the pkg installer whenever it is built
|
|
124
|
+
if (!MacTargetHelper.isNotarizationRequired(notarize) || (!packsPkg && this.isMacSigningSkippedByConfiguration())) {
|
|
125
|
+
return;
|
|
126
|
+
}
|
|
127
|
+
if (MacTargetHelper.getNotarizeOptions("") == null) {
|
|
128
|
+
throw MacTargetHelper.notarizeTrueWithoutCredentialsError();
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
/**
|
|
132
|
+
* `forceCodeSigning` of a flavor: `mas` and `mas-dev` cascade `mac` → `mas` → `masDev` like every other option (see
|
|
133
|
+
* getPlatformConfig), then the root value. For `mac` it is {@link forceCodeSigning}.
|
|
134
|
+
*/
|
|
135
|
+
forceCodeSigningFor(platformType) {
|
|
136
|
+
if (platformType === "mac") {
|
|
137
|
+
return this.forceCodeSigning;
|
|
138
|
+
}
|
|
139
|
+
return this.getPlatformConfig(platformType).config.forceCodeSigning ?? this.config.forceCodeSigning ?? false;
|
|
140
|
+
}
|
|
141
|
+
/** The `-c` override that turns `forceCodeSigning` off for a flavor: on the most specific block that sets it. */
|
|
142
|
+
forceCodeSigningOverrideHintFor(platformType) {
|
|
143
|
+
if (platformType === "mas-dev" && this.config.masDev?.forceCodeSigning != null) {
|
|
144
|
+
return "-c.masDev.forceCodeSigning=false";
|
|
145
|
+
}
|
|
146
|
+
if (platformType !== "mac" && this.config.mas?.forceCodeSigning != null) {
|
|
147
|
+
return "-c.mas.forceCodeSigning=false";
|
|
148
|
+
}
|
|
149
|
+
return forceCodeSigningOverrideHint(this);
|
|
150
|
+
}
|
|
151
|
+
/**
|
|
152
|
+
* Whether sign() skips the macOS app because of the configuration, before it would notarize it: `sign: null`, `sign.identity: null`,
|
|
153
|
+
* or `CSC_IDENTITY_AUTO_DISCOVERY=false` without an identity (`sign.identity` or `CSC_NAME`) or a custom signer.
|
|
154
|
+
*/
|
|
155
|
+
isMacSigningSkippedByConfiguration() {
|
|
156
|
+
const signConfig = this.platformSpecificBuildOptions.sign;
|
|
157
|
+
if (signConfig === null) {
|
|
158
|
+
return true;
|
|
159
|
+
}
|
|
160
|
+
const signOpts = isElectronSignOptions(signConfig) ? signConfig : undefined;
|
|
161
|
+
if (signConfig != null && signOpts == null) {
|
|
162
|
+
// a custom signer is called without an identity too
|
|
163
|
+
return false;
|
|
164
|
+
}
|
|
165
|
+
if (signOpts?.identity === null) {
|
|
166
|
+
return true;
|
|
167
|
+
}
|
|
168
|
+
return isEmptyOrSpaces(signOpts?.identity ?? process.env.CSC_NAME) && !isAutoDiscoveryCodeSignIdentity();
|
|
169
|
+
}
|
|
170
|
+
/** Whether `pack` builds the non-MAS app: unless every target is a MAS one. No target at all is a dir build. */
|
|
171
|
+
static packsNonMasApp(targets) {
|
|
172
|
+
// Mirror master's condition: skip the non-MAS darwin pack only when there are exclusively MAS
|
|
173
|
+
// targets (hasMas=true, targets.length=1). DIR_TARGET passes targets=[] to pack() because
|
|
174
|
+
// MacPackager.createTargets() doesn't call mapper() for it, so hasMas=false and doPack still runs.
|
|
175
|
+
return !targets.some(it => MacTargetHelper.isMasTarget(it.name)) || targets.length > 1;
|
|
58
176
|
}
|
|
59
177
|
get defaultTarget() {
|
|
60
178
|
return this.info.framework.macOsDefaultTargets;
|
|
@@ -64,13 +182,13 @@ export class MacPackager extends PlatformPackager {
|
|
|
64
182
|
let platformName;
|
|
65
183
|
switch (platformType) {
|
|
66
184
|
case "mas":
|
|
67
|
-
config =
|
|
185
|
+
config = mergeMasConfig(this.platformSpecificBuildOptions, this.config.mas);
|
|
68
186
|
platformName = "mas";
|
|
69
187
|
break;
|
|
70
188
|
case "mas-dev":
|
|
71
189
|
// `mas-dev` cascades mac → mas → masDev. The development/distribution distinction is no longer
|
|
72
190
|
// carried as a config field; it is derived from `platformType` wherever signing happens.
|
|
73
|
-
config =
|
|
191
|
+
config = mergeMasConfig(this.platformSpecificBuildOptions, this.config.mas, this.config.masDev);
|
|
74
192
|
platformName = "mas";
|
|
75
193
|
break;
|
|
76
194
|
case "mac":
|
|
@@ -215,6 +333,7 @@ export class MacPackager extends PlatformPackager {
|
|
|
215
333
|
if (this.info.cancellationToken.cancelled) {
|
|
216
334
|
return;
|
|
217
335
|
}
|
|
336
|
+
await this.doAddAsarIntegrityDigest(packContext, platformSpecificBuildOptions, await this.computeAsarOptions(platformSpecificBuildOptions));
|
|
218
337
|
await this.doAddElectronFuses(packContext);
|
|
219
338
|
// Mirror the base-class guard: skip signing when the caller explicitly set sign:false
|
|
220
339
|
// (e.g. packMasTargets passes sign:false so that its own sign() call is the sole signing step).
|
|
@@ -222,6 +341,38 @@ export class MacPackager extends PlatformPackager {
|
|
|
222
341
|
await this.doSignAfterPack(outDir, appOutDir, platformName, platformType, arch, platformSpecificBuildOptions, targets);
|
|
223
342
|
}
|
|
224
343
|
}
|
|
344
|
+
/**
|
|
345
|
+
* Embeds the ASAR integrity digest into the Electron Framework, see `mac.asarIntegrityDigest`. A universal app gets it after the slices are merged: they
|
|
346
|
+
* have no `ElectronAsarIntegrity` entries, and re-signing the framework of a slice would make the slices differ in a way `@electron/universal` rejects.
|
|
347
|
+
*/
|
|
348
|
+
async doAddAsarIntegrityDigest(packContext, platformSpecificBuildOptions, asarOptions) {
|
|
349
|
+
// nothing to protect without the entries electron-builder computes: a stock Electron Info.plist still lists the removed default_app.asar
|
|
350
|
+
if (asarOptions == null || asarOptions.disableIntegrity) {
|
|
351
|
+
return;
|
|
352
|
+
}
|
|
353
|
+
if (platformSpecificBuildOptions.asarIntegrityDigest === false) {
|
|
354
|
+
log.info({ reason: "asarIntegrityDigest is set to false" }, "skipped ASAR integrity digest");
|
|
355
|
+
return;
|
|
356
|
+
}
|
|
357
|
+
const electronVersion = semver.coerce(this.info.framework.version);
|
|
358
|
+
if (electronVersion == null || semver.major(electronVersion) < FIRST_ELECTRON_MAJOR_WITH_ASAR_INTEGRITY_DIGEST) {
|
|
359
|
+
return;
|
|
360
|
+
}
|
|
361
|
+
if (process.platform !== "darwin") {
|
|
362
|
+
log.warn({ reason: "supported only on macOS, where codesign can sign the modified Electron Framework again" }, "skipped ASAR integrity digest");
|
|
363
|
+
return;
|
|
364
|
+
}
|
|
365
|
+
const frameworkName = `${path.basename(this.info.framework.distMacOsAppName, ".app")} Framework`;
|
|
366
|
+
const embedded = await embedAsarIntegrityDigest(path.join(packContext.appOutDir, `${this.appInfo.productFilename}.app`), frameworkName);
|
|
367
|
+
// an afterPack hook that signs the app or changes it in ways the digest must not cover is where this change bites
|
|
368
|
+
if (embedded && this.info.filterPackagerEventListeners("afterPack", "user").length > 0) {
|
|
369
|
+
log
|
|
370
|
+
.once("asar-integrity-digest-after-afterpack")
|
|
371
|
+
.warn({ solution: "set mac.asarIntegrityDigest to false if your afterPack hook signs the app" }, "electron-builder v27 embeds the ASAR integrity digest into the Electron Framework after the afterPack hook and signs the framework again ad hoc, replacing a signature applied in afterPack. " +
|
|
372
|
+
"Changing app.asar or Info.plist after afterPack now fails the app at launch when the enableEmbeddedAsarIntegrityValidation fuse is on. " +
|
|
373
|
+
"See https://www.electron.build/docs/migration/v27-runtime-changes#macos-asar-integrity-digest");
|
|
374
|
+
}
|
|
375
|
+
}
|
|
225
376
|
/**
|
|
226
377
|
* Builds the `singleArchFiles` glob passed to `@electron/universal` by scanning both packed slices for
|
|
227
378
|
* single-architecture binaries that can't be lipo-merged. Merges any user-provided `mac.universal.singleArchFiles`.
|
|
@@ -249,13 +400,9 @@ export class MacPackager extends PlatformPackager {
|
|
|
249
400
|
const masTargets = targets.filter(it => MacTargetHelper.isMasTarget(it.name));
|
|
250
401
|
const nonMasTargets = targets.filter(it => !MacTargetHelper.isMasTarget(it.name));
|
|
251
402
|
const prepackaged = this.packagerOptions.prepackaged;
|
|
252
|
-
const hasMas = masTargets.length > 0;
|
|
253
403
|
// mas always first
|
|
254
404
|
await this.packMasTargets(outDir, arch, masTargets, prepackaged);
|
|
255
|
-
|
|
256
|
-
// targets (hasMas=true, targets.length=1). DIR_TARGET passes targets=[] to pack() because
|
|
257
|
-
// MacPackager.createTargets() doesn't call mapper() for it, so hasMas=false and doPack still runs.
|
|
258
|
-
if (!hasMas || targets.length > 1) {
|
|
405
|
+
if (MacPackager.packsNonMasApp(targets)) {
|
|
259
406
|
await this.packMacTargets(outDir, arch, nonMasTargets, prepackaged, taskManager);
|
|
260
407
|
}
|
|
261
408
|
}
|
|
@@ -334,6 +481,9 @@ export class MacPackager extends PlatformPackager {
|
|
|
334
481
|
targets,
|
|
335
482
|
});
|
|
336
483
|
}
|
|
484
|
+
else if (this.forceCodeSigning) {
|
|
485
|
+
await this.verifyPrepackagedApp(appPath);
|
|
486
|
+
}
|
|
337
487
|
// test-only early exit (see PackagerOptions.afterPackTestHook); a no-op unless the option is set
|
|
338
488
|
if (await this.info.shouldSkipTargetsAfterPack({
|
|
339
489
|
appOutDir: path.dirname(appPath),
|
|
@@ -347,6 +497,31 @@ export class MacPackager extends PlatformPackager {
|
|
|
347
497
|
}
|
|
348
498
|
this.packageInDistributableFormat(appPath, arch, targets, taskManager);
|
|
349
499
|
}
|
|
500
|
+
/**
|
|
501
|
+
* electron-builder neither signs nor notarizes a prepackaged app, so under forceCodeSigning the app it packages must
|
|
502
|
+
* already carry a valid signature - and a stapled notarization ticket, unless `mac.notarize` is false.
|
|
503
|
+
*/
|
|
504
|
+
async verifyPrepackagedApp(appPath) {
|
|
505
|
+
const unavailable = macSigningUnavailableError(`the prepackaged app ${log.filePath(appPath)}`, forceCodeSigningOverrideHint(this));
|
|
506
|
+
if (unavailable != null) {
|
|
507
|
+
throw unavailable;
|
|
508
|
+
}
|
|
509
|
+
const signConfig = this.platformSpecificBuildOptions.sign;
|
|
510
|
+
const problem = await verifyMacCodeSignature(appPath, { deep: true, strict: isElectronSignOptions(signConfig) ? signConfig.strictVerify : undefined });
|
|
511
|
+
if (problem != null) {
|
|
512
|
+
throw forceCodeSigningError(`forceCodeSigning is enabled, but the prepackaged app ${log.filePath(appPath)} has no valid code signature (codesign --verify --deep: ${problem}). ` +
|
|
513
|
+
"electron-builder does not sign a prepackaged app: sign it before packaging it.", VERIFICATION_FAILED_ERROR_CODE);
|
|
514
|
+
}
|
|
515
|
+
if (this.platformSpecificBuildOptions.notarize === false) {
|
|
516
|
+
log.warn({ file: log.filePath(appPath), reason: "`notarize` is set to false" }, "the notarization of the prepackaged app is not verified although forceCodeSigning is enabled");
|
|
517
|
+
return;
|
|
518
|
+
}
|
|
519
|
+
const ticketProblem = await validateStapledTicket(appPath);
|
|
520
|
+
if (ticketProblem != null) {
|
|
521
|
+
throw forceCodeSigningError(`forceCodeSigning is enabled, but the prepackaged app ${log.filePath(appPath)} has no valid stapled notarization ticket (stapler validate: ${ticketProblem}). ` +
|
|
522
|
+
"Notarize and staple it before packaging it, or set mac.notarize: false.", VERIFICATION_FAILED_ERROR_CODE);
|
|
523
|
+
}
|
|
524
|
+
}
|
|
350
525
|
/**
|
|
351
526
|
* Creates the signed MAS installer .pkg for an already codesigned app. Kept separate from `sign()`
|
|
352
527
|
* so that the `afterSign` hook can run between codesigning and installer creation (see `packMasTargets`).
|
|
@@ -363,6 +538,14 @@ export class MacPackager extends PlatformPackager {
|
|
|
363
538
|
* (`isSignAllowed()` short-circuits it on non-mac hosts). Failures are thrown, never returned.
|
|
364
539
|
*/
|
|
365
540
|
async sign(appPath, arch, targetPlatform) {
|
|
541
|
+
const forceCodeSigning = this.forceCodeSigningFor(targetPlatform);
|
|
542
|
+
if (forceCodeSigning) {
|
|
543
|
+
// checked before isSignAllowed, which would log that signing is skipped right before this fails the build
|
|
544
|
+
const unavailable = macSigningUnavailableError(`the ${targetPlatform} app ${log.filePath(appPath)}`, this.forceCodeSigningOverrideHintFor(targetPlatform));
|
|
545
|
+
if (unavailable != null) {
|
|
546
|
+
throw unavailable;
|
|
547
|
+
}
|
|
548
|
+
}
|
|
366
549
|
if (!isSignAllowed()) {
|
|
367
550
|
// non-mac host, or the pull-request CI guard — signing cannot happen in this environment
|
|
368
551
|
return "skipped:unsupported";
|
|
@@ -371,27 +554,46 @@ export class MacPackager extends PlatformPackager {
|
|
|
371
554
|
const config = this.getPlatformConfig(targetPlatform).config.sign;
|
|
372
555
|
// sign: null → user explicitly disabled signing
|
|
373
556
|
if (config === null) {
|
|
374
|
-
return this.helper.handleNullIdentity();
|
|
557
|
+
return this.helper.handleNullIdentity(targetPlatform);
|
|
375
558
|
}
|
|
376
559
|
const signOpts = isElectronSignOptions(config) ? config : undefined;
|
|
377
560
|
// sign.identity: null → explicit skip; undefined → auto-discover
|
|
378
561
|
const qualifier = signOpts?.identity;
|
|
379
562
|
if (qualifier === null) {
|
|
380
|
-
return this.helper.handleNullIdentity();
|
|
563
|
+
return this.helper.handleNullIdentity(targetPlatform);
|
|
381
564
|
}
|
|
382
565
|
const keychainFile = (await this.codeSigningInfo.value).keychainFile;
|
|
383
566
|
// `config` is a custom fn/string module path when it's non-null and not an options object
|
|
384
567
|
const hasCustomSign = config != null && !signOpts;
|
|
385
568
|
const isMas = MacTargetHelper.isMasTarget(targetPlatform);
|
|
386
569
|
const identity = await this.helper.findSigningIdentity(targetPlatform, qualifier, keychainFile, hasCustomSign, signOpts);
|
|
570
|
+
// A custom signer is called without a keychain identity too (a remote or HSM signer needs none); under forceCodeSigning
|
|
571
|
+
// its output is verified below. @electron/osx-sign needs one, and so does the installer of a MAS app (createMasInstaller), so
|
|
572
|
+
// a MAS app is only signed without one under forceCodeSigning, which fails on the missing installer identity instead.
|
|
387
573
|
if (!identity) {
|
|
388
|
-
|
|
574
|
+
if (!hasCustomSign) {
|
|
575
|
+
return "skipped:no-certificate";
|
|
576
|
+
}
|
|
577
|
+
// mas-dev builds no installer, so its custom signer is called without an identity too
|
|
578
|
+
if (!forceCodeSigning && MacTargetHelper.shouldCreateMasInstaller(targetPlatform, undefined)) {
|
|
579
|
+
log.warn({ file: log.filePath(appPath), reason: "no keychain identity was found, and the MAS installer needs one" }, "the custom mac.sign signer is not called for the MAS app, which is left unsigned");
|
|
580
|
+
return "skipped:no-certificate";
|
|
581
|
+
}
|
|
582
|
+
log.info({ file: log.filePath(appPath), reason: "no keychain identity was found" }, "calling the custom mac.sign signer without an identity");
|
|
389
583
|
}
|
|
390
584
|
if (!isMacOsHighSierra()) {
|
|
391
585
|
throw new InvalidConfigurationError("macOS High Sierra 10.13.6 is required to sign");
|
|
392
586
|
}
|
|
393
587
|
const signOptions = await this.helper.buildSignOptions(appPath, identity, signOpts, keychainFile, arch, targetPlatform, hasCustomSign);
|
|
394
588
|
await this.doSign(signOptions, config, identity);
|
|
589
|
+
// @electron/osx-sign verifies the signatures it makes; a custom signer replaces it, so its output is checked here
|
|
590
|
+
if (hasCustomSign && forceCodeSigning) {
|
|
591
|
+
const problem = await verifyMacCodeSignature(appPath, { deep: true });
|
|
592
|
+
if (problem != null) {
|
|
593
|
+
throw forceCodeSigningError(`forceCodeSigning is enabled, but the custom mac.sign signer left ${log.filePath(appPath)} without a valid code signature (codesign --verify --deep --strict: ${problem}). ` +
|
|
594
|
+
"The signer must sign the app at configuration.app in place.", VERIFICATION_FAILED_ERROR_CODE);
|
|
595
|
+
}
|
|
596
|
+
}
|
|
395
597
|
// now that everything is signed, flag binaries that still carry a foreign (or missing) signature and would
|
|
396
598
|
// fail library validation at launch — the case the old blanket entitlements default used to mask
|
|
397
599
|
if (!hasCustomSign) {
|
|
@@ -430,7 +632,7 @@ export class MacPackager extends PlatformPackager {
|
|
|
430
632
|
const args = prepareProductBuildArgs(identity, keychain);
|
|
431
633
|
args.push("--component", safeAppPath, "/Applications");
|
|
432
634
|
args.push(safeOutFile);
|
|
433
|
-
return await exec("productbuild", args);
|
|
635
|
+
return await exec(Executables.resolve("productbuild"), args);
|
|
434
636
|
}
|
|
435
637
|
getElectronSrcDir(dist) {
|
|
436
638
|
return path.resolve(this.projectDir, dist, this.info.framework.distMacOsAppName);
|