Merge commit 'd90d573ccf69a5b14b91aa818c8b97e0e6840399' into multi-as…

…ar-integrity # Conflicts: # test/index.spec.ts
electron · Feb 22, 2025 · 70dd4ab · 70dd4ab
2 parents 3ba0f9b + d90d573
commit 70dd4ab
Show file tree

Hide file tree

Showing 2 changed files with 275 additions and 80 deletions.
diff --git a/test/__snapshots__/index.spec.ts.snap b/test/__snapshots__/index.spec.ts.snap
@@ -404,6 +404,180 @@ exports[`makeUniversalApp asar mode should not inject ElectronAsarIntegrity into
 }
 `;
 
+exports[`makeUniversalApp asar mode should shim asars with different unpacked dirs 1`] = `
+{
+  "files": {
+    "index.js": {
+      "integrity": {
+        "algorithm": "SHA256",
+        "blockSize": 4194304,
+        "blocks": [
+          "0f6311dac07f0876c436ce2be042eb88c96e17eaf140b39627cf720dd87ad5b8",
+        ],
+        "hash": "0f6311dac07f0876c436ce2be042eb88c96e17eaf140b39627cf720dd87ad5b8",
+      },
+      "size": 66,
+    },
+    "package.json": {
+      "integrity": {
+        "algorithm": "SHA256",
+        "blockSize": 4194304,
+        "blocks": [
+          "d6226276d47adc7aa20e6c46e842e258f5157313074a035051a89612acdd6be3",
+        ],
+        "hash": "d6226276d47adc7aa20e6c46e842e258f5157313074a035051a89612acdd6be3",
+      },
+      "size": 41,
+    },
+    "private": {
+      "files": {
+        "var": {
+          "files": {
+            "app": {
+              "files": {
+                "file.txt": {
+                  "link": "private/var/file.txt",
+                },
+              },
+            },
+            "file.txt": {
+              "integrity": {
+                "algorithm": "SHA256",
+                "blockSize": 4194304,
+                "blocks": [
+                  "b94d27b9934d3e08a52e52d7da7dabfac484efe37a5380ee9088f7ace2efcde9",
+                ],
+                "hash": "b94d27b9934d3e08a52e52d7da7dabfac484efe37a5380ee9088f7ace2efcde9",
+              },
+              "size": 11,
+              "unpacked": true,
+            },
+          },
+        },
+      },
+    },
+    "var": {
+      "link": "private/var",
+    },
+  },
+}
+`;
+
+exports[`makeUniversalApp asar mode should shim asars with different unpacked dirs 2`] = `
+{
+  "files": {
+    "index.js": {
+      "integrity": {
+        "algorithm": "SHA256",
+        "blockSize": 4194304,
+        "blocks": [
+          "0f6311dac07f0876c436ce2be042eb88c96e17eaf140b39627cf720dd87ad5b8",
+        ],
+        "hash": "0f6311dac07f0876c436ce2be042eb88c96e17eaf140b39627cf720dd87ad5b8",
+      },
+      "size": 66,
+    },
+    "package.json": {
+      "integrity": {
+        "algorithm": "SHA256",
+        "blockSize": 4194304,
+        "blocks": [
+          "d6226276d47adc7aa20e6c46e842e258f5157313074a035051a89612acdd6be3",
+        ],
+        "hash": "d6226276d47adc7aa20e6c46e842e258f5157313074a035051a89612acdd6be3",
+      },
+      "size": 41,
+    },
+    "private": {
+      "files": {
+        "var": {
+          "files": {
+            "app": {
+              "files": {
+                "file.txt": {
+                  "link": "private/var/file.txt",
+                },
+              },
+            },
+            "file.txt": {
+              "integrity": {
+                "algorithm": "SHA256",
+                "blockSize": 4194304,
+                "blocks": [
+                  "b94d27b9934d3e08a52e52d7da7dabfac484efe37a5380ee9088f7ace2efcde9",
+                ],
+                "hash": "b94d27b9934d3e08a52e52d7da7dabfac484efe37a5380ee9088f7ace2efcde9",
+              },
+              "size": 11,
+            },
+          },
+        },
+      },
+    },
+    "var": {
+      "link": "private/var",
+    },
+  },
+}
+`;
+
+exports[`makeUniversalApp asar mode should shim asars with different unpacked dirs 3`] = `
+{
+  "files": {
+    "index.js": {
+      "integrity": {
+        "algorithm": "SHA256",
+        "blockSize": 4194304,
+        "blocks": [
+          "b7e5f58d3c0fddc1a57d1279a7f19a34a01784f4036920d4b60a1e33f6d1635b",
+        ],
+        "hash": "b7e5f58d3c0fddc1a57d1279a7f19a34a01784f4036920d4b60a1e33f6d1635b",
+      },
+      "size": 1068,
+    },
+    "package.json": {
+      "integrity": {
+        "algorithm": "SHA256",
+        "blockSize": 4194304,
+        "blocks": [
+          "2873266521e41d58d02e7acfbbbdb046edfa04b6ce262b8987de8e8548671fc7",
+        ],
+        "hash": "2873266521e41d58d02e7acfbbbdb046edfa04b6ce262b8987de8e8548671fc7",
+      },
+      "size": 33,
+    },
+  },
+}
+`;
+
+exports[`makeUniversalApp asar mode should shim asars with different unpacked dirs 4`] = `
+[
+  {
+    "content": "hello world",
+    "name": "private/var/file.txt",
+  },
+]
+`;
+
+exports[`makeUniversalApp asar mode should shim asars with different unpacked dirs 5`] = `
+{
+  "Contents/Info.plist": {
+    "Resources/app-arm64.asar": {
+      "algorithm": "SHA256",
+      "hash": "c7563e17e768e508045ffb888935d50dbf785bbba3ffb0068e5472fda4f6c199",
+    },
+    "Resources/app-x64.asar": {
+      "algorithm": "SHA256",
+      "hash": "7e6af4d00f4cc737eff922e2b386128a269f80887b79a011022f1276bdbe7832",
+    },
+    "Resources/app.asar": {
+      "algorithm": "SHA256",
+      "hash": "b62aaaed07ff72dc33da1720d900e0443c060285ef374ce1bdaef1d4f28b5fe4",
+    },
+  },
+}
+`;
+
 exports[`makeUniversalApp force packages successfully if \`out\` bundle already exists and \`force\` is \`true\` 1`] = `
 {
   "files": {

diff --git a/test/index.spec.ts b/test/index.spec.ts
@@ -10,7 +10,7 @@ import {
   VERIFY_APP_TIMEOUT,
   verifyApp,
 } from './util';
-import { createPackage } from '@electron/asar';
+import { createPackage, createPackageWithOptions } from '@electron/asar';
 
 // See `jest.setup.ts` for app fixture setup process
 describe('makeUniversalApp', () => {
@@ -160,89 +160,110 @@ describe('makeUniversalApp', () => {
       },
       VERIFY_APP_TIMEOUT,
     );
-    it(
-      'should generate AsarIntegrity for all asars in the application',
-      async () => {
-        const { testPath } = await createTestApp('app-2');
-        const testAsarPath = path.resolve(appsOutPath, 'app-2.asar');
-        await createPackage(testPath, testAsarPath);
-
-        const arm64AppPath = await templateApp('Arm64-2.app', 'arm64', async (appPath) => {
-          await fs.copyFile(
-            testAsarPath,
-            path.resolve(appPath, 'Contents', 'Resources', 'app.asar'),
-          );
-          await fs.copyFile(
-            testAsarPath,
-            path.resolve(appPath, 'Contents', 'Resources', 'webapp.asar'),
-          );
-        });
-        const x64AppPath = await templateApp('X64-2.app', 'x64', async (appPath) => {
-          await fs.copyFile(
-            testAsarPath,
-            path.resolve(appPath, 'Contents', 'Resources', 'app.asar'),
-          );
-          await fs.copyFile(
-            testAsarPath,
-            path.resolve(appPath, 'Contents', 'Resources', 'webbapp.asar'),
-          );
-        });
-        const outAppPath = path.resolve(appsOutPath, 'MultipleAsars.app');
-        await makeUniversalApp({
-          x64AppPath,
-          arm64AppPath,
-          outAppPath,
-          mergeASARs: true,
-        });
-        await verifyApp(outAppPath);
-      },
-      VERIFY_APP_TIMEOUT,
-    );
-  });
+    it('should generate AsarIntegrity for all asars in the application', async () => {
+      const { testPath } = await createTestApp('app-2');
+      const testAsarPath = path.resolve(appsOutPath, 'app-2.asar');
+      await createPackage(testPath, testAsarPath);
 
-  describe('no asar mode', () => {
-    it(
-      'should correctly merge two identical app folders',
-      async () => {
-        const out = path.resolve(appsOutPath, 'MergedNoAsar.app');
-        await makeUniversalApp({
-          x64AppPath: path.resolve(appsPath, 'X64NoAsar.app'),
-          arm64AppPath: path.resolve(appsPath, 'Arm64NoAsar.app'),
-          outAppPath: out,
-        });
-        await verifyApp(out);
-      },
-      VERIFY_APP_TIMEOUT,
-    );
+      const arm64AppPath = await templateApp('Arm64-2.app', 'arm64', async (appPath) => {
+        await fs.copyFile(testAsarPath, path.resolve(appPath, 'Contents', 'Resources', 'app.asar'));
+        await fs.copyFile(
+          testAsarPath,
+          path.resolve(appPath, 'Contents', 'Resources', 'webapp.asar'),
+        );
+      });
+      const x64AppPath = await templateApp('X64-2.app', 'x64', async (appPath) => {
+        await fs.copyFile(testAsarPath, path.resolve(appPath, 'Contents', 'Resources', 'app.asar'));
+        await fs.copyFile(
+          testAsarPath,
+          path.resolve(appPath, 'Contents', 'Resources', 'webbapp.asar'),
+        );
+      });
+      const outAppPath = path.resolve(appsOutPath, 'MultipleAsars.app');
 
-    it(
-      'should shim two different app folders',
-      async () => {
-        const arm64AppPath = await templateApp('ShimArm64.app', 'arm64', async (appPath) => {
-          const { testPath } = await createTestApp('shimArm64', {
-            'i-aint-got-no-rhythm.bin': 'boomshakalaka',
+      it(
+        'should shim asars with different unpacked dirs',
+        async () => {
+          const arm64AppPath = await templateApp('UnpackedArm64.app', 'arm64', async (appPath) => {
+            const { testPath } = await createTestApp('UnpackedAppArm64');
+            await createPackageWithOptions(
+              testPath,
+              path.resolve(appPath, 'Contents', 'Resources', 'app.asar'),
+              {
+                unpackDir: 'var',
+                unpack: '*.txt',
+              },
+            );
           });
-          await fs.copy(testPath, path.resolve(appPath, 'Contents', 'Resources', 'app'));
-        });
 
-        const x64AppPath = await templateApp('ShimX64.app', 'x64', async (appPath) => {
-          const { testPath } = await createTestApp('shimX64', { 'hello-world.bin': 'Hello World' });
-          await fs.copy(testPath, path.resolve(appPath, 'Contents', 'Resources', 'app'));
-        });
+          const x64AppPath = await templateApp('UnpackedX64.app', 'x64', async (appPath) => {
+            const { testPath } = await createTestApp('UnpackedAppX64');
+            await createPackageWithOptions(
+              testPath,
+              path.resolve(appPath, 'Contents', 'Resources', 'app.asar'),
+              {},
+            );
+          });
 
-        const outAppPath = path.resolve(appsOutPath, 'ShimNoAsar.app');
-        await makeUniversalApp({
-          x64AppPath,
-          arm64AppPath,
-          outAppPath,
-        });
-        await verifyApp(outAppPath);
-      },
-      VERIFY_APP_TIMEOUT,
-    );
-  });
+          const outAppPath = path.resolve(appsOutPath, 'UnpackedDir.app');
+          await makeUniversalApp({
+            x64AppPath,
+            arm64AppPath,
+            outAppPath,
+            mergeASARs: true,
+          });
+          await verifyApp(outAppPath);
+        },
+        VERIFY_APP_TIMEOUT,
+      );
+    });
+
+    describe('no asar mode', () => {
+      it(
+        'should correctly merge two identical app folders',
+        async () => {
+          const out = path.resolve(appsOutPath, 'MergedNoAsar.app');
+          await makeUniversalApp({
+            x64AppPath: path.resolve(appsPath, 'X64NoAsar.app'),
+            arm64AppPath: path.resolve(appsPath, 'Arm64NoAsar.app'),
+            outAppPath: out,
+          });
+          await verifyApp(out);
+        },
+        VERIFY_APP_TIMEOUT,
+      );
+
+      it(
+        'should shim two different app folders',
+        async () => {
+          const arm64AppPath = await templateApp('ShimArm64.app', 'arm64', async (appPath) => {
+            const { testPath } = await createTestApp('shimArm64', {
+              'i-aint-got-no-rhythm.bin': 'boomshakalaka',
+            });
+            await fs.copy(testPath, path.resolve(appPath, 'Contents', 'Resources', 'app'));
+          });
 
-  // TODO: Add tests for
-  // * different app dirs with different macho files
-  // * identical app dirs with universal macho files
+          const x64AppPath = await templateApp('ShimX64.app', 'x64', async (appPath) => {
+            const { testPath } = await createTestApp('shimX64', {
+              'hello-world.bin': 'Hello World',
+            });
+            await fs.copy(testPath, path.resolve(appPath, 'Contents', 'Resources', 'app'));
+          });
+
+          const outAppPath = path.resolve(appsOutPath, 'ShimNoAsar.app');
+          await makeUniversalApp({
+            x64AppPath,
+            arm64AppPath,
+            outAppPath,
+          });
+          await verifyApp(outAppPath);
+        },
+        VERIFY_APP_TIMEOUT,
+      );
+    });
+
+    // TODO: Add tests for
+    // * different app dirs with different macho files
+    // * identical app dirs with universal macho files
+  });
 });