chore(aaif): Use Azure Artifact Signing for Windows (#8116)
Signed-off-by: Douwe Osinga <douwe@squareup.com> Co-authored-by: Douwe Osinga <douwe@squareup.com>
This commit is contained in:
@@ -2,6 +2,12 @@ name: "Bundle Desktop (Windows)"
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
signing:
|
||||||
|
description: 'Whether to sign the Windows executable'
|
||||||
|
required: false
|
||||||
|
type: boolean
|
||||||
|
default: false
|
||||||
workflow_call:
|
workflow_call:
|
||||||
inputs:
|
inputs:
|
||||||
version:
|
version:
|
||||||
@@ -18,17 +24,10 @@ on:
|
|||||||
required: false
|
required: false
|
||||||
type: string
|
type: string
|
||||||
default: ''
|
default: ''
|
||||||
secrets:
|
|
||||||
WINDOWS_CODESIGN_CERTIFICATE:
|
|
||||||
required: false
|
|
||||||
WINDOW_SIGNING_ROLE:
|
|
||||||
required: false
|
|
||||||
WINDOW_SIGNING_ROLE_TAG:
|
|
||||||
required: false
|
|
||||||
|
|
||||||
# Permissions required for OIDC authentication with AWS
|
# Permissions required for OIDC authentication with Azure Trusted Signing
|
||||||
permissions:
|
permissions:
|
||||||
id-token: write # Required to fetch the OIDC token
|
id-token: write # Required to fetch the OIDC token for Azure federated credentials
|
||||||
contents: read # Required by actions/checkout
|
contents: read # Required by actions/checkout
|
||||||
actions: read # May be needed for some workflows
|
actions: read # May be needed for some workflows
|
||||||
|
|
||||||
@@ -43,13 +42,6 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
ref: ${{ inputs.ref != '' && inputs.ref || '' }}
|
ref: ${{ inputs.ref != '' && inputs.ref || '' }}
|
||||||
|
|
||||||
- name: Configure AWS credentials
|
|
||||||
if: inputs.signing && inputs.signing == true
|
|
||||||
uses: aws-actions/configure-aws-credentials@61815dcd50bd041e203e49132bacad1fd04d2708 # v5.1.1
|
|
||||||
with:
|
|
||||||
role-to-assume: ${{ github.ref == 'refs/heads/main' && secrets.WINDOW_SIGNING_ROLE || secrets.WINDOW_SIGNING_ROLE_TAG }}
|
|
||||||
aws-region: us-west-2
|
|
||||||
|
|
||||||
- name: Set up Node.js
|
- name: Set up Node.js
|
||||||
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
|
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
|
||||||
with:
|
with:
|
||||||
@@ -160,103 +152,89 @@ jobs:
|
|||||||
echo "📋 Binary files in resources/bin:"
|
echo "📋 Binary files in resources/bin:"
|
||||||
ls -la ./dist-windows/resources/bin/
|
ls -la ./dist-windows/resources/bin/
|
||||||
|
|
||||||
- name: Setup Java for signing
|
- name: Upload unsigned distribution
|
||||||
if: inputs.signing && inputs.signing == true
|
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
|
||||||
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
|
|
||||||
with:
|
with:
|
||||||
distribution: 'temurin'
|
name: windows-unsigned
|
||||||
java-version: '11'
|
path: ui/desktop/dist-windows/
|
||||||
|
|
||||||
- name: Sign Windows executables with jsign + AWS KMS
|
sign-desktop-windows:
|
||||||
if: inputs.signing && inputs.signing == true
|
name: Sign Desktop (Windows)
|
||||||
shell: bash
|
needs: build-desktop-windows
|
||||||
run: |
|
if: inputs.signing
|
||||||
set -exuo pipefail
|
runs-on: windows-latest
|
||||||
echo "🔐 Starting Windows code signing with jsign + AWS KMS..."
|
environment: ${{ (inputs.signing == true) && 'signing' || null }}
|
||||||
|
|
||||||
echo "📝 Creating certificate file from GitHub secret..."
|
steps:
|
||||||
echo "${{ secrets.WINDOWS_CODESIGN_CERTIFICATE }}" > block-codesign-cert.pem
|
- name: Download unsigned distribution
|
||||||
|
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
|
||||||
|
with:
|
||||||
|
name: windows-unsigned
|
||||||
|
path: dist-windows
|
||||||
|
|
||||||
# Download jsign
|
- name: Azure login
|
||||||
echo "📥 Downloading jsign..."
|
uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2.3.0
|
||||||
curl -sL https://github.com/ebourg/jsign/releases/download/6.0/jsign-6.0.jar -o jsign.jar
|
with:
|
||||||
echo "05ca18d4ab7b8c2183289b5378d32860f0ea0f3bdab1f1b8cae5894fb225fa8a jsign.jar" | sha256sum -c
|
client-id: ${{ secrets.AZURE_CLIENT_ID }}
|
||||||
|
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
|
||||||
|
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
|
||||||
|
|
||||||
echo "🔐 Signing main Electron executable: Goose.exe"
|
- name: Sign Windows executables with Azure Trusted Signing
|
||||||
cd ui/desktop/dist-windows/
|
uses: azure/trusted-signing-action@b443cf8ea4124818d2ea9f043cba29fc3ec47b16 # v1.2.0
|
||||||
|
with:
|
||||||
|
endpoint: ${{ secrets.AZURE_SIGNING_ENDPOINT }}
|
||||||
|
trusted-signing-account-name: ${{ secrets.AZURE_SIGNING_ACCOUNT_NAME }}
|
||||||
|
certificate-profile-name: ${{ secrets.AZURE_CERTIFICATE_PROFILE_NAME }}
|
||||||
|
files: |
|
||||||
|
${{ github.workspace }}/dist-windows/Goose.exe
|
||||||
|
${{ github.workspace }}/dist-windows/resources/bin/goosed.exe
|
||||||
|
|
||||||
java -jar ${GITHUB_WORKSPACE}/jsign.jar \
|
- name: Verify signed executables
|
||||||
--storetype AWS \
|
|
||||||
--keystore us-west-2 \
|
|
||||||
--storepass "${AWS_ACCESS_KEY_ID}|${AWS_SECRET_ACCESS_KEY}|${AWS_SESSION_TOKEN}" \
|
|
||||||
--alias windows-codesign \
|
|
||||||
--certfile "${GITHUB_WORKSPACE}/block-codesign-cert.pem" \
|
|
||||||
--tsaurl "http://timestamp.digicert.com" \
|
|
||||||
--name "Goose" \
|
|
||||||
--url "https://github.com/block/goose" \
|
|
||||||
"Goose.exe"
|
|
||||||
|
|
||||||
echo "✅ Main executable Goose.exe signed successfully"
|
|
||||||
|
|
||||||
echo "🔐 Signing backend executable: goosed.exe"
|
|
||||||
cd resources/bin/
|
|
||||||
|
|
||||||
java -jar ${GITHUB_WORKSPACE}/jsign.jar \
|
|
||||||
--storetype AWS \
|
|
||||||
--keystore us-west-2 \
|
|
||||||
--storepass "${AWS_ACCESS_KEY_ID}|${AWS_SECRET_ACCESS_KEY}|${AWS_SESSION_TOKEN}" \
|
|
||||||
--alias windows-codesign \
|
|
||||||
--certfile "${GITHUB_WORKSPACE}/block-codesign-cert.pem" \
|
|
||||||
--tsaurl "http://timestamp.digicert.com" \
|
|
||||||
--name "Goose Backend" \
|
|
||||||
--url "https://github.com/block/goose" \
|
|
||||||
"goosed.exe"
|
|
||||||
|
|
||||||
echo "✅ Backend executable goosed.exe signed successfully"
|
|
||||||
|
|
||||||
# Show final file status
|
|
||||||
echo "📋 Final signed files:"
|
|
||||||
cd ../../
|
|
||||||
ls -la Goose.exe
|
|
||||||
sha256sum Goose.exe
|
|
||||||
ls -la resources/bin/goosed.exe
|
|
||||||
sha256sum resources/bin/goosed.exe
|
|
||||||
|
|
||||||
rm -f ${GITHUB_WORKSPACE}/block-codesign-cert.pem
|
|
||||||
|
|
||||||
- name: Verify signed executables are in final distribution
|
|
||||||
if: inputs.signing && inputs.signing == true
|
|
||||||
shell: pwsh
|
shell: pwsh
|
||||||
run: |
|
run: |
|
||||||
echo "📋 Verifying both signed executables in final distribution:"
|
$files = @(
|
||||||
echo "Main executable:"
|
"dist-windows/Goose.exe",
|
||||||
Get-Item ui/desktop/dist-windows/Goose.exe
|
"dist-windows/resources/bin/goosed.exe"
|
||||||
$sig = Get-AuthenticodeSignature ui/desktop/dist-windows/Goose.exe
|
)
|
||||||
if ($sig.Status -ne "Valid") { throw "Main executable signature invalid: $($sig.Status)" }
|
foreach ($file in $files) {
|
||||||
echo "✅ Main executable signature verification passed"
|
Write-Output "Verifying signature: $file"
|
||||||
|
$sig = Get-AuthenticodeSignature $file
|
||||||
echo "Backend executable:"
|
if ($sig.Status -ne "Valid") { throw "Signature invalid for ${file}: $($sig.Status)" }
|
||||||
Get-Item ui/desktop/dist-windows/resources/bin/goosed.exe
|
Write-Output "Signature valid: $file"
|
||||||
$sig = Get-AuthenticodeSignature ui/desktop/dist-windows/resources/bin/goosed.exe
|
}
|
||||||
if ($sig.Status -ne "Valid") { throw "Backend executable signature invalid: $($sig.Status)" }
|
|
||||||
echo "✅ Backend executable signature verification passed"
|
|
||||||
|
|
||||||
- name: Create Windows zip package
|
- name: Create Windows zip package
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
cd ui/desktop
|
|
||||||
echo "📦 Creating Windows zip package..."
|
|
||||||
|
|
||||||
7z a -tzip "Goose-win32-x64.zip" dist-windows/
|
7z a -tzip "Goose-win32-x64.zip" dist-windows/
|
||||||
|
|
||||||
echo "✅ Windows zip package created:"
|
- name: Upload signed Windows build
|
||||||
ls -la Goose-win32-x64.zip
|
|
||||||
|
|
||||||
mkdir -p out/Goose-win32-x64/
|
|
||||||
cp Goose-win32-x64.zip out/Goose-win32-x64/
|
|
||||||
|
|
||||||
- name: Upload Windows build artifacts
|
|
||||||
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
|
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
|
||||||
with:
|
with:
|
||||||
name: Goose-win32-x64
|
name: Goose-win32-x64
|
||||||
path: ui/desktop/out/Goose-win32-x64/Goose-win32-x64.zip
|
path: Goose-win32-x64.zip
|
||||||
|
|
||||||
|
# When signing is disabled, package the unsigned build directly
|
||||||
|
package-desktop-windows:
|
||||||
|
name: Package Desktop (Windows)
|
||||||
|
needs: build-desktop-windows
|
||||||
|
if: ${{ !inputs.signing }}
|
||||||
|
runs-on: windows-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Download unsigned distribution
|
||||||
|
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
|
||||||
|
with:
|
||||||
|
name: windows-unsigned
|
||||||
|
path: dist-windows
|
||||||
|
|
||||||
|
- name: Create Windows zip package
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
7z a -tzip "Goose-win32-x64.zip" dist-windows/
|
||||||
|
|
||||||
|
- name: Upload Windows build
|
||||||
|
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
|
||||||
|
with:
|
||||||
|
name: Goose-win32-x64
|
||||||
|
path: Goose-win32-x64.zip
|
||||||
|
|||||||
@@ -78,10 +78,6 @@ jobs:
|
|||||||
uses: ./.github/workflows/bundle-desktop-windows.yml
|
uses: ./.github/workflows/bundle-desktop-windows.yml
|
||||||
with:
|
with:
|
||||||
signing: true
|
signing: true
|
||||||
secrets:
|
|
||||||
WINDOWS_CODESIGN_CERTIFICATE: ${{ secrets.WINDOWS_CODESIGN_CERTIFICATE }}
|
|
||||||
WINDOW_SIGNING_ROLE: ${{ secrets.WINDOW_SIGNING_ROLE }}
|
|
||||||
WINDOW_SIGNING_ROLE_TAG: ${{ secrets.WINDOW_SIGNING_ROLE_TAG }}
|
|
||||||
|
|
||||||
# ------------------------------------
|
# ------------------------------------
|
||||||
# 7) Create/Update GitHub Release
|
# 7) Create/Update GitHub Release
|
||||||
|
|||||||
Reference in New Issue
Block a user