electron-osx-sign - npm Package Compare versions

Comparing version 0.4.5 to 0.4.6

bin/electron-osx-flat-usage.txt

@@ -20,2 +20,5 @@
 
+  --identity-validation, --no-identity-validation
+    Flag to enable/disable validation for the signing identity.
+
   --install=install-path
@@ -22,0 +25,0 @@ Path to install the bundle.

bin/electron-osx-sign-usage.txt

@@ -25,3 +25,3 @@
   --gatekeeper-assess, --no-gatekeeper-assess
-    Flag to enable Gatekeeper assessment after signing the app. Disabling it is useful for signing with self-signed certificates.
+    Flag to enable/disable Gatekeeper assessment after signing the app. Disabling it is useful for signing with self-signed certificates.
     Gatekeeper assessment is enabled by default on ``darwin'' platform.
@@ -36,2 +36,5 @@
 
+  --identity-validation, --no-identity-validation
+    Flag to enable/disable validation for the signing identity.
+
   --ignore=regex
@@ -50,6 +53,6 @@ Regex that signals ignoring a file before signing.
   --pre-auto-entitlements, --no-pre-auto-entitlements
-    Flag to enable automation of entitlements file and Info.plist.
+    Flag to enable/disable automation of entitlements file and Info.plist.
 
   --pre-embed-provisioning-profile, --no-pre-embed-provisioning-profile
-    Flag to enable embedding of provisioning profile.
+    Flag to enable/disable embedding of provisioning profile.
 
@@ -56,0 +59,0 @@ --provisioning-profile=file

flat.js

@@ -17,2 +17,3 @@ /**
 const validateOptsPlatformAsync = util.validateOptsPlatformAsync
+const Identity = require('./util-identities').findIdentitiesAsync
 const findIdentitiesAsync = require('./util-identities').findIdentitiesAsync
@@ -59,3 +60,3 @@
     '--component', opts.app, opts.install,
-    '--sign', opts.identity,
+    '--sign', opts.identity.name,
     opts.pkg
@@ -87,2 +88,5 @@ ]
         debuglog('`identity` passed in arguments.')
+        if (opts['identity-validation'] === false || opts.identity instanceof Identity) {
+          return Promise.resolve()
+        }
         promise = findIdentitiesAsync(opts, opts.identity)
@@ -89,0 +93,0 @@ } else {

package.json

 {
   "name": "electron-osx-sign",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "description": "Codesign Electron macOS apps",
@@ -5,0 +5,0 @@ "main": "index.js",

README.md

@@ -155,3 +155,3 @@ # electron-osx-sign [![npm][npm_img]][npm_url] [![Build Status][travis_img]][travis_url]
 
-Flag to enable Gatekeeper assessment after signing the app. Disabling it is useful for signing with self-signed certificates.
+Flag to enable/disable Gatekeeper assessment after signing the app. Disabling it is useful for signing with self-signed certificates.
 Gatekeeper assessment is enabled by default on `darwin` platform.
@@ -167,2 +167,7 @@ Default to `true`.
 
+`identity-validation` - *Boolean*
+
+Flag to enable/disable validation for the signing identity. If enabled, the `identity` provided will be validated in the `keychain` specified.
+Default to `true`.
+
 `keychain` - *String*
@@ -186,4 +191,3 @@
 
-Flag to enable automation of `com.apple.security.application-groups` in entitlements file and update `Info.plist` with `ElectronTeamID`.
-Allowed values: `true`, `false`.
+Flag to enable/disable automation of `com.apple.security.application-groups` in entitlements file and update `Info.plist` with `ElectronTeamID`.
 Default to `true`.
@@ -193,4 +197,3 @@
 
-Flag to enable embedding of provisioning profile in the current working directory.
-Allowed values: `true`, `false`.
+Flag to enable/disable embedding of provisioning profile in the current working directory.
 Default to `true`.
@@ -311,2 +314,7 @@
 
+`identity-validation` - *Boolean*
+
+Flag to enable/disable validation for signing identity. If enabled, the `identity` provided will be validated in the `keychain` specified.
+Default to `true`.
+
 `install` - *String*
@@ -360,6 +368,6 @@
 
-> electron-osx-sign@0.4.5 pretest electron-osx-sign
+> electron-osx-sign@0.4.6 pretest electron-osx-sign
 > rimraf test/work
 
-> electron-osx-sign@0.4.5 test electron-osx-sign
+> electron-osx-sign@0.4.6 test electron-osx-sign
 > standard && tape test
@@ -366,0 +374,0 @@

sign.js

@@ -20,3 +20,5 @@ /**
 const walkAsync = util.walkAsync
+const Identity = require('./util-identities').Identity
 const findIdentitiesAsync = require('./util-identities').findIdentitiesAsync
+const ProvisioningProfile = require('./util-provisioning-profiles').ProvisioningProfile
 const preEmbedProvisioningProfile = require('./util-provisioning-profiles').preEmbedProvisioningProfile
@@ -51,4 +53,2 @@ const preAutoEntitlements = require('./util-entitlements').preAutoEntitlements
 function validateSignOptsAsync (opts) {
-  const ProvisioningProfile = require('./util-provisioning-profiles').ProvisioningProfile
-
   if (opts.ignore) {
@@ -139,3 +139,3 @@ if (typeof opts.ignore !== 'function' && typeof opts.ignore !== 'string') return Promise.reject(new Error('Ignore filter should be either a function or a string.'))
       var args = [
-        '--sign', opts.identity,
+        '--sign', opts.identity.hash || opts.identity.name,
         '--force'
@@ -229,2 +229,5 @@ ]
         if (opts['identity-validation'] === false) {
+          if (!(opts.identity instanceof Identity)) {
+            opts.identity = new Identity(opts.identity)
+          }
           return Promise.resolve()
@@ -251,3 +254,3 @@ }
           if (identities.length > 0) {
-            // Provisioning profile(s) found
+            // Identity(/ies) found
             if (identities.length > 1) {
@@ -254,0 +257,0 @@ debugwarn('Multiple identities found, will use the first discovered.')

util-entitlements.js

@@ -53,3 +53,3 @@ /**
             } else {
-              appInfo.ElectronTeamID = opts.identity.substring(opts.identity.indexOf('(') + 1, opts.identity.lastIndexOf(')'))
+              appInfo.ElectronTeamID = opts.identity.name.substring(opts.identity.name.indexOf('(') + 1, opts.identity.name.lastIndexOf(')'))
               debuglog('`ElectronTeamID` not found in `Info.plist`, use parsed from signing identity: ' + appInfo.ElectronTeamID)
@@ -56,0 +56,0 @@ }

util-identities.js

@@ -13,2 +13,12 @@ /**
 /**
+ * @constructor
+ * @param {string} name - Name of the signing identity.
+ * @param {String} hash - SHA-1 hash of the identity.
+ */
+var Identity = module.exports.Identity = function (name, hash) {
+  this.name = name
+  this.hash = hash
+}
+
+/**
  * This function returns a promise checking the indentity proposed and updates the identity option to a exact finding from results.
@@ -41,3 +51,3 @@ * @function
             '> Hash:', identityHashFound)
-          return identityHashFound
+          return new Identity(identityFound, identityHashFound)
         }
@@ -44,0 +54,0 @@ })

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

73907

increased by1.77%

Lines of code

1549

increased by1.11%

Number of lines in readme file

446

increased by1.83%

No dependency changes