fix: don't execute preload scripts for internal <iframe> in <webview> (#19260)
This commit is contained in:
parent
b57e623c11
commit
d1c9f5e309
7 changed files with 81 additions and 3 deletions
|
@ -149,6 +149,39 @@ describe('renderer nodeIntegrationInSubFrames', () => {
|
|||
).forEach(config => {
|
||||
generateTests(config.title, config.webPreferences)
|
||||
})
|
||||
|
||||
describe('internal <iframe> inside of <webview>', () => {
|
||||
let w
|
||||
|
||||
beforeEach(async () => {
|
||||
await closeWindow(w)
|
||||
w = new BrowserWindow({
|
||||
show: false,
|
||||
width: 400,
|
||||
height: 400,
|
||||
webPreferences: {
|
||||
preload: path.resolve(__dirname, 'fixtures/sub-frames/webview-iframe-preload.js'),
|
||||
nodeIntegrationInSubFrames: true,
|
||||
webviewTag: true
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
afterEach(() => {
|
||||
return closeWindow(w).then(() => {
|
||||
w = null
|
||||
})
|
||||
})
|
||||
|
||||
it('should not load preload scripts', async () => {
|
||||
const promisePass = emittedOnce(ipcMain, 'webview-loaded')
|
||||
const promiseFail = emittedOnce(ipcMain, 'preload-in-frame').then(() => {
|
||||
throw new Error('preload loaded in internal frame')
|
||||
})
|
||||
await w.loadURL('about:blank')
|
||||
return Promise.race([promisePass, promiseFail])
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe('cross-site frame sandboxing', () => {
|
||||
|
|
14
spec/fixtures/sub-frames/webview-iframe-preload.js
vendored
Normal file
14
spec/fixtures/sub-frames/webview-iframe-preload.js
vendored
Normal file
|
@ -0,0 +1,14 @@
|
|||
const { ipcRenderer } = require('electron')
|
||||
|
||||
if (process.isMainFrame) {
|
||||
window.addEventListener('DOMContentLoaded', () => {
|
||||
const webview = document.createElement('webview')
|
||||
webview.src = 'about:blank'
|
||||
webview.addEventListener('did-finish-load', () => {
|
||||
ipcRenderer.send('webview-loaded')
|
||||
}, { once: true })
|
||||
document.body.appendChild(webview)
|
||||
})
|
||||
} else {
|
||||
ipcRenderer.send('preload-in-frame')
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue