Beautiful, AI-native markdown IDE and LLM wiki
TypeScript 2nd-brainagent-skillsclaudecodexcompany-braindocsknowledge-knowledge-baseknowledge-managementllmllm-wikillm-wiki-karpathymarkdownmarkdown-editormdmdxnotespkmsecond-brainskills
Seal the desktop helper bundle before the fuse flip (#5098)
Andrew Mikofalvy4de92b509e70
diff --git a/packages/desktop/scripts/afterPack.mjs b/packages/desktop/scripts/afterPack.mjsindex 24f262dfc..40ec251e5 100644--- a/packages/desktop/scripts/afterPack.mjs+++ b/packages/desktop/scripts/afterPack.mjs@@ -1,4 +1,5 @@#!/usr/bin/env node+import { execFileSync } from 'node:child_process';import { chmodSync, copyFileSync, existsSync, mkdirSync, writeFileSync } from 'node:fs';import { dirname, join } from 'node:path';import { FuseV1Options, FuseVersion, flipFuses } from '@electron/fuses';@@ -32,6 +33,33 @@ async function flipElectronFuses(electronBinary, electronPlatformName) {console.log('[afterPack] fuses flipped successfully; electron-builder will re-sign next');}+export function assertAdHocSealCoversBundle(appPath) {+ try {+ execFileSync('/usr/bin/codesign', ['--verify', '--deep', '--strict', '--verbose=3', appPath], {+ stdio: ['ignore', 'pipe', 'pipe'],+ });+ } catch (err) {+ if (typeof err?.status !== 'number') {+ throw createFuseFailure(+ `[afterPack] could not run /usr/bin/codesign to verify the ad-hoc seal on ${appPath}: ` ++ `${err?.code ?? err?.signal ?? (err instanceof Error ? err.message : String(err))}`,+ { cause: err },+ );+ }+ const lines = `${err.stderr ?? ''}\n${err.stdout ?? ''}`+ .split('\n')+ .filter((line) => line.trim() !== '' && !/^--(prepared|validated):/.test(line));+ throw createFuseFailure(+ `[afterPack] codesign --verify --deep --strict rejected ${appPath} after the fuse flip ` ++ `re-sealed it ad hoc, so electron-builder's signer would meet the same nested ` ++ `signature. Either a bundle changed after the seal or the re-seal left an invalid ` ++ `nested signature. codesign exited ${err.status}:\n${[...new Set(lines)].join('\n')}`,+ { cause: err },+ );+ }+ console.log('[afterPack] ad-hoc seal verified across every nested bundle');+}+export default async function afterPack(context) {const { appOutDir, packager, electronPlatformName } = context;@@ -52,9 +80,8 @@ export default async function afterPack(context) {);}- await flipElectronFuses(electronBinary, electronPlatformName);-if (electronPlatformName !== 'darwin') {+ await flipElectronFuses(electronBinary, electronPlatformName);console.log(`[afterPack] fuses done; skipping darwin-only helper-bundle + node-pty steps on "${electronPlatformName}"`,);@@ -137,4 +164,7 @@ export default async function afterPack(context) {const resourcesDir = join(appOutDir, `${appName}.app`, 'Contents', 'Resources');const ptyHelpers = ensureNodePtySpawnHelperExecutable(resourcesDir);console.log(`[afterPack] node-pty spawn-helper marked executable (${ptyHelpers.length} file(s))`);++ await flipElectronFuses(electronBinary, electronPlatformName);+ assertAdHocSealCoversBundle(join(appOutDir, `${appName}.app`));}diff --git a/packages/desktop/tests/unit/after-pack-signing-order.test.mjs b/packages/desktop/tests/unit/after-pack-signing-order.test.mjsnew file mode 100644index 000000000..a6a6acdc8--- /dev/null+++ b/packages/desktop/tests/unit/after-pack-signing-order.test.mjs@@ -0,0 +1,118 @@+import { execFileSync } from 'node:child_process';+import { chmodSync, copyFileSync, mkdirSync, mkdtempSync, writeFileSync } from 'node:fs';+import { createRequire } from 'node:module';+import { tmpdir } from 'node:os';+import { dirname, join } from 'node:path';+import { afterEach, describe, expect, test, vi } from 'vitest';+import afterPack, { assertAdHocSealCoversBundle } from '../../scripts/afterPack.mjs';+import { removeTempDirBestEffort } from '../support/temp-dir-cleanup.test-helper.ts';++vi.mock('@electron/fuses', async (importOriginal) => ({+ ...(await importOriginal()),+ flipFuses: async (electronBinary) => {+ resealAdHoc(`${electronBinary.split('.app')[0]}.app`);+ return 1;+ },+}));++function electronBuilderOsxSign() {+ const requireFromDesktop = createRequire(new URL('../../package.json', import.meta.url));+ const electronBuilder = dirname(requireFromDesktop.resolve('electron-builder/package.json'));+ const appBuilderLib = dirname(+ requireFromDesktop.resolve('app-builder-lib/package.json', { paths: [electronBuilder] }),+ );+ return createRequire(join(appBuilderLib, 'package.json'))('@electron/osx-sign');+}++function codesign(args) {+ execFileSync('/usr/bin/codesign', args, { stdio: 'pipe' });+}++function resealAdHoc(app) {+ codesign([+ '--sign',+ '-',+ '--force',+ '--preserve-metadata=entitlements,requirements,flags,runtime',+ '--deep',+ app,+ ]);+}++const roots = [];+afterEach(() => {+ for (const root of roots.splice(0)) removeTempDirBestEffort(root);+});++function infoPlist(executable, identifier) {+ return `<?xml version="1.0"?><plist version="1.0"><dict><key>CFBundleIdentifier</key><string>${identifier}</string><key>CFBundleExecutable</key><string>${executable}</string><key>CFBundlePackageType</key><string>APPL</string></dict></plist>`;+}++function adHocMachO(destination) {+ mkdirSync(dirname(destination), { recursive: true });+ copyFileSync('/usr/bin/true', destination);+ codesign(['--sign', '-', '--force', destination]);+}++function executableBundle(bundle, executable, identifier) {+ adHocMachO(join(bundle, 'Contents/MacOS', executable));+ writeFileSync(join(bundle, 'Contents/Info.plist'), infoPlist(executable, identifier));+}++function packedApp() {+ const appOutDir = mkdtempSync(join(tmpdir(), 'ok-after-pack-'));+ roots.push(appOutDir);+ const app = join(appOutDir, 'Fixture.app');+ const frameworks = join(app, 'Contents/Frameworks');+ executableBundle(app, 'Fixture', 'ai.openknowledge.after-pack-test');+ executableBundle(+ join(frameworks, 'Fixture Helper.app'),+ 'Fixture Helper',+ 'ai.openknowledge.after-pack-test.helper',+ );+ const serverContents = join(frameworks, 'Fixture Server.app/Contents');+ mkdirSync(serverContents, { recursive: true });+ writeFileSync(+ join(serverContents, 'Info.plist'),+ infoPlist('Fixture Helper', 'ai.openknowledge.after-pack-test.server'),+ );+ const spawnHelper = join(+ app,+ 'Contents/Resources/app.asar.unpacked/node_modules/node-pty/prebuilds/darwin-arm64/spawn-helper',+ );+ adHocMachO(spawnHelper);+ chmodSync(spawnHelper, 0o644);+ return { appOutDir, app, serverContents };+}++describe.skipIf(process.platform !== 'darwin')('afterPack hands the signer a sealed bundle', () => {+ test("electron-builder's signer signs the packed app in a single pass", async () => {+ const { appOutDir, app } = packedApp();+ await afterPack({+ appOutDir,+ electronPlatformName: 'darwin',+ packager: { appInfo: { productFilename: 'Fixture' } },+ });+ await expect(+ electronBuilderOsxSign().signAsync({+ app,+ identity: '-',+ identityValidation: false,+ platform: 'darwin',+ type: 'distribution',+ version: '43.4.0',+ preAutoEntitlements: false,+ preEmbedProvisioningProfile: false,+ optionsForFile: () => ({ hardenedRuntime: true, timestamp: 'none' }),+ }),+ ).resolves.toBeUndefined();+ codesign(['--verify', '--deep', '--strict', app]);+ });++ test('a nested bundle filled in after the ad-hoc seal fails the pre-sign check', () => {+ const { app, serverContents } = packedApp();+ resealAdHoc(app);+ adHocMachO(join(serverContents, 'MacOS/Fixture Helper'));+ expect(() => assertAdHocSealCoversBundle(app)).toThrow(/rejected[\s\S]*Fixture Server\.app/);+ });+});