feat: support relative (to project dir) path in the CSC_LINK

Close #1596
electron-userland · May 30, 2017 · 381e8c0 · 381e8c0
1 parent 9e9ed4f
commit 381e8c0
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 13 deletions.
diff --git a/packages/electron-builder/src/codeSign.ts b/packages/electron-builder/src/codeSign.ts
@@ -18,9 +18,9 @@ export interface CodeSigningInfo {
   keychainName?: string | null
 }
 
-export async function downloadCertificate(urlOrBase64: string, tmpDir: TmpDir): Promise<string> {
+export async function downloadCertificate(urlOrBase64: string, tmpDir: TmpDir, currentDir: string): Promise<string> {
   let file: string | null = null
-  if ((urlOrBase64.length > 3 && urlOrBase64[1] === ":") || urlOrBase64.startsWith("/")) {
+  if ((urlOrBase64.length > 3 && urlOrBase64[1] === ":") || urlOrBase64.startsWith("/") || urlOrBase64.startsWith(".")) {
     file = urlOrBase64
   }
   else if (urlOrBase64.startsWith("file://")) {
@@ -30,16 +30,23 @@ export async function downloadCertificate(urlOrBase64: string, tmpDir: TmpDir):
     file = path.join(homedir(), urlOrBase64.substring("~/".length))
   }
   else {
-    const tempFile = await tmpDir.getTempFile(".p12")
-    if (urlOrBase64.startsWith("https://")) {
-      await download(urlOrBase64, tempFile)
+    const isUrl = urlOrBase64.startsWith("https://")
+    if (isUrl || urlOrBase64.length > 4096 || urlOrBase64.endsWith("=")) {
+      const tempFile = await tmpDir.getTempFile(".p12")
+      if (isUrl) {
+        await download(urlOrBase64, tempFile)
+      }
+      else {
+        await outputFile(tempFile, new Buffer(urlOrBase64, "base64"))
+      }
+      return tempFile
     }
     else {
-      await outputFile(tempFile, new Buffer(urlOrBase64, "base64"))
+      file = urlOrBase64
     }
-    return tempFile
   }
 
+  file = path.resolve(currentDir, file.trim())
   const stat = await statOrNull(file)
   if (stat == null) {
     throw new Error(`${file} doesn't exist`)
@@ -80,7 +87,16 @@ async function createCustomCertKeychain() {
   }
 }
 
-export async function createKeychain(tmpDir: TmpDir, cscLink: string, cscKeyPassword: string, cscILink?: string | null, cscIKeyPassword?: string | null): Promise<CodeSigningInfo> {
+export interface CreateKeychainOptions {
+  tmpDir: TmpDir
+  cscLink: string
+  cscKeyPassword: string
+  cscILink?: string | null
+  cscIKeyPassword?: string | null
+  currentDir: string
+}
+
+export async function createKeychain({tmpDir, cscLink, cscKeyPassword, cscILink, cscIKeyPassword, currentDir}: CreateKeychainOptions): Promise<CodeSigningInfo> {
   if (bundledCertKeychainAdded == null) {
     bundledCertKeychainAdded = createCustomCertKeychain()
   }
@@ -96,7 +112,7 @@ export async function createKeychain(tmpDir: TmpDir, cscLink: string, cscKeyPass
   const certPaths = new Array(certLinks.length)
   const keychainPassword = randomBytes(8).toString("hex")
   return await executeFinally(BluebirdPromise.all([
-      BluebirdPromise.map(certLinks, (link, i) => downloadCertificate(link, tmpDir).then(it => certPaths[i] = it)),
+      BluebirdPromise.map(certLinks, (link, i) => downloadCertificate(link, tmpDir, currentDir).then(it => certPaths[i] = it)),
       BluebirdPromise.mapSeries([
         ["create-keychain", "-p", keychainPassword, keychainName],
         ["unlock-keychain", "-p", keychainPassword, keychainName],

diff --git a/packages/electron-builder/src/macPackager.ts b/packages/electron-builder/src/macPackager.ts
@@ -28,7 +28,14 @@ export default class MacPackager extends PlatformPackager<MacOptions> {
       this.codeSigningInfo = BluebirdPromise.resolve(Object.create(null))
     }
     else {
-      this.codeSigningInfo = createKeychain(info.tempDirManager, this.packagerOptions.cscLink!, this.getCscPassword(), this.packagerOptions.cscInstallerLink, this.packagerOptions.cscInstallerKeyPassword)
+      this.codeSigningInfo = createKeychain({
+        tmpDir: info.tempDirManager,
+        cscLink: this.packagerOptions.cscLink!,
+        cscKeyPassword: this.getCscPassword(),
+        cscILink: this.packagerOptions.cscInstallerLink,
+        cscIKeyPassword: this.packagerOptions.cscInstallerKeyPassword,
+        currentDir: this.projectDir
+      })
     }
   }
 

diff --git a/packages/electron-builder/src/winPackager.ts b/packages/electron-builder/src/winPackager.ts
@@ -39,7 +39,7 @@ export class WinPackager extends PlatformPackager<WinBuildOptions> {
     else {
       const cscLink = process.env.WIN_CSC_LINK || this.packagerOptions.cscLink
       if (cscLink != null) {
-        return downloadCertificate(cscLink, this.info.tempDirManager)
+        return downloadCertificate(cscLink, this.info.tempDirManager, this.projectDir)
           .then(path => {
             return {
               file: path,

diff --git a/test/src/mac/CodeSignTest.ts b/test/src/mac/CodeSignTest.ts
@@ -12,12 +12,12 @@ if (process.env.CSC_KEY_PASSWORD == null) {
 const tmpDir = new TmpDir()
 
 test.ifMac("create keychain", async () => {
-  const result = await createKeychain(tmpDir, CSC_LINK, process.env.CSC_KEY_PASSWORD)
+  const result = await createKeychain({tmpDir, cscLink: CSC_LINK, cscKeyPassword: process.env.CSC_KEY_PASSWORD, currentDir: process.cwd()})
   expect(result.keychainName).not.toEqual("")
 })
 
 test.ifMac("create keychain with installers", async () => {
-  const result = await createKeychain(tmpDir, CSC_LINK, process.env.CSC_KEY_PASSWORD)
+  const result = await createKeychain({tmpDir, cscLink: CSC_LINK, cscKeyPassword: process.env.CSC_KEY_PASSWORD, currentDir: process.cwd()})
   expect(result.keychainName).not.toEqual("")
 })