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: More small security fixes #6589

Merged
merged 5 commits into from Jan 28, 2022
Merged

fix: More small security fixes #6589

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d92f696
fix: Remove unnecessary escape for backticks for powershell
devinbinnie Jan 28, 2022
7317c1c
fix: make proxied file name more secure for MacUpdater
devinbinnie Jan 28, 2022
47010b2
changeset
devinbinnie Jan 28, 2022
00c8584
Revert "changeset"
devinbinnie Jan 28, 2022
198a695
Changeset
devinbinnie Jan 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/real-avocados-search.md
View file
Open in desktop
@@ -0,0 +1,5 @@
---
"electron-updater": patch
---

fix: More small security fixes
2 changes: 1 addition & 1 deletion packages/electron-updater/src/MacUpdater.ts
View file
Open in desktop
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
3 changes: 1 addition & 2 deletions packages/electron-updater/src/windowsExecutableCodeSignatureVerifier.ts
View file
Open in desktop
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