github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
trop[bot]
2019-01-29 21:10:53 -08:00
committed by Shelley Vohr
parent ae85864959
commit e55a9b35b6
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) {
// Load webview tag implementation.
// Don't allow recursive `<webview>`.
if (webviewTag && guestInstanceId == null) {
const webViewImpl = require('@electron/internal/renderer/web-view/web-view-impl')
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)
// 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')()
}