mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: check process.isMainFrame in sandboxed_renderer/init.js (#16500)

Browse source
This commit is contained in:
Milan Burda 2019-01-24 19:53:16 +01:00 • committed by Shelley Vohr
parent e6952e2a16
commit fef262f829
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/renderer/web-view/web-view-init.js
View file

@ -17,7 +17,7 @@ function handleFocusBlur (guestInstanceId) {
} }
module.exports = function (contextIsolation, webviewTag, guestInstanceId) { module.exports = function (contextIsolation, webviewTag, guestInstanceId) {
// Load webview tag implementation. // Don't allow recursive `<webview>`.
if (webviewTag && guestInstanceId == null) { if (webviewTag && guestInstanceId == null) {
const webViewImpl = require('@electron/internal/renderer/web-view/web-view-impl') const webViewImpl = require('@electron/internal/renderer/web-view/web-view-impl')
if (contextIsolation) { if (contextIsolation) {

8
lib/sandboxed_renderer/init.js
View file

@ -127,7 +127,9 @@ switch (window.location.protocol) {
const guestInstanceId = binding.guestInstanceId && parseInt(binding.guestInstanceId) const guestInstanceId = binding.guestInstanceId && parseInt(binding.guestInstanceId)
// Load webview tag implementation. // Load webview tag implementation.
require('@electron/internal/renderer/web-view/web-view-init')(contextIsolation, isWebViewTagEnabled, guestInstanceId) if (process.isMainFrame) {
require('@electron/internal/renderer/web-view/web-view-init')(contextIsolation, isWebViewTagEnabled, guestInstanceId)
}
const errorUtils = require('@electron/internal/common/error-utils') const errorUtils = require('@electron/internal/common/error-utils')
@ -176,4 +178,6 @@ try {
} }
// Warn about security issues // Warn about security issues
require('@electron/internal/renderer/security-warnings')() if (process.isMainFrame) {
require('@electron/internal/renderer/security-warnings')()
}