feat: osx entitlements location by convention

src/osxPackager.ts

@@ -7,6 +7,7 @@ import { createKeychain, deleteKeychain, CodeSigningInfo, generateKeychainName }
 import { path7za } from "7zip-bin"
 import deepAssign = require("deep-assign")
 import { sign, flat, BaseSignOptions, SignOptions, FlatOptions } from "electron-osx-sign-tf"
+import { readdir } from "fs-extra-p"
 
 //noinspection JSUnusedLocalSymbols
 const __awaiter = require("./awaiter")
@@ -16,6 +17,8 @@ export default class OsXPackager extends PlatformPackager<OsXBuildOptions> {
 
   readonly targets: Array<string>
 
+  readonly resourceList: Promise<Array<string>>
+
   constructor(info: BuildInfo, cleanupTasks: Array<() => Promise<any>>) {
     super(info)
 
@@ -37,6 +40,8 @@ export default class OsXPackager extends PlatformPackager<OsXBuildOptions> {
       }
     }
     this.targets = targets == null ? ["default"] : targets
+
+    this.resourceList = readdir(this.buildResourcesDir)
   }
 
   get platform() {
@@ -94,13 +99,28 @@ export default class OsXPackager extends PlatformPackager<OsXBuildOptions> {
       identity: codeSigningInfo.name,
     }, (<any>this.devMetadata.build)["osx-sign"], baseSignOptions)
 
+    const resourceList = await this.resourceList
+
     const customSignOptions = masOptions || this.customBuildOptions
     if (customSignOptions.entitlements != null) {
       signOptions.entitlements = customSignOptions.entitlements
     }
+    else {
+      const p = `${masOptions == null ? "osx" : "mas"}.entitlements`
+      if (resourceList.includes(p)) {
+        signOptions.entitlements = path.join(this.buildResourcesDir, p)
+      }
+    }
+
     if (customSignOptions.entitlementsInherit != null) {
       signOptions["entitlements-inherit"] = customSignOptions.entitlementsInherit
     }
+    else {
+      const p = `${masOptions == null ? "osx" : "mas"}.inherit.entitlements`
+      if (resourceList.includes(p)) {
+        signOptions["entitlements-inherit"] = path.join(this.buildResourcesDir, p)
+      }
+    }
 
     await this.doSign(signOptions)
 

test/src/osxPackagerTest.ts

@@ -2,7 +2,7 @@ import test from "./helpers/avaEx"
 import { assertPack, platform, modifyPackageJson } from "./helpers/packTester"
 import { Platform } from "out"
 import OsXPackager from "out/osxPackager"
-import { move } from "fs-extra-p"
+import { move, writeFile } from "fs-extra-p"
 import * as path from "path"
 import { BuildInfo } from "out/platformPackager"
 import { Promise as BluebirdPromise } from "bluebird"
@@ -107,6 +107,36 @@ test.ifOsx("identity in package.json", () => {
   })
 })
 
+test.ifOsx("entitlements in build dir", () => {
+  let platformPackager: CheckingOsXPackager = null
+  return assertPack("test-app-one", {
+    platform: [Platform.OSX],
+    platformPackagerFactory: (packager, platform, cleanupTasks) => platformPackager = new CheckingOsXPackager(packager, cleanupTasks),
+    cscLink: null,
+    cscInstallerLink: null,
+    devMetadata: {
+      build: {
+        osx: {
+          identity: "osx",
+        }
+      }
+    }
+  }, {
+    tempDirCreated: projectDir => BluebirdPromise.all([
+      writeFile(path.join(projectDir, "build", "osx.entitlements"), ""),
+      writeFile(path.join(projectDir, "build", "osx.inherit.entitlements"), ""),
+    ]),
+    packed: projectDir => {
+      assertThat(platformPackager.effectiveSignOptions).has.properties({
+        identity: "osx",
+        entitlements: path.join(projectDir, "build", "osx.entitlements"),
+        "entitlements-inherit": path.join(projectDir, "build", "osx.inherit.entitlements"),
+      })
+      return BluebirdPromise.resolve(null)
+    }
+  })
+})
+
 // test.ifOsx("no background", (t: any) => assertPack("test-app-one", platform(Platform.OSX), {
 //   tempDirCreated: projectDir => deleteFile(path.join(projectDir, "build", "background.png"))
 // }))