Skip to content

Commit cff6da4

Browse files
committed
Apply suggestions from code review
1 parent 11a0924 commit cff6da4

2 files changed

Lines changed: 11 additions & 7 deletions

File tree

.github/workflows/update-windows-info.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ jobs:
3131
- name: Download MSI
3232
run: |
3333
MSI_URL=$(jq -r '[.[] | select(.name | endswith(".msi"))][0].browser_download_url // "null"' <<< "$ASSETS_JSON")
34+
if [[ "$MSI_URL" == "null" || -z "$MSI_URL" ]]; then
35+
echo "No MSI asset found in repository_dispatch payload." >&2
36+
exit 1
37+
fi
3438
curl --silent --fail-with-body --proto "=https" -L -H "Accept: application/vnd.github+json" $MSI_URL --output cryptomator.msi
3539
env:
3640
ASSETS_JSON: ${{ toJson(github.event.client_payload.release.assets ) }}
@@ -49,18 +53,18 @@ jobs:
4953
}
5054
$Content = $UpdatedContent
5155
52-
$MarkedRow = (Get-Content -Path $DocPath | Where-Object { $_.TrimStart().StartsWith('|') -and $_.EndsWith($env:AUTOMATION_MARKER) } | Select-Object -First 1)
56+
$MarkedRow = (Get-Content -Path $DocPath | Where-Object { $_.TrimStart().StartsWith('|') -and $_.Contains($env:AUTOMATION_MARKER) } | Select-Object -First 1)
5357
if ($null -eq $MarkedRow) {
5458
throw 'Failed to find the marked Windows certificate table row in verify-installers.md.'
5559
}
5660
57-
$PreviousRow = $MarkedRow.Substring(0, $MarkedRow.IndexOf($env:AUTOMATION_MARKER)).TrimEnd()
58-
$NewRow = '| ' + $env:DESKTOP_VERSION + ' | `' + $Thumbprint + '` | ' + $env:AUTOMATION_MARKER
61+
$PreviousRow = $MarkedRow.Substring(0, $MarkedRow.IndexOf($env:AUTOMATION_MARKER)).TrimEnd() + " |"
62+
$NewRow = "| $env:DESKTOP_VERSION |" + '`' + $Thumbprint + '`' + "$env:AUTOMATION_MARKER |"
5963
$Content = $Content.Replace($MarkedRow, $NewRow + "`r`n" + $PreviousRow)
6064
6165
Set-Content -Path $DocPath -Value $Content
6266
env:
63-
AUTOMATION_MARKER: '<!-- AUTOMATION MARKER FOR WORKFLOW update-desktop.yml -->'
67+
AUTOMATION_MARKER: '<!-- AUTOMATION MARKER FOR WORKFLOW -->'
6468
- name: Commit and push
6569
id: commit-and-push
6670
run: |

docs/security/verify-installers.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ Our Windows installers are signed using a code signing certificate. You can veri
3232

3333
1. Open Terminal or PowerShell (found in Windows Start menu).
3434
2. Run either of the following commands to check the signature of the corresponding file:
35-
```
35+
```powershell
3636
Get-AuthenticodeSignature -FilePath "~\Downloads\Cryptomator-*.msi"
3737
Get-AuthenticodeSignature -FilePath "~\Downloads\Cryptomator-*.exe"
3838
```
3939
3. Verify that the output includes:
40-
- Column `SignerCertificate` with value <!-- AUTOMATION MARKER FOR WORKFLOW update-desktop.yml -->`20F30D7C5B1AB3ACAFA4AB27874ACBC4B47B0697`(*)
40+
- Column `SignerCertificate` with value <!-- AUTOMATION MARKER FOR WORKFLOW -->`20F30D7C5B1AB3ACAFA4AB27874ACBC4B47B0697`(*)
4141
- Column `Status` with value `Valid`
4242
- no errors
4343

@@ -64,7 +64,7 @@ You can also inspect the certificate manually:
6464
Every Cryptomator installer is signed with a certificate. A certificate is identified by its thumbprint. The signing certificate changed over time and the following table shows for each version the certificate thumbprint:
6565
| Version(s) | Certificate Thumbprint |
6666
|---------------------|--------------------------------------------|
67-
| 1.19.2 | `20F30D7C5B1AB3ACAFA4AB27874ACBC4B47B0697` | <!-- AUTOMATION MARKER FOR WORKFLOW update-desktop.yml -->
67+
| 1.19.2 | `20F30D7C5B1AB3ACAFA4AB27874ACBC4B47B0697`<!-- AUTOMATION MARKER FOR WORKFLOW --> |
6868
| 1.19.1 | `BB0EEBF8E92E4584DF4B6AE4F9577B60BEB5DF4C` |
6969
| 1.19.0 | `14524B1F8A3A1CA8B24B769C7C6DC92851120B22` |
7070
| 1.18.1 | `53FA929F6D50D5E2AE59A7C9A9750D373AFF7D40` |

0 commit comments

Comments
 (0)