d5d1fa8290
* fix: use Chromium's determined new site instance as candidate when navigating. When navigating to a new address, consider using Chromium's determined site instance for the new page as it should belong to an existing browsing instance when the navigation was triggered by window.open(). fixes 8100. * Revert "fix: use Chromium's determined new site instance as candidate when navigating." This reverts commit eb95f935654a2c4d4457821297670836c10fdfd5. * fix: delegate site instance creation back to content when sandboxed. * fix: ensure site isolation is on * test: adapt ut for cross-site navigation * fix: register pending processes during a navigation. * refactor: dont call loadURL for a window constructed from an existing webContents. * test: add sandboxed affinity UT's. * fix: check affinity before deciding if to force a new site instance. * chore: adapt subsequent patch. * refactor: constify logically const methods. * fix: do not reuse site instances when navigation redirects cross-site. * test: ensure localStorage accessible after x-site redirect. * test: adapt localStorage acess denied UT for site isolation. * fix: do not send render-view-deleted for speculative frames. * chore: amend tests after rebase. * test: add ut for webContents' render-view-deleted emission * fix: introduce current-render-view-deleted for current RVH's deletions. Revert render-view-deleted to being emitted with any RVH's deletion. current-render-view-deleted is emitted only when the RVH being deleted is the current one. * refactor: style and comments fixed.
196 lines
6.8 KiB
JavaScript
196 lines
6.8 KiB
JavaScript
'use strict'
|
|
|
|
const { expect } = require('chai')
|
|
const path = require('path')
|
|
|
|
const { remote } = require('electron')
|
|
const { ipcMain, BrowserWindow } = remote
|
|
const { closeWindow } = require('./window-helpers')
|
|
|
|
describe('BrowserWindow with affinity module', () => {
|
|
const fixtures = path.resolve(__dirname, 'fixtures')
|
|
const myAffinityName = 'myAffinity'
|
|
const myAffinityNameUpper = 'MYAFFINITY'
|
|
const anotherAffinityName = 'anotherAffinity'
|
|
|
|
function createWindowWithWebPrefs (webPrefs) {
|
|
return new Promise((resolve, reject) => {
|
|
const w = new BrowserWindow({
|
|
show: false,
|
|
width: 400,
|
|
height: 400,
|
|
webPreferences: webPrefs || {}
|
|
})
|
|
w.webContents.on('did-finish-load', () => { resolve(w) })
|
|
w.loadFile(path.join(fixtures, 'api', 'blank.html'))
|
|
})
|
|
}
|
|
|
|
function testAffinityProcessIds (name, webPreferences = {}) {
|
|
describe(name, () => {
|
|
let mAffinityWindow
|
|
before(done => {
|
|
createWindowWithWebPrefs({ affinity: myAffinityName, ...webPreferences })
|
|
.then((w) => {
|
|
mAffinityWindow = w
|
|
done()
|
|
})
|
|
})
|
|
|
|
after(done => {
|
|
closeWindow(mAffinityWindow, { assertSingleWindow: false }).then(() => {
|
|
mAffinityWindow = null
|
|
done()
|
|
})
|
|
})
|
|
|
|
it('should have a different process id than a default window', done => {
|
|
createWindowWithWebPrefs({ ...webPreferences })
|
|
.then(w => {
|
|
const affinityID = mAffinityWindow.webContents.getOSProcessId()
|
|
const wcID = w.webContents.getOSProcessId()
|
|
|
|
expect(affinityID).to.not.equal(wcID, 'Should have different OS process IDs')
|
|
closeWindow(w, { assertSingleWindow: false }).then(() => { done() })
|
|
})
|
|
})
|
|
|
|
it(`should have a different process id than a window with a different affinity '${anotherAffinityName}'`, done => {
|
|
createWindowWithWebPrefs({ affinity: anotherAffinityName, ...webPreferences })
|
|
.then(w => {
|
|
const affinityID = mAffinityWindow.webContents.getOSProcessId()
|
|
const wcID = w.webContents.getOSProcessId()
|
|
|
|
expect(affinityID).to.not.equal(wcID, 'Should have different OS process IDs')
|
|
closeWindow(w, { assertSingleWindow: false }).then(() => { done() })
|
|
})
|
|
})
|
|
|
|
it(`should have the same OS process id than a window with the same affinity '${myAffinityName}'`, done => {
|
|
createWindowWithWebPrefs({ affinity: myAffinityName, ...webPreferences })
|
|
.then(w => {
|
|
const affinityID = mAffinityWindow.webContents.getOSProcessId()
|
|
const wcID = w.webContents.getOSProcessId()
|
|
|
|
expect(affinityID).to.equal(wcID, 'Should have the same OS process ID')
|
|
closeWindow(w, { assertSingleWindow: false }).then(() => { done() })
|
|
})
|
|
})
|
|
|
|
it(`should have the same OS process id than a window with an equivalent affinity '${myAffinityNameUpper}' (case insensitive)`, done => {
|
|
createWindowWithWebPrefs({ affinity: myAffinityNameUpper, ...webPreferences })
|
|
.then(w => {
|
|
const affinityID = mAffinityWindow.webContents.getOSProcessId()
|
|
const wcID = w.webContents.getOSProcessId()
|
|
|
|
expect(affinityID).to.equal(wcID, 'Should have the same OS process ID')
|
|
closeWindow(w, { assertSingleWindow: false }).then(() => { done() })
|
|
})
|
|
})
|
|
})
|
|
}
|
|
|
|
testAffinityProcessIds(`BrowserWindow with an affinity '${myAffinityName}'`)
|
|
testAffinityProcessIds(`BrowserWindow with an affinity '${myAffinityName}' and sandbox enabled`, { sandbox: true })
|
|
testAffinityProcessIds(`BrowserWindow with an affinity '${myAffinityName}' and nativeWindowOpen enabled`, { nativeWindowOpen: true })
|
|
|
|
describe(`BrowserWindow with an affinity : nodeIntegration=false`, () => {
|
|
const preload = path.join(fixtures, 'module', 'send-later.js')
|
|
const affinityWithNodeTrue = 'affinityWithNodeTrue'
|
|
const affinityWithNodeFalse = 'affinityWithNodeFalse'
|
|
|
|
function testNodeIntegration (present) {
|
|
return new Promise((resolve, reject) => {
|
|
ipcMain.once('answer', (event, typeofProcess, typeofBuffer) => {
|
|
if (present) {
|
|
expect(typeofProcess).to.not.equal('undefined')
|
|
expect(typeofBuffer).to.not.equal('undefined')
|
|
} else {
|
|
expect(typeofProcess).to.equal('undefined')
|
|
expect(typeofBuffer).to.equal('undefined')
|
|
}
|
|
resolve()
|
|
})
|
|
})
|
|
}
|
|
|
|
it('disables node integration when specified to false', done => {
|
|
Promise.all([
|
|
testNodeIntegration(false),
|
|
createWindowWithWebPrefs({
|
|
affinity: affinityWithNodeTrue,
|
|
preload,
|
|
nodeIntegration: false
|
|
})
|
|
]).then(args => {
|
|
closeWindow(args[1], { assertSingleWindow: false }).then(() => { done() })
|
|
})
|
|
})
|
|
it('disables node integration when first window is false', done => {
|
|
Promise.all([
|
|
testNodeIntegration(false),
|
|
createWindowWithWebPrefs({
|
|
affinity: affinityWithNodeTrue,
|
|
preload,
|
|
nodeIntegration: false
|
|
})
|
|
]).then(args => {
|
|
const w1 = args[1]
|
|
return Promise.all([
|
|
testNodeIntegration(false),
|
|
w1,
|
|
createWindowWithWebPrefs({
|
|
affinity: affinityWithNodeTrue,
|
|
preload,
|
|
nodeIntegration: true
|
|
})
|
|
])
|
|
}).then(ws => {
|
|
return Promise.all([
|
|
closeWindow(ws[1], { assertSingleWindow: false }),
|
|
closeWindow(ws[2], { assertSingleWindow: false })
|
|
])
|
|
}).then(() => { done() })
|
|
})
|
|
|
|
it('enables node integration when specified to true', done => {
|
|
Promise.all([
|
|
testNodeIntegration(true),
|
|
createWindowWithWebPrefs({
|
|
affinity: affinityWithNodeFalse,
|
|
preload,
|
|
nodeIntegration: true
|
|
})
|
|
]).then(args => {
|
|
closeWindow(args[1], { assertSingleWindow: false }).then(() => { done() })
|
|
})
|
|
})
|
|
|
|
it('enables node integration when first window is true', done => {
|
|
Promise.all([
|
|
testNodeIntegration(true),
|
|
createWindowWithWebPrefs({
|
|
affinity: affinityWithNodeFalse,
|
|
preload,
|
|
nodeIntegration: true
|
|
})
|
|
]).then(args => {
|
|
const w1 = args[1]
|
|
return Promise.all([
|
|
testNodeIntegration(true),
|
|
w1,
|
|
createWindowWithWebPrefs({
|
|
affinity: affinityWithNodeFalse,
|
|
preload,
|
|
nodeIntegration: false
|
|
})
|
|
])
|
|
}).then(ws => {
|
|
return Promise.all([
|
|
closeWindow(ws[1], { assertSingleWindow: false }),
|
|
closeWindow(ws[2], { assertSingleWindow: false })
|
|
])
|
|
}).then(() => { done() })
|
|
})
|
|
})
|
|
})
|