Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: add reject in handleError in Windows verifySignature function #7380

Merged
merged 2 commits into from
Jan 17, 2023
Merged

fix: add reject in handleError in Windows verifySignature function #7380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93967a6
add reject in handleError
PayneFuRC Jan 17, 2023
9e57da9
Create nervous-zebras-accept.md
mmaietta Jan 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/nervous-zebras-accept.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"electron-updater": patch
---

fix: add reject in handleError in Windows `verifySignature` function
12 changes: 6 additions & 6 deletions packages/electron-updater/src/windowsExecutableCodeSignatureVerifier.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { Logger } from "./main"
// | where {$_.Status.Equals([System.Management.Automation.SignatureStatus]::Valid) -and $_.SignerCertificate.Subject.Contains("CN=siemens.com")})
// | Out-String ; if ($certificateInfo) { exit 0 } else { exit 1 }
export function verifySignature(publisherNames: Array<string>, unescapedTempUpdateFile: string, logger: Logger): Promise<string | null> {
return new Promise<string | null>(resolve => {
return new Promise<string | null>((resolve, reject) => {
// Escape quotes and backticks in filenames to prevent user from breaking the
// arguments and perform a remote command injection.
//
Expand Down Expand Up @@ -40,7 +40,7 @@ export function verifySignature(publisherNames: Array<string>, unescapedTempUpda
(error, stdout, stderr) => {
try {
if (error != null || stderr) {
handleError(logger, error, stderr)
handleError(logger, error, stderr, reject)
resolve(null)
return
}
Expand Down Expand Up @@ -72,7 +72,7 @@ export function verifySignature(publisherNames: Array<string>, unescapedTempUpda
logger.warn(`Sign verification failed, installer signed with incorrect certificate: ${result}`)
resolve(result)
} catch (e: any) {
handleError(logger, e, null)
handleError(logger, e, null, reject)
resolve(null)
return
}
Expand All @@ -99,7 +99,7 @@ function parseOut(out: string): any {
return data
}

function handleError(logger: Logger, error: Error | null, stderr: string | null): void {
function handleError(logger: Logger, error: Error | null, stderr: string | null, reject: (reason: any) => void): void {
if (isOldWin6()) {
logger.warn(
`Cannot execute Get-AuthenticodeSignature: ${error || stderr}. Ignoring signature validation due to unsupported powershell version. Please upgrade to powershell 3 or higher.`
Expand All @@ -117,11 +117,11 @@ function handleError(logger: Logger, error: Error | null, stderr: string | null)
}

if (error != null) {
throw error
reject(error)
}

if (stderr) {
throw new Error(`Cannot execute Get-AuthenticodeSignature, stderr: ${stderr}. Failing signature validation due to unknown stderr.`)
reject(new Error(`Cannot execute Get-AuthenticodeSignature, stderr: ${stderr}. Failing signature validation due to unknown stderr.`))
}
}

Expand Down