From 776a275fc3e645d8176f7500af367c26bf578780 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 17 Jun 2024 15:02:43 +0100
Subject: [PATCH 1/7] Remove stale macos entitlement

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 build/entitlements.mac.plist | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/build/entitlements.mac.plist b/build/entitlements.mac.plist
index 3fdab97494..40db3d9e0b 100644
--- a/build/entitlements.mac.plist
+++ b/build/entitlements.mac.plist
@@ -12,8 +12,7 @@
     <!-- https://github.com/electron/electron-notarize#prerequisites -->
     <key>com.apple.security.cs.allow-jit</key>
     <true/>
-    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-    <true/>
+
     <!-- https://github.com/electron-userland/electron-builder/issues/3940 -->
     <key>com.apple.security.cs.disable-library-validation</key>
     <true/>

From 70ef8e1d362455a2de42d768bf6561a06734d8d0 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 17 Jun 2024 15:02:52 +0100
Subject: [PATCH 2/7] Enable app sandbox entitlement

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 build/entitlements.mac.plist | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/build/entitlements.mac.plist b/build/entitlements.mac.plist
index 40db3d9e0b..9b66d24bd1 100644
--- a/build/entitlements.mac.plist
+++ b/build/entitlements.mac.plist
@@ -2,13 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <!-- Entitlements from electron-builder's defaults
-         (https://github.com/electron-userland/electron-builder/blob/master/packages/app-builder-lib/templates/entitlements.mac.plist)
-         nb. This does *not* include the app sandbox: at the time of adding this file,
-         we were using electron-builder 21.2.0 which does not have the sandbox entitlement.
-         Latest electron-builder does, but it appears to be causing issues:
-         (https://github.com/electron-userland/electron-builder/issues/4390)
-    -->
     <!-- https://github.com/electron/electron-notarize#prerequisites -->
     <key>com.apple.security.cs.allow-jit</key>
     <true/>
@@ -17,8 +10,19 @@
     <key>com.apple.security.cs.disable-library-validation</key>
     <true/>
 
-    <!-- Our own additional entitlements (we need to access the camera and
-        mic for VoIP calls -->
+    <!-- Enable the app sandbox -->
+    <key>com.apple.security.app-sandbox</key>
+    <true/>
+
+    <!-- Allow opening outgoing network connections -->
+    <key>com.apple.security.network.client</key>
+    <true/>
+
+    <!-- Allow opening & saving files for upload & download -->
+    <key>com.apple.security.files.user-selected.read-write</key>
+    <true/>
+
+    <!-- Access to camera & microphone for calls ->
     <key>com.apple.security.device.camera</key>
     <true/>
     <key>com.apple.security.device.audio-input</key>

From 319914f9ccedb1f4f9cc849efba1b8c6638f67e6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 17 Jun 2024 16:24:18 +0100
Subject: [PATCH 3/7] Testing this requires signing the app

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .github/workflows/build_and_test.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml
index c940c73c1c..02dc69231d 100644
--- a/.github/workflows/build_and_test.yaml
+++ b/.github/workflows/build_and_test.yaml
@@ -31,7 +31,9 @@ jobs:
             matrix:
                 sqlcipher: [system, static]
                 arch: [amd64, arm64]
+        secrets: inherit
         with:
+            sign: true
             config: ${{ github.event.pull_request.base.ref == 'develop' && 'element.io/nightly' || 'element.io/release' }}
             sqlcipher: ${{ matrix.sqlcipher }}
             arch: ${{ matrix.arch }}

From bc83760883150cb2cd8e5812a1e2a8ec7f21c610 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 17 Jun 2024 16:27:32 +0100
Subject: [PATCH 4/7] Testing this requires signing the app

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .github/workflows/build_and_test.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml
index 02dc69231d..ea935295f7 100644
--- a/.github/workflows/build_and_test.yaml
+++ b/.github/workflows/build_and_test.yaml
@@ -31,9 +31,7 @@ jobs:
             matrix:
                 sqlcipher: [system, static]
                 arch: [amd64, arm64]
-        secrets: inherit
         with:
-            sign: true
             config: ${{ github.event.pull_request.base.ref == 'develop' && 'element.io/nightly' || 'element.io/release' }}
             sqlcipher: ${{ matrix.sqlcipher }}
             arch: ${{ matrix.arch }}
@@ -42,6 +40,9 @@ jobs:
         needs: fetch
         name: macOS
         uses: ./.github/workflows/build_macos.yaml
+        secrets: inherit
+        with:
+            sign: true
 
     test:
         needs:

From a0cfd49bab3b64e3c55fd65e4a6f27ce1d93adc4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 4 Nov 2024 12:48:45 +0000
Subject: [PATCH 5/7] Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .github/workflows/build_macos.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build_macos.yaml b/.github/workflows/build_macos.yaml
index c92d8536fa..dc7ddbc13d 100644
--- a/.github/workflows/build_macos.yaml
+++ b/.github/workflows/build_macos.yaml
@@ -91,6 +91,8 @@ jobs:
                   APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
                   CSC_KEY_PASSWORD: ${{ secrets.APPLE_CSC_KEY_PASSWORD }}
                   CSC_LINK: ${{ secrets.APPLE_CSC_LINK }}
+                  # TODO REMOVE
+                  CSC_FOR_PULL_REQUEST: true
 
             - name: Check app was signed & notarised successfully
               if: inputs.sign != ''

From 9bb4eb5f606d0c68dff65cc5d17136a39b023165 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 4 Nov 2024 13:01:39 +0000
Subject: [PATCH 6/7] Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 electron-builder.ts | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/electron-builder.ts b/electron-builder.ts
index ae0d06784e..bfd6361188 100644
--- a/electron-builder.ts
+++ b/electron-builder.ts
@@ -16,6 +16,9 @@ import { flipFuses, FuseVersion, FuseV1Options } from "@electron/fuses";
  *  Replaces spaces in the product name with dashes as spaces in paths can cause issues
  *  Removes libsqlcipher0 recommended dependency if env SQLCIPHER_BUNDLED is asserted.
  *  Passes $ED_DEBIAN_CHANGELOG to build.deb.fpm if specified
+ *
+ * On macOS:
+ *  Passes $APPLE_TEAM_ID to build.mac.extendInfo["ElectronTeamID"] if specified.
  */
 
 const NIGHTLY_APP_ID = "im.riot.nightly";
@@ -176,6 +179,16 @@ if (process.env.ED_SIGNTOOL_SUBJECT_NAME && process.env.ED_SIGNTOOL_THUMBPRINT)
     config.win.certificateSha1 = process.env.ED_SIGNTOOL_THUMBPRINT;
 }
 
+/**
+ * Allow specifying ElectronTeamID via env vars
+ * @param {string} process.env.APPLE_TEAM_ID
+ */
+if (process.env.APPLE_TEAM_ID) {
+    config.mac.extendInfo = {
+        ElectronTeamID: process.env.APPLE_TEAM_ID,
+    };
+}
+
 /**
  * Allow specifying nightly version via env var
  * @param {string} process.env.ED_NIGHTLY

From 7dedd7c7fff76f6954f04b0e2d0e99853c782a00 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 4 Nov 2024 13:28:14 +0000
Subject: [PATCH 7/7] Stash

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 build/entitlements-sandbox.mac.plist | 33 ++++++++++++++++++++++++++++
 build/entitlements.mac.plist         |  4 ----
 electron-builder.ts                  |  2 ++
 3 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 build/entitlements-sandbox.mac.plist

diff --git a/build/entitlements-sandbox.mac.plist b/build/entitlements-sandbox.mac.plist
new file mode 100644
index 0000000000..e3c0aaefe4
--- /dev/null
+++ b/build/entitlements-sandbox.mac.plist
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <!-- https://github.com/electron/electron-notarize#prerequisites -->
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
+
+    <!-- https://github.com/electron-userland/electron-builder/issues/3940 -->
+    <key>com.apple.security.cs.disable-library-validation</key>
+    <true/>
+
+    <!-- Enable the app sandbox -->
+    <key>com.apple.security.app-sandbox</key>
+    <true/>
+    <key>com.apple.security.inherit</key>
+    <true/>
+
+    <!-- Allow opening outgoing network connections -->
+    <key>com.apple.security.network.client</key>
+    <true/>
+
+    <!-- Allow opening & saving files for upload & download -->
+    <key>com.apple.security.files.user-selected.read-write</key>
+    <true/>
+
+    <!-- Access to camera & microphone for calls ->
+    <key>com.apple.security.device.camera</key>
+    <true/>
+    <key>com.apple.security.device.audio-input</key>
+    <true/>
+</dict>
+</plist>
diff --git a/build/entitlements.mac.plist b/build/entitlements.mac.plist
index 9b66d24bd1..8f8d787b19 100644
--- a/build/entitlements.mac.plist
+++ b/build/entitlements.mac.plist
@@ -10,10 +10,6 @@
     <key>com.apple.security.cs.disable-library-validation</key>
     <true/>
 
-    <!-- Enable the app sandbox -->
-    <key>com.apple.security.app-sandbox</key>
-    <true/>
-
     <!-- Allow opening outgoing network connections -->
     <key>com.apple.security.network.client</key>
     <true/>
diff --git a/electron-builder.ts b/electron-builder.ts
index bfd6361188..e996979c1f 100644
--- a/electron-builder.ts
+++ b/electron-builder.ts
@@ -182,11 +182,13 @@ if (process.env.ED_SIGNTOOL_SUBJECT_NAME && process.env.ED_SIGNTOOL_THUMBPRINT)
 /**
  * Allow specifying ElectronTeamID via env vars
  * @param {string} process.env.APPLE_TEAM_ID
+ * Workaround for https://github.com/electron-userland/electron-builder/issues/7995
  */
 if (process.env.APPLE_TEAM_ID) {
     config.mac.extendInfo = {
         ElectronTeamID: process.env.APPLE_TEAM_ID,
     };
+    config.mac.entitlements = "./build/entitlements-sandbox.mac.plist";
 }
 
 /**