Merge branch 'master' into fix/hardened-runtime-opt-type

electron · Nov 8, 2019 · 8157085 · 8157085
2 parents 24f413e + 4a47bba
commit 8157085
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/.npmignore b/.npmignore
@@ -0,0 +1,3 @@
+/test
+/yarn.lock
+/.*
diff --git a/index.d.ts b/index.d.ts
@@ -12,6 +12,7 @@ declare module "electron-osx-sign" {
     'entitlements-inherit'?: string;
     'gatekeeper-assess'?: boolean;
     hardenedRuntime?: boolean;
+    'identity-validation'?: boolean;
     ignore?: string;
     'pre-auto-entitlements'?: boolean;
     'pre-embed-provisioning-profile'?: boolean;
@@ -20,14 +21,14 @@ declare module "electron-osx-sign" {
     'signature-size'?: number;
     'type'?: string;
     version?: string;
-    'identity-validation'?: boolean;
   }
 
   export function sign(opts: SignOptions, callback: (error: Error) => void): void;
 
   export function signAsync(opts: SignOptions): Promise<any>;
 
   interface FlatOptions extends BaseSignOptions {
+    'identity-validation'?: boolean;
     install?: string;
     pkg?: string;
     scripts?: string;

diff --git a/util-provisioning-profiles.js b/util-provisioning-profiles.js
@@ -54,14 +54,21 @@ Object.defineProperty(ProvisioningProfile.prototype, 'type', {
  * Returns a promise resolving to a ProvisioningProfile instance based on file.
  * @function
  * @param {string} filePath - Path to provisioning profile.
+ * @param {string} keychain - Keychain to use when unlocking provisioning profile.
  * @returns {Promise} Promise.
  */
-var getProvisioningProfileAsync = module.exports.getProvisioningProfileAsync = function (filePath) {
-  return execFileAsync('security', [
+var getProvisioningProfileAsync = module.exports.getProvisioningProfileAsync = function (filePath, keychain = null) {
+  var securityArgs = [
     'cms',
     '-D', // Decode a CMS message
     '-i', filePath // Use infile as source of data
-  ])
+  ]
+
+  if (keychain) {
+    securityArgs.push('-k', keychain)
+  }
+
+  return execFileAsync('security', securityArgs)
     .then(function (result) {
       var provisioningProfile = new ProvisioningProfile(filePath, plist.parse(result))
       debuglog('Provisioning profile:', '\n',
@@ -144,7 +151,7 @@ module.exports.preEmbedProvisioningProfile = function (opts) {
     if (opts['provisioning-profile'] instanceof ProvisioningProfile) {
       return embedProvisioningProfile()
     } else {
-      return getProvisioningProfileAsync(opts['provisioning-profile'])
+      return getProvisioningProfileAsync(opts['provisioning-profile'], opts['keychain'])
         .then(function (provisioningProfile) {
           opts['provisioning-profile'] = provisioningProfile
         })