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

Inherit enabled-sandbox in opened windows

Browse source
This commit is contained in:
Kevin Sawicki 2017-07-10 16:23:04 -07:00
parent c71b0a5441
commit 86b1deedfa
3 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/browser/guest-window-manager.js
View file

@ -13,6 +13,7 @@ const inheritedWebPreferences = new Map([
['javascript', false],
['nativeWindowOpen', true],
['nodeIntegration', false],
['sandbox', true],
['webviewTag', false]
])

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

@ -1066,6 +1066,24 @@ describe('BrowserWindow module', function () {
})
})
it('should inherit the sandbox setting in opened windows', function (done) {
w.destroy()
w = new BrowserWindow({
show: false,
webPreferences: {
sandbox: true
}
})
const preloadPath = path.join(fixtures, 'api', 'new-window-preload.js')
ipcRenderer.send('set-web-preferences-on-next-new-window', w.webContents.id, 'preload', preloadPath)
ipcMain.once('answer', (event, args) => {
assert.equal(args.includes('--enable-sandbox'), true)
done()
})
w.loadURL(`file://${path.join(fixtures, 'api', 'new-window.html')}`)
})
it('should open windows with the options configured via new-window event listeners', function (done) {
w.destroy()
w = new BrowserWindow({
@ -1077,10 +1095,10 @@ describe('BrowserWindow module', function () {
const preloadPath = path.join(fixtures, 'api', 'new-window-preload.js')
ipcRenderer.send('set-web-preferences-on-next-new-window', w.webContents.id, 'preload', preloadPath)
ipcRenderer.send('set-web-preferences-on-next-new-window', w.webContents.id, 'sandbox', true)
ipcMain.once('answer', (event, args) => {
assert.ok(args.includes('--enable-sandbox'))
assert.ok(args.includes(`--preload=${path.join(fixtures, 'api', 'new-window-preload.js')}`))
ipcRenderer.send('set-web-preferences-on-next-new-window', w.webContents.id, 'foo', 'bar')
ipcMain.once('answer', (event, args, webPreferences) => {
assert.equal(args.includes('--enable-sandbox'), true)
assert.equal(webPreferences.foo, 'bar')
done()
})
w.loadURL(`file://${path.join(fixtures, 'api', 'new-window.html')}`)

4
spec/fixtures/api/new-window-preload.js vendored
View file

@ -1,4 +1,4 @@
const {ipcRenderer} = require('electron')
const {ipcRenderer, remote} = require('electron')
ipcRenderer.send('answer', process.argv)
ipcRenderer.send('answer', process.argv, remote.getCurrentWindow().webContents.getWebPreferences())
window.close()