From fef262f8299435786081ad316177d0adad147b01 Mon Sep 17 00:00:00 2001 From: Milan Burda Date: Thu, 24 Jan 2019 19:53:16 +0100 Subject: [PATCH] fix: check process.isMainFrame in sandboxed_renderer/init.js (#16500) --- lib/renderer/web-view/web-view-init.js | 2 +- lib/sandboxed_renderer/init.js | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/renderer/web-view/web-view-init.js b/lib/renderer/web-view/web-view-init.js index 6afff49c14b1f..da302c39f25bb 100644 --- a/lib/renderer/web-view/web-view-init.js +++ b/lib/renderer/web-view/web-view-init.js @@ -17,7 +17,7 @@ function handleFocusBlur (guestInstanceId) { } module.exports = function (contextIsolation, webviewTag, guestInstanceId) { - // Load webview tag implementation. + // Don't allow recursive ``. if (webviewTag && guestInstanceId == null) { const webViewImpl = require('@electron/internal/renderer/web-view/web-view-impl') if (contextIsolation) { diff --git a/lib/sandboxed_renderer/init.js b/lib/sandboxed_renderer/init.js index 232c4f4d3568a..43fcbbeb176df 100644 --- a/lib/sandboxed_renderer/init.js +++ b/lib/sandboxed_renderer/init.js @@ -127,7 +127,9 @@ switch (window.location.protocol) { const guestInstanceId = binding.guestInstanceId && parseInt(binding.guestInstanceId) // 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') @@ -176,4 +178,6 @@ try { } // Warn about security issues -require('@electron/internal/renderer/security-warnings')() +if (process.isMainFrame) { + require('@electron/internal/renderer/security-warnings')() +}