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: crash when setWindowOpenHandler callback throws #34523

Merged
merged 2 commits into from Jun 14, 2022
Merged

fix: crash when setWindowOpenHandler callback throws #34523

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c3482c
fix: crash when setWindowOpenHandler throws
codebytere Jun 13, 2022
972a989
refactor: throw as process uncaughtException event
codebytere Jun 13, 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
10 changes: 9 additions & 1 deletion lib/browser/api/web-contents.ts
View file
Open in desktop
Expand Up @@ -482,7 +482,15 @@ WebContents.prototype._callWindowOpenHandler = function (event: Electron.Event,
if (!this._windowOpenHandler) {
return defaultResponse;
}
const response = this._windowOpenHandler(details);

let response;
try {
response = this._windowOpenHandler(details);
} catch (e: any) {
event.preventDefault();
console.log(`Error in windowOpenHandler: ${e.message}`);
codebytere marked this conversation as resolved.
Show resolved Hide resolved
return defaultResponse;
}

if (typeof response !== 'object') {
event.preventDefault();
Expand Down
54 changes: 48 additions & 6 deletions spec-main/guest-window-manager-spec.ts
View file
Open in desktop
Expand Up @@ -79,6 +79,48 @@ describe('webContents.setWindowOpenHandler', () => {

afterEach(closeAllWindows);

it('does not fire window creation events if the handler callback throws an error', async () => {
const error = new Promise((resolve) => {
browserWindow.webContents.setWindowOpenHandler(() => {
setTimeout(resolve);
throw new Error('oh no');
});
});

browserWindow.webContents.on('new-window', () => {
assert.fail('new-window should not be called with an overridden window.open');
});

browserWindow.webContents.on('did-create-window', () => {
assert.fail('did-create-window should not be called with an overridden window.open');
});

browserWindow.webContents.executeJavaScript("window.open('about:blank', '', 'show=no') && true");

await error;
});

it('does not fire window creation events if the handler callback returns a bad result', async () => {
const bad = new Promise((resolve) => {
browserWindow.webContents.setWindowOpenHandler(() => {
setTimeout(resolve);
return [1, 2, 3] as any;
});
});

browserWindow.webContents.on('new-window', () => {
assert.fail('new-window should not be called with an overridden window.open');
});

browserWindow.webContents.on('did-create-window', () => {
assert.fail('did-create-window should not be called with an overridden window.open');
});

browserWindow.webContents.executeJavaScript("window.open('about:blank', '', 'show=no') && true");

await bad;
});

it('does not fire window creation events if an override returns action: deny', async () => {
const denied = new Promise((resolve) => {
browserWindow.webContents.setWindowOpenHandler(() => {
Expand All @@ -87,11 +129,11 @@ describe('webContents.setWindowOpenHandler', () => {
});
});
browserWindow.webContents.on('new-window', () => {
assert.fail('new-window should not to be called with an overridden window.open');
assert.fail('new-window should not be called with an overridden window.open');
});

browserWindow.webContents.on('did-create-window', () => {
assert.fail('did-create-window should not to be called with an overridden window.open');
assert.fail('did-create-window should not be called with an overridden window.open');
});

browserWindow.webContents.executeJavaScript("window.open('about:blank', '', 'show=no') && true");
Expand All @@ -107,11 +149,11 @@ describe('webContents.setWindowOpenHandler', () => {
});
});
browserWindow.webContents.on('new-window', () => {
assert.fail('new-window should not to be called with an overridden window.open');
assert.fail('new-window should not be called with an overridden window.open');
});

browserWindow.webContents.on('did-create-window', () => {
assert.fail('did-create-window should not to be called with an overridden window.open');
assert.fail('did-create-window should not be called with an overridden window.open');
});

await browserWindow.webContents.loadURL('data:text/html,<a target="_blank" href="http://example.com" style="display: block; width: 100%; height: 100%; position: fixed; left: 0; top: 0;">link</a>');
Expand All @@ -129,11 +171,11 @@ describe('webContents.setWindowOpenHandler', () => {
});
});
browserWindow.webContents.on('new-window', () => {
assert.fail('new-window should not to be called with an overridden window.open');
assert.fail('new-window should not be called with an overridden window.open');
});

browserWindow.webContents.on('did-create-window', () => {
assert.fail('did-create-window should not to be called with an overridden window.open');
assert.fail('did-create-window should not be called with an overridden window.open');
});

await browserWindow.webContents.loadURL('data:text/html,<a href="http://example.com" style="display: block; width: 100%; height: 100%; position: fixed; left: 0; top: 0;">link</a>');
Expand Down