Skip to content

Force Proxy to any Windows/MacOS/Linux Application TCP and UDP traffic

fixed workflow

Sourav Kalal920bd0e27e30
diff --git a/.github/workflows/build-mac.yml b/.github/workflows/build-mac.yml
index 1cc6706..f008e28 100644
--- a/.github/workflows/build-mac.yml
+++ b/.github/workflows/build-mac.yml
@@ -28,22 +28,36 @@ jobs:
DEVELOPER_ID_APP_CERT_PASSWORD: ${{ secrets.DEVELOPER_ID_APP_CERT_PASSWORD }}
DEVELOPER_ID_INSTALLER_CERT: ${{ secrets.DEVELOPER_ID_INSTALLER_CERT }}
DEVELOPER_ID_INSTALLER_CERT_PASSWORD: ${{ secrets.DEVELOPER_ID_INSTALLER_CERT_PASSWORD }}
+ TEAM_ID: ${{ secrets.TEAM_ID }}
run: |
+ security list-keychains -d user -s login.keychain
+
security create-keychain -p actions build.keychain
- security default-keychain -s build.keychain
+ security list-keychains -d user -s build.keychain $(security list-keychains -d user | sed s/\"//g)
+ security set-keychain-settings build.keychain
security unlock-keychain -p actions build.keychain
- security set-keychain-settings -t 3600 -u build.keychain
echo "$DEVELOPER_ID_APP_CERT" | base64 --decode > app_cert.p12
- security import app_cert.p12 -k build.keychain -P "$DEVELOPER_ID_APP_CERT_PASSWORD" -T /usr/bin/codesign
+ security import app_cert.p12 -k build.keychain -P "$DEVELOPER_ID_APP_CERT_PASSWORD" -A -T /usr/bin/codesign -T /usr/bin/productsign
echo "$DEVELOPER_ID_INSTALLER_CERT" | base64 --decode > installer_cert.p12
- security import installer_cert.p12 -k build.keychain -P "$DEVELOPER_ID_INSTALLER_CERT_PASSWORD" -T /usr/bin/productsign
+ security import installer_cert.p12 -k build.keychain -P "$DEVELOPER_ID_INSTALLER_CERT_PASSWORD" -A -T /usr/bin/codesign -T /usr/bin/productsign
- security set-key-partition-list -S apple-tool:,apple: -s -k actions build.keychain
+ security set-key-partition-list -S apple-tool:,apple: -s -k actions -D "$TEAM_ID" -t private build.keychain
rm app_cert.p12 installer_cert.p12
+ - name: Setup Notarization Profile
+ env:
+ APPLE_ID: ${{ secrets.APPLE_ID }}
+ APPLE_PASSWORD: ${{ secrets.APPLE_APP_PASSWORD }}
+ TEAM_ID: ${{ secrets.TEAM_ID }}
+ run: |
+ xcrun notarytool store-credentials "notarytool-profile" \
+ --apple-id "$APPLE_ID" \
+ --team-id "$TEAM_ID" \
+ --password "$APPLE_PASSWORD"
+
- name: Build Universal Binary
run: |
cd MacOS/ProxyBridge
@@ -60,22 +74,28 @@ jobs:
clean build
- name: Sign App and Extension
+ env:
+ DEVELOPER_ID_IDENTITY: ${{ secrets.DEVELOPER_ID_IDENTITY }}
run: |
cd MacOS/ProxyBridge
- codesign --force --deep --sign "${{ secrets.DEVELOPER_ID_IDENTITY }}" \
+ codesign --force --options runtime --timestamp \
+ --sign "$DEVELOPER_ID_IDENTITY" \
--entitlements extension/extensionRelease.entitlements \
- --options runtime \
build/DerivedData/Build/Products/Release/ProxyBridge.app/Contents/Library/SystemExtensions/com.interceptsuite.ProxyBridge.extension.systemextension
- codesign --force --deep --sign "${{ secrets.DEVELOPER_ID_IDENTITY }}" \
+ codesign --force --options runtime --timestamp \
+ --sign "$DEVELOPER_ID_IDENTITY" \
--entitlements ProxyBridge/ProxyBridgeRelease.entitlements \
- --options runtime \
build/DerivedData/Build/Products/Release/ProxyBridge.app
- codesign --verify --verbose=2 --deep --strict build/DerivedData/Build/Products/Release/ProxyBridge.app
+ codesign --verify --deep --strict build/DerivedData/Build/Products/Release/ProxyBridge.app
- name: Create and Sign PKG
+ env:
+ TEAM_ID: ${{ secrets.TEAM_ID }}
+ run: |
+ DEVELOPER_ID_INSTALLER_IDENTITY: ${{ secrets.DEVELOPER_ID_INSTALLER_IDENTITY }}
run: |
cd MacOS/ProxyBridge
mkdir -p build/component output
@@ -107,30 +127,23 @@ jobs:
</installer-gui-script>
EOF
- security unlock-keychain -p actions build.keychain
-
- productbuild \
- --distribution build/distribution.xml \
- --package-path build \
- --sign "${{ secrets.DEVELOPER_ID_INSTALLER_IDENTITY }}" \
- --timestamp \
+ productsign \
+ --keychain build.keychain \
+ --sign "$DEVELOPER_ID_INSTALLER
output/ProxyBridge-Installer.pkg
+
+ pkgutil --check-signature output/ProxyBridge-Installer.pkg
- name: Notarize PKG
- env:
- APPLE_ID: ${{ secrets.APPLE_ID }}
- APPLE_PASSWORD: ${{ secrets.APPLE_APP_PASSWORD }}
- TEAM_ID: ${{ secrets.TEAM_ID }}
run: |
cd MacOS/ProxyBridge
xcrun notarytool submit output/ProxyBridge-Installer.pkg \
- --apple-id "$APPLE_ID" \
- --password "$APPLE_PASSWORD" \
- --team-id "$TEAM_ID" \
+ --keychain-profile "notarytool-profile" \
--wait
xcrun stapler staple output/ProxyBridge-Installer.pkg
+ xcrun stapler validate output/ProxyBridge-Installer.pkg
- name: Upload PKG
uses: actions/upload-artifact@v4