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

fix contextIsolation issue while webPreference sandbox is on

Browse source 
contextIsolation didn't work while sandbox is on. The fix is contextIsolation picked up while sandbox on
This commit is contained in:
sungpark 2017-07-27 17:08:24 -07:00
parent 485b9099f1
commit bf07c5aebd
8 changed files with 63 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

35
spec/api-browser-window-spec.js
View file

@ -17,6 +17,7 @@ const nativeModulesEnabled = remote.getGlobal('nativeModulesEnabled')
describe('BrowserWindow module', function () {
var fixtures = path.resolve(__dirname, 'fixtures')
var w = null
var ws = null
var server, postData
before(function (done) {
@ -2643,7 +2644,7 @@ describe('BrowserWindow module', function () {
})
})
describe('contextIsolation option', () => {
describe('contextIsolation option with and without sandbox option', () => {
const expectedContextData = {
preloadContext: {
preloadProperty: 'number',
@ -2674,6 +2675,19 @@ describe('BrowserWindow module', function () {
preload: path.join(fixtures, 'api', 'isolated-preload.js')
}
})
if (ws != null) ws.destroy()
ws = new BrowserWindow({
show: false,
webPreferences: {
sandbox: true,
contextIsolation: true,
preload: path.join(fixtures, 'api', 'isolated-preload.js')
}
})
})
afterEach(() => {
if (ws != null) ws.destroy()
})
it('separates the page context from the Electron/preload context', (done) => {
@ -2702,6 +2716,25 @@ describe('BrowserWindow module', function () {
})
w.loadURL('file://' + fixtures + '/pages/window-open.html')
})
it('separates the page context from the Electron/preload context with sandbox on', (done) => {
ipcMain.once('isolated-sandbox-world', (event, data) => {
assert.deepEqual(data, expectedContextData)
done()
})
w.loadURL('file://' + fixtures + '/api/isolated.html')
})
it('recreates the contexts on reload with sandbox on', (done) => {
w.webContents.once('did-finish-load', () => {
ipcMain.once('isolated-sandbox-world', (event, data) => {
assert.deepEqual(data, expectedContextData)
done()
})
w.webContents.reload()
})
w.loadURL('file://' + fixtures + '/api/isolated.html')
})
})
describe('offscreen rendering', function () {