CM-53930: fix onedir signing issues on mac

Author: gotbadger

.github/workflows/build_executable.yml

@@ -136,7 +136,9 @@ jobs:
           # Main executable must be signed last after all its dependencies
           find dist/cycode-cli -type f ! -name "cycode-cli" | while read -r file; do
             if file -b "$file" | grep -q "Mach-O"; then
-              codesign --force --sign "$APPLE_CERT_NAME" --timestamp --options runtime "$file"
+              # override identifier to avoid framework-style identifiers (e.g. org.python.python)
+              # that cause --strict verification to expect a missing Info.plist
+              codesign --force --sign "$APPLE_CERT_NAME" --identifier "com.cycode.$(basename "$file")" --timestamp --options runtime "$file"
             fi
           done
 
@@ -176,15 +178,35 @@ jobs:
 
           # we can't staple the app because it's executable
 
+      - name: Verify macOS code signatures
+        if: runner.os == 'macOS'
+        run: |
+          # verify all Mach-O binaries in the output are properly signed
+          FAILED=false
+          while IFS= read -r file; do
+            if file -b "$file" | grep -q "Mach-O"; then
+              if ! codesign --verify --strict "$file" 2>&1; then
+                echo "INVALID signature: $file"
+                codesign -dv "$file" 2>&1 || true
+                FAILED=true
+              fi
+            fi
+          done < <(find dist/cycode-cli -type f)
+
+          if [ "$FAILED" = true ]; then
+            echo "Found binaries with invalid signatures!"
+            exit 1
+          fi
+
+          # verify main executable signature in detail
+          codesign -dv --verbose=4 $PATH_TO_CYCODE_CLI_EXECUTABLE
+
       - name: Test macOS signed executable
         if: runner.os == 'macOS'
         run: |
           file -b $PATH_TO_CYCODE_CLI_EXECUTABLE
           time $PATH_TO_CYCODE_CLI_EXECUTABLE version
 
-          # verify signature
-          codesign -dv --verbose=4 $PATH_TO_CYCODE_CLI_EXECUTABLE
-
       - name: Import cert for Windows and setup envs
         if: runner.os == 'Windows'
         env:
@@ -236,6 +258,46 @@ jobs:
           name: ${{ env.ARTIFACT_NAME }}
           path: dist
 
+      - name: Verify macOS artifact end-to-end
+        if: runner.os == 'macOS' && matrix.mode == 'onedir'
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ env.ARTIFACT_NAME }}
+          path: /tmp/artifact-verify
+
+      - name: Verify macOS artifact signatures and run with quarantine
+        if: runner.os == 'macOS' && matrix.mode == 'onedir'
+        run: |
+          # extract the onedir zip exactly as an end user would
+          ARCHIVE=$(find /tmp/artifact-verify -name "*.zip" | head -1)
+          echo "Verifying archive: $ARCHIVE"
+          ditto -x -k "$ARCHIVE" /tmp/artifact-extracted
+
+          # verify all Mach-O code signatures (strict mode)
+          FAILED=false
+          while IFS= read -r file; do
+            if file -b "$file" | grep -q "Mach-O"; then
+              if ! codesign --verify --strict "$file" 2>&1; then
+                echo "INVALID: $file"
+                codesign -dv "$file" 2>&1 || true
+                FAILED=true
+              else
+                echo "OK: $file"
+              fi
+            fi
+          done < <(find /tmp/artifact-extracted -type f)
+
+          if [ "$FAILED" = true ]; then
+            echo "Artifact contains binaries with invalid signatures!"
+            exit 1
+          fi
+
+          # simulate download quarantine and test execution
+          find /tmp/artifact-extracted -type f -exec xattr -w com.apple.quarantine "0081;$(printf '%x' $(date +%s));CI;$(uuidgen)" {} \;
+          EXECUTABLE=$(find /tmp/artifact-extracted -name "cycode-cli" -type f | head -1)
+          echo "Testing quarantined executable: $EXECUTABLE"
+          time "$EXECUTABLE" version
+
       - name: Upload files to release
         if: ${{ github.event_name == 'workflow_dispatch' && inputs.publish }}
         uses: svenstaro/upload-release-action@v2

process_executable_file.py

@@ -13,6 +13,7 @@
 import os
 import platform
 import shutil
+import subprocess
 from pathlib import Path
 from string import Template
 from typing import Union
@@ -140,6 +141,14 @@ def get_cli_archive_path(output_path: Path, is_onedir: bool) -> str:
     return os.path.join(output_path, get_cli_archive_filename(is_onedir))
 
 
+def archive_directory(input_path: Path, output_path: str) -> None:
+    if get_os_name() == 'darwin':
+        # use ditto on macOS to preserve code signature metadata
+        subprocess.run(['ditto', '-c', '-k', str(input_path), output_path], check=True)
+    else:
+        shutil.make_archive(output_path.removesuffix(f'.{_ARCHIVE_FORMAT}'), _ARCHIVE_FORMAT, input_path)
+
+
 def process_executable_file(input_path: Path, is_onedir: bool) -> str:
     output_path = input_path.parent
     hash_file_path = get_cli_hash_path(output_path, is_onedir)
@@ -150,7 +159,7 @@ def process_executable_file(input_path: Path, is_onedir: bool) -> str:
         write_hashes_db_to_file(normalized_hashes, hash_file_path)
 
         archived_file_path = get_cli_archive_path(output_path, is_onedir)
-        shutil.make_archive(archived_file_path, _ARCHIVE_FORMAT, input_path)
+        archive_directory(input_path, f'{archived_file_path}.{_ARCHIVE_FORMAT}')
         shutil.rmtree(input_path)
     else:
         file_hash = get_hash_of_file(input_path)