Skip to content

Commit

Permalink
Revert "fix: better window hierarchy checks"
Browse files Browse the repository at this point in the history
This reverts commit c16c4c2.
  • Loading branch information
MarshallOfSound committed Mar 24, 2020
1 parent b9734ed commit cac3884
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions lib/browser/guest-window-manager.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
'use strict';

const electron = require('electron');
const nodeUrl = require('url');
const { BrowserWindow } = electron;
const { isSameOrigin } = process.electronBinding('v8_util');
const { ipcMainInternal } = require('@electron/internal/browser/ipc-main-internal');
Expand Down Expand Up @@ -182,21 +181,16 @@ const isNodeIntegrationEnabled = function (sender) {

// Checks whether |sender| can access the |target|:
const canAccessWindow = function (sender, target) {
return isScriptableWindow(sender, target) ||
(isChildWindow(sender, target) && isNodeIntegrationEnabled(sender));
return isChildWindow(sender, target) ||
isScriptableWindow(sender, target) ||
isNodeIntegrationEnabled(sender);
};

// Routed window.open messages with raw options
ipcMainInternal.on('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_OPEN', (event, url, frameName, features) => {
if (url == null || url === '') url = 'about:blank';
if (frameName == null) frameName = '';
if (features == null) features = '';
const parsedSourceURL = nodeUrl.parse(event.sender.getURL());
const parsedTargetURL = nodeUrl.parse(url);
if (parsedTargetURL.protocol === 'file:' && parsedSourceURL.protocol !== 'file:') {
event.returnValue = null;
return;
}

const options = {};

Expand Down

0 comments on commit cac3884

Please sign in to comment.