fix(desktop): harden window-open deny and cover the link-title window

Follow-ups on the cherry-picked handler:
- a throwing observer can no longer change the decision; the handler returns
  an explicit deny regardless of logging failures
- the denied-URL log carries origin only, so query tokens / signed URLs from
  attacker-controlled content never reach the persisted desktop log
- the hidden link-title window (loads arbitrary user-linked pages on render,
  had no window-open handler at all) now denies too
- tests trimmed to two invariants (proven red against the pre-fix shape)
This commit is contained in:
Teknium
2026-09-04 14:51:01 -07:00
parent 77ca6a6d12
commit b51c055a12
5 changed files with 71 additions and 84 deletions
@@ -10,13 +10,16 @@ import {
} from './link-title-window' } from './link-title-window'
function makeFakeBrowserWindow() { function makeFakeBrowserWindow() {
const calls = { audioMuted: [] } const calls = { audioMuted: [], windowOpenHandlers: [] }
const FakeBrowserWindow = function (options) { const FakeBrowserWindow = function (options) {
this.options = options this.options = options
this.webContents = { this.webContents = {
setAudioMuted(value) { setAudioMuted(value) {
calls.audioMuted.push(value) calls.audioMuted.push(value)
},
setWindowOpenHandler(handler) {
calls.windowOpenHandlers.push(handler)
} }
} }
} }
@@ -45,6 +48,9 @@ test('createLinkTitleWindow mutes audio so historical links never autoplay sound
assert.ok(window instanceof FakeBrowserWindow) assert.ok(window instanceof FakeBrowserWindow)
assert.deepEqual(calls.audioMuted, [true]) assert.deepEqual(calls.audioMuted, [true])
// GHSA-9f4c-93c8-jc8g: a page loaded for its title must not be able to pop a window.
assert.equal(calls.windowOpenHandlers.length, 1)
assert.deepEqual(calls.windowOpenHandlers[0]({ url: 'https://attacker.test/popup' }), { action: 'deny' })
}) })
test('createLinkTitleWindow still returns the window if muting throws', () => { test('createLinkTitleWindow still returns the window if muting throws', () => {
@@ -3,6 +3,8 @@
// in an offscreen window and read its title. That window loads arbitrary // in an offscreen window and read its title. That window loads arbitrary
// user-linked pages, so it must never emit sound or trigger real downloads. // user-linked pages, so it must never emit sound or trigger real downloads.
import { createWindowOpenHandler } from './window-open-policy'
export function linkTitleWindowOptions(partitionSession) { export function linkTitleWindowOptions(partitionSession) {
return { return {
show: false, show: false,
@@ -34,6 +36,9 @@ export function createLinkTitleWindow(BrowserWindow, partitionSession) {
try { try {
window.webContents.setAudioMuted(true) window.webContents.setAudioMuted(true)
// Loads arbitrary user-linked pages on render; it only needs the title, so
// a popup from that page never has a reason to exist (GHSA-9f4c-93c8-jc8g).
window.webContents.setWindowOpenHandler(createWindowOpenHandler())
} catch { } catch {
// webContents may be unavailable in degraded/headless environments; muting // webContents may be unavailable in degraded/headless environments; muting
// is best-effort and the window is destroyed within a few seconds anyway. // is best-effort and the window is destroyed within a few seconds anyway.
+3 -9
View File
@@ -13243,16 +13243,10 @@ function wireCommonWindowHandlers(win, { zoom = true }: { zoom?: boolean } = {})
} }
installContextMenuBridge(win) installContextMenuBridge(win)
// Deny every window-open request and NEVER open a URL as a side effect here. // Always deny, never open as a side effect: GHSA-9f4c-93c8-jc8g. Trusted
// Trusted external links go through the audited `hermes:openExternal` IPC // links arrive via `hermes:openExternal`, not here. See window-open-policy.ts.
// channel; the only content that reaches this handler is what we did not
// initiate — including untrusted HTML in sandboxed `allow-scripts` iframes.
// Opening `details.url` here is the GHSA-9f4c-93c8-jc8g (CVE-2026-70608)
// vector: a sandboxed iframe with no `allow-popups` and no user gesture can
// force the OS browser to an attacker URL. No fixed 40.x Electron exists, so
// we close it at the seam. See electron/window-open-policy.ts.
win.webContents.setWindowOpenHandler( win.webContents.setWindowOpenHandler(
createWindowOpenHandler(url => rememberLog(`[window-open] denied: ${url}`)) createWindowOpenHandler(origin => rememberLog(`[window-open] denied: ${origin}`))
) )
win.webContents.on('will-navigate', (event, url) => { win.webContents.on('will-navigate', (event, url) => {
if ((DEV_SERVER && url.startsWith(DEV_SERVER)) || (!DEV_SERVER && url.startsWith('file:'))) { if ((DEV_SERVER && url.startsWith(DEV_SERVER)) || (!DEV_SERVER && url.startsWith('file:'))) {
+31 -28
View File
@@ -1,22 +1,19 @@
/** /**
* Window-open policy for every BrowserWindow's webContents. * Window-open policy for every BrowserWindow's webContents.
* *
* In the Electron desktop app, every external URL we open on purpose is routed * Every external URL the desktop opens on purpose goes through the audited
* through the audited `hermes:openExternal` IPC channel (see `openExternalUrl` * `hermes:openExternal` IPC channel (`openExternalUrl` in main.ts: http/https/
* in main.ts, which enforces an http/https/mailto scheme allowlist and guards * mailto allowlist, guarded file:). The `window.open` / `target=_blank` path
* file: through the IPC path resolver). The `window.open` / `target=_blank` * that reaches `setWindowOpenHandler` is therefore only ever driven by content
* path that reaches `setWindowOpenHandler` is therefore, inside Electron, only * we did NOT initiate — most dangerously untrusted HTML in sandboxed
* ever driven by content we did NOT initiate — most dangerously untrusted HTML * `allow-scripts` iframes (artifact previews, inline preview directives).
* rendered in sandboxed `allow-scripts` iframes (artifact previews).
* *
* GHSA-9f4c-93c8-jc8g (CVE-2026-70608, High 7.2) lets such a sandboxed iframe * GHSA-9f4c-93c8-jc8g (CVE-2026-70608): a sandboxed iframe without
* reach this handler with NO user interaction and WITHOUT `allow-popups`. If * `allow-popups` and without a user gesture can still reach this handler via
* the handler opens `details.url` as a side effect, a malicious artifact can * the OpenURL navigation path. If the handler opens `details.url` as a side
* force the user's real browser to an attacker-chosen URL. There is no fixed * effect, a malicious artifact forces the user's OS browser to an attacker URL.
* 40.x Electron release (the fix is 41.10.3+/42.0.1), so we defend at the seam * There is no fixed Electron 40.x, so the defence lives here regardless of the
* regardless of Electron version: deny every window-open request and NEVER open * pin: deny every request and never open a URL from this handler.
* a URL as a side effect here. Trusted opens keep working because they go
* through the IPC channel, not this handler.
*/ */
export interface WindowOpenRequestLike { export interface WindowOpenRequestLike {
@@ -28,28 +25,34 @@ export interface WindowOpenDecision {
} }
/** /**
* The security decision for a window-open request. Always deny — see the module * `origin` only — a denied URL can carry query credentials, signed-URL tokens
* comment. Kept as a named function so the contract has one tested home and a * or attacker-controlled text, none of which belongs in a persisted log.
* future edit that tries to reintroduce conditional opening has to defeat the
* test rather than silently succeed.
*/ */
export function decideWindowOpen(_request: WindowOpenRequestLike): WindowOpenDecision { export function describeDeniedUrl(url: string): string {
return { action: 'deny' } try {
const parsed = new URL(url)
return parsed.origin === 'null' ? parsed.protocol : parsed.origin
} catch {
return '<unparseable>'
}
} }
/** /**
* Build a `setWindowOpenHandler` callback. It denies unconditionally and never * Build a `setWindowOpenHandler` callback that denies unconditionally.
* opens anything. `onDenied` is an optional observability hook (logging only); * `onDenied` is logging-only and receives the sanitized origin; a throwing
* it MUST NOT open a URL — doing so would re-open the CVE this handler closes. * observer must not be able to change the decision.
*/ */
export function createWindowOpenHandler( export function createWindowOpenHandler(
onDenied?: (url: string) => void onDenied?: (origin: string) => void
): (details: WindowOpenRequestLike) => WindowOpenDecision { ): (details: WindowOpenRequestLike) => WindowOpenDecision {
return details => { return details => {
if (onDenied) { try {
onDenied(details.url) onDenied?.(describeDeniedUrl(details.url))
} catch {
// observer failure is not a reason to reconsider the decision
} }
return decideWindowOpen(details) return { action: 'deny' }
} }
} }
+25 -46
View File
@@ -1,67 +1,46 @@
/** /**
* Security regression for GHSA-9f4c-93c8-jc8g (CVE-2026-70608, High 7.2): * Security regression for GHSA-9f4c-93c8-jc8g (CVE-2026-70608): a sandboxed
* "Sandboxed iframe can bypass the allow-popups restriction via the OpenURL * iframe without `allow-popups` can reach `setWindowOpenHandler` with no user
* navigation path." * gesture, so the handler must always deny and must never open a URL. These
* * import the real policy module main.ts wires in.
* A sandboxed iframe without `allow-popups` can reach a window's
* `setWindowOpenHandler` with no user gesture. The desktop app renders
* untrusted artifact HTML in `<iframe sandbox="allow-scripts">`, so if the
* handler opens `details.url` as a side effect, a malicious artifact can force
* the OS browser to an attacker URL. Electron has no fixed 40.x release, so the
* defense lives in our handler: it must ALWAYS deny and must NEVER open a URL.
*
* These import the real policy module (pure, dependency-free) so the contract is
* tested against the code main.ts actually wires in — a future edit that
* reintroduces conditional opening has to defeat these tests.
*/ */
import assert from 'node:assert/strict' import assert from 'node:assert/strict'
import { describe, test } from 'vitest' import { describe, test } from 'vitest'
import { import { createWindowOpenHandler, describeDeniedUrl } from '../apps/desktop/electron/window-open-policy'
createWindowOpenHandler,
decideWindowOpen
} from '../apps/desktop/electron/window-open-policy'
describe('window-open policy (GHSA-9f4c-93c8-jc8g)', () => { describe('window-open policy (GHSA-9f4c-93c8-jc8g)', () => {
test('decideWindowOpen always denies, regardless of URL', () => { test('denies every scheme and reports only the sanitized origin', () => {
for (const url of [ const seen: string[] = []
'https://example.com', const handler = createWindowOpenHandler(origin => seen.push(origin))
'http://attacker.test/steal',
const urls = [
'https://attacker.test/steal?token=SECRET#frag',
'http://attacker.test:8080/x',
'file:///etc/passwd', 'file:///etc/passwd',
'javascript:alert(1)', 'javascript:alert(1)',
'custom-proto://payload', 'custom-proto://payload',
'' ''
]) { ]
assert.deepEqual(decideWindowOpen({ url }), { action: 'deny' })
for (const url of urls) {
assert.deepEqual(handler({ url }), { action: 'deny' })
} }
assert.equal(seen.length, urls.length)
assert.equal(seen[0], 'https://attacker.test')
assert.equal(seen[1], 'http://attacker.test:8080')
assert.equal(describeDeniedUrl(''), '<unparseable>')
assert.ok(seen.every(origin => !origin.includes('SECRET') && !origin.includes('/steal')))
}) })
test('handler denies and never returns an allow action', () => { test('a throwing observer still yields an explicit deny', () => {
const handler = createWindowOpenHandler()
const result = handler({ url: 'https://attacker.test/popup' })
assert.equal(result.action, 'deny')
})
test('handler surfaces the denied URL to the observability hook only', () => {
const denied: string[] = []
const handler = createWindowOpenHandler(url => denied.push(url))
const result = handler({ url: 'https://attacker.test/x' })
assert.equal(result.action, 'deny')
assert.deepEqual(denied, ['https://attacker.test/x'])
})
test('a throwing observability hook does not turn a deny into an allow', () => {
const handler = createWindowOpenHandler(() => { const handler = createWindowOpenHandler(() => {
throw new Error('logging blew up') throw new Error('logging blew up')
}) })
// The hook is logging-only; even if it throws, the security decision must
// not silently become "allow". We assert the throw propagates rather than assert.deepEqual(handler({ url: 'https://attacker.test/x' }), { action: 'deny' })
// being swallowed into an open — the caller (Electron) treats a throw as
// deny, and crucially no URL was opened as a side effect.
assert.throws(() => handler({ url: 'https://attacker.test/x' }))
}) })
}) })