Skip to content

Commit 942aa7e

Browse files
committed
Merge remote-tracking branch 'upstream/main' into codex/review-pr-8313
2 parents 1007255 + 0e2905e commit 942aa7e

3 files changed

Lines changed: 118 additions & 3 deletions

File tree

‎apps/desktop/src/preview/Manager.test.ts‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,50 @@ describe("isPreviewRefreshShortcut", () => {
5858
});
5959
});
6060

61+
describe("previewWindowOpenAction", () => {
62+
const details = (overrides: {
63+
readonly url?: string;
64+
readonly disposition?: Electron.HandlerDetails["disposition"];
65+
}) => ({
66+
url: "https://accounts.google.com/o/oauth2/auth",
67+
disposition: "new-window" as Electron.HandlerDetails["disposition"],
68+
...overrides,
69+
});
70+
71+
it("opens a real window for scripted popups so the opener survives", () => {
72+
// OAuth SDKs read a null `window.open()` as a blocked popup, and they need
73+
// the opener alive to receive the credential back.
74+
expect(PreviewManager.previewWindowOpenAction(details({}))).toBe("popup");
75+
expect(
76+
PreviewManager.previewWindowOpenAction(details({ url: "http://localhost:5173/auth" })),
77+
).toBe("popup");
78+
});
79+
80+
it("keeps target=_blank links in the preview tab", () => {
81+
expect(PreviewManager.previewWindowOpenAction(details({ disposition: "foreground-tab" }))).toBe(
82+
"navigate",
83+
);
84+
expect(PreviewManager.previewWindowOpenAction(details({ disposition: "background-tab" }))).toBe(
85+
"navigate",
86+
);
87+
});
88+
89+
it("does not hand a window to schemes that cannot be hardened", () => {
90+
// A popup skips the `will-attach-webview` hardening, so it only gets a window
91+
// when its preferences can be overridden. Chromium copies the guest's
92+
// preferences for `about:blank` and forbids overriding them.
93+
for (const url of [
94+
"about:blank",
95+
"javascript:alert(1)",
96+
"file:///etc/passwd",
97+
"vscode://vscode-remote/ssh-remote+box/tmp",
98+
"not a url",
99+
]) {
100+
expect(PreviewManager.previewWindowOpenAction(details({ url }))).toBe("navigate");
101+
}
102+
});
103+
});
104+
61105
const {
62106
browserWindowConstructor,
63107
createFromPath,

‎apps/desktop/src/preview/Manager.ts‎

Lines changed: 68 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,61 @@ const APP_FORWARDED_SHORTCUTS: ReadonlyArray<{
434434
{ key: "w", meta: true, shift: false, control: false },
435435
]);
436436

437+
/**
438+
* Protocols a preview page may open in a real popup window.
439+
*
440+
* `about:blank` stays out: Chromium skips browser-side navigation for it, so the
441+
* child copies the guest's `contextIsolation: false` preferences and Electron
442+
* gives no way to override them. Those popups keep loading in the preview tab.
443+
*
444+
* Deliberately not `ElectronShell.parseSafeExternalUrl`: that also admits
445+
* `vscode://vscode-remote/...` deep links, which belong in `shell.openExternal`
446+
* and not in a window spawned by a third-party page in the preview.
447+
*/
448+
const POPUP_PROTOCOLS = new Set(["http:", "https:"]);
449+
450+
const isPopupUrl = (rawUrl: string): boolean => {
451+
try {
452+
return POPUP_PROTOCOLS.has(new URL(rawUrl).protocol);
453+
} catch {
454+
return false;
455+
}
456+
};
457+
458+
/**
459+
* Preferences for a popup a preview page opens.
460+
*
461+
* A popup is not a webview attach, so the `will-attach-webview` hardening in
462+
* `DesktopWindow` never sees it, and an unoverridden child would inherit the
463+
* guest's relaxed posture: the picker preload needs `contextIsolation: false`
464+
* to share `globalThis` with the previewed page, and no OAuth provider should
465+
* get that. The window keeps the opener and the guest session either way.
466+
*/
467+
const POPUP_WINDOW_OPTIONS = {
468+
webPreferences: {
469+
contextIsolation: true,
470+
nodeIntegration: false,
471+
sandbox: true,
472+
},
473+
} satisfies Electron.BrowserWindowConstructorOptions;
474+
475+
/**
476+
* Decides what a preview page's `window.open` should do.
477+
*
478+
* `"popup"` opens a real window, which scripted popups need: denying them makes
479+
* `window.open()` return `null` (OAuth SDKs report that as a blocked popup), and
480+
* navigating the preview tab instead destroys the opener the popup has to
481+
* `postMessage` its result back to.
482+
*
483+
* `target="_blank"` links arrive as a tab disposition and keep loading in the
484+
* preview tab, which is what people expect from a link inside a preview.
485+
*/
486+
export const previewWindowOpenAction = (details: {
487+
readonly url: string;
488+
readonly disposition: Electron.HandlerDetails["disposition"];
489+
}): "popup" | "navigate" =>
490+
details.disposition === "new-window" && isPopupUrl(details.url) ? "popup" : "navigate";
491+
437492
export const isPreviewRefreshShortcut = (input: Electron.Input): boolean =>
438493
input.type === "keyDown" &&
439494
input.key.toLowerCase() === "r" &&
@@ -1661,6 +1716,12 @@ const makeNativeOperations = Effect.fn("PreviewManager.makeOperations")(function
16611716
],
16621717
});
16631718
});
1719+
// A popup opens with Electron's default handler, so the page inside it could
1720+
// otherwise spawn native windows without limit. Nothing in an OAuth flow
1721+
// opens a second popup, so the chain stops at the first one.
1722+
const windowCreated = (window: Electron.BrowserWindow): void => {
1723+
window.webContents.setWindowOpenHandler(() => ({ action: "deny" }));
1724+
};
16641725
const beforeInput = (event: Electron.Event, input: Electron.Input): void => {
16651726
if (isPreviewRefreshShortcut(input)) {
16661727
event.preventDefault();
@@ -1686,6 +1747,7 @@ const makeNativeOperations = Effect.fn("PreviewManager.makeOperations")(function
16861747
wc.off("did-stop-loading", sync);
16871748
wc.off("did-fail-load", failed as never);
16881749
wc.off("audio-state-changed", audioStateChanged);
1750+
wc.off("did-create-window", windowCreated);
16891751
wc.off("before-input-event", beforeInput);
16901752
wc.ipc.off(HUMAN_INPUT_CHANNEL, humanInput);
16911753
wc.ipc.off(MOUSE_NAVIGATE_CHANNEL, mouseNavigate);
@@ -1704,14 +1766,18 @@ const makeNativeOperations = Effect.fn("PreviewManager.makeOperations")(function
17041766
wc.on("audio-state-changed", audioStateChanged);
17051767
wc.ipc.on(HUMAN_INPUT_CHANNEL, humanInput);
17061768
wc.ipc.on(MOUSE_NAVIGATE_CHANNEL, mouseNavigate);
1707-
wc.setWindowOpenHandler(({ url }) => {
1769+
wc.setWindowOpenHandler((details) => {
1770+
if (previewWindowOpenAction(details) === "popup") {
1771+
return { action: "allow", overrideBrowserWindowOptions: POPUP_WINDOW_OPTIONS };
1772+
}
17081773
runFork(
17091774
attemptPromise({ operation: "openPreviewWindow", tabId, webContentsId: wc.id }, () =>
1710-
wc.loadURL(url),
1775+
wc.loadURL(details.url),
17111776
).pipe(Effect.ignore),
17121777
);
17131778
return { action: "deny" };
17141779
});
1780+
wc.on("did-create-window", windowCreated);
17151781
wc.on("before-input-event", beforeInput);
17161782
});
17171783
yield* Ref.update(attachedRef, (attached) =>

‎apps/web/src/browser/HostedBrowserWebview.tsx‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ export function HostedBrowserWebview(props: {
9999

100100
const setWebviewRef = useCallback((node: HTMLElement | null) => {
101101
webviewRef.current = node as ElectronWebview | null;
102-
if (node && !node.hasAttribute("allowpopups")) node.setAttribute("allowpopups", "true");
103102
}, []);
104103

105104
useEffect(() => {
@@ -269,6 +268,12 @@ export function HostedBrowserWebview(props: {
269268
<webview
270269
key={webviewGeneration}
271270
ref={setWebviewRef}
271+
// Must be an attribute on the element itself: Electron reads it when the
272+
// guest attaches, so setting it from the ref callback lands too late and
273+
// the guest attaches with popups disabled. React types `allowpopups` as a
274+
// boolean, but react-dom drops boolean values for unrecognized attributes,
275+
// so the literal string has to be spread past the type.
276+
{...({ allowpopups: "true" } as unknown as { readonly allowpopups?: boolean })}
272277
src={webviewGeneration === 0 ? initialSrc : recoverySrc}
273278
partition={config.partition}
274279
webpreferences={config.webPreferences}

0 commit comments

Comments
 (0)