Skip to content

Commit

Permalink
fix(win/mac): Small security fixes for electron-updater (#6589)
Browse files Browse the repository at this point in the history
* fix: Remove unnecessary escape for backticks for powershell
* fix: make proxied file name more secure for MacUpdater
  • Loading branch information
devinbinnie authored Jan 28, 2022
1 parent c591eb3 commit 633ee5d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
6 changes: 6 additions & 0 deletions .changeset/neat-socks-dress.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"electron-updater": patch
---

- Removed backtick escaping for Windows code signing as it is unnecessary for Powershell and can cause the script to attempt to access the wrong file
- Updated the proxy filename to be more secure (512-bit string)
2 changes: 1 addition & 1 deletion packages/electron-updater/src/MacUpdater.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ export class MacUpdater extends AppUpdater {
const authInfo = Buffer.from(`autoupdater:${pass}`, "ascii")

// insecure random is ok
const fileUrl = `/${Date.now().toString(16)}-${Math.floor(Math.random() * 9999).toString(16)}.zip`
const fileUrl = `/${randomBytes(64).toString("hex")}.zip`
this.server!.on("request", (request: IncomingMessage, response: ServerResponse) => {
const requestUrl = request.url!
log.info(`${requestUrl} requested`)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,11 @@ export function verifySignature(publisherNames: Array<string>, unescapedTempUpda
// https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_quoting_rules?view=powershell-7
// * Double quotes `"` are treated literally within single-quoted strings;
// * Single quotes can be escaped by doubling them: 'don''t' -> don't;
// * Backticks can be escaped by doubling them: 'A backtick (``) character';
//
// Also note that at this point the file has already been written to the disk, thus we are
// guaranteed that the path will not contain any illegal characters like <>:"/\|?*
// https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file
const tempUpdateFile = unescapedTempUpdateFile.replace(/'/g, "''").replace(/`/g, "``")
const tempUpdateFile = unescapedTempUpdateFile.replace(/'/g, "''")

// https://github.com/electron-userland/electron-builder/issues/2421
// https://github.com/electron-userland/electron-builder/issues/2535
Expand Down

0 comments on commit 633ee5d

Please sign in to comment.