Skip to content

Commit

Permalink
feat: add codesign verification and assessment prior to notarizing (#152
Browse files Browse the repository at this point in the history
)

* feat: add spctl and codesign verificatin prior to stapling

* fix output

* fix output

* chore: resolve comments

* Update src/check-signature.ts

* chore: fix lint

* chore: address comments

---------

Co-authored-by: Erick Zhao <[email protected]>
Co-authored-by: David Sanders <[email protected]>
  • Loading branch information
3 people authored Nov 14, 2023
1 parent 1c9790f commit b1b2ca1
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 0 deletions.
44 changes: 44 additions & 0 deletions src/check-signature.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import * as path from 'path';

import { spawn } from './spawn';
import { NotarizeStapleOptions } from './types';
import debug from 'debug';
const d = debug('electron-notarize');

const codesignDisplay = async (opts: NotarizeStapleOptions) => {
const result = await spawn('codesign', ['-dv', '-vvvv', '--deep', path.basename(opts.appPath)], {
cwd: path.dirname(opts.appPath),
});
return result;
};

const codesign = async (opts: NotarizeStapleOptions) => {
d('attempting to check codesign of app:', opts.appPath);
const result = await spawn(
'codesign',
['-vvv', '--deep', '--strict', path.basename(opts.appPath)],
{
cwd: path.dirname(opts.appPath),
},
);

return result;
};
export async function checkSignatures(opts: NotarizeStapleOptions): Promise<void> {
const [codesignResult, codesignInfo] = await Promise.all([codesign(opts), codesignDisplay(opts)]);
let error = '';

if (codesignInfo.code !== 0) {
d('codesignInfo failed');
error = `Failed to display codesign info on your application with code: ${codesignInfo.code}\n\n${codesignInfo.output}\n`;
}
if (codesignResult.code !== 0) {
d('codesign check failed');
error += `Failed to codesign your application with code: ${codesignResult.code}\n\n${codesignResult.output}\n\n${codesignInfo.output}`;
}

if (error) {
throw new Error(error);
}
d('codesign assess succeeded');
}
3 changes: 3 additions & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import debug from 'debug';
import retry from 'promise-retry';

import { checkSignatures } from './check-signature';
import { delay } from './helpers';
import { startLegacyNotarize, waitForLegacyNotarize } from './legacy';
import { isNotaryToolAvailable, notarizeAndWaitForNotaryTool } from './notarytool';
Expand All @@ -14,6 +15,8 @@ export { NotarizeOptions };
export { validateLegacyAuthorizationArgs as validateAuthorizationArgs } from './validate-args';

export async function notarize({ appPath, ...otherOptions }: NotarizeOptions) {
await checkSignatures({ appPath });

if (otherOptions.tool === 'legacy') {
console.warn(
'Notarizing using the legacy altool system. The altool system will be disabled on November 1 2023. Please switch to the notarytool system before then.',
Expand Down

0 comments on commit b1b2ca1

Please sign in to comment.