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

chore: make "nodeIntegration" and "webviewTag" default to false (#16235)

Browse source
This commit is contained in:
Milan Burda 2019-01-07 20:19:27 +01:00 • committed by Alexey Kuzmin
parent cdf4bfa68f
commit fade3eb679
23 changed files with 261 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

55
spec/webview-spec.js
View file

@ -65,7 +65,13 @@ describe('<webview> tag', function () {
})
it('works without script tag in page', async () => {
const w = await openTheWindow({ show: false })
const w = await openTheWindow({
show: false,
webPreferences: {
webviewTag: true,
nodeIntegration: true
}
})
w.loadFile(path.join(fixtures, 'pages', 'webview-no-script.html'))
await emittedOnce(ipcMain, 'pong')
})
@ -75,6 +81,7 @@ describe('<webview> tag', function () {
show: false,
webPreferences: {
webviewTag: true,
nodeIntegration: true,
contextIsolation: true
}
})
@ -82,12 +89,12 @@ describe('<webview> tag', function () {
await emittedOnce(ipcMain, 'pong')
})
it('is disabled when nodeIntegration is disabled', async () => {
it('is disabled by default', async () => {
const w = await openTheWindow({
show: false,
webPreferences: {
nodeIntegration: false,
preload: path.join(fixtures, 'module', 'preload-webview.js')
preload: path.join(fixtures, 'module', 'preload-webview.js'),
nodeIntegration: true
}
})
@ -97,22 +104,6 @@ describe('<webview> tag', function () {
expect(type).to.equal('undefined', 'WebView still exists')
})
it('is enabled when the webviewTag option is enabled and the nodeIntegration option is disabled', async () => {
const w = await openTheWindow({
show: false,
webPreferences: {
nodeIntegration: false,
preload: path.join(fixtures, 'module', 'preload-webview.js'),
webviewTag: true
}
})
w.loadFile(path.join(fixtures, 'pages', 'webview-no-script.html'))
const [, type] = await emittedOnce(ipcMain, 'webview')
expect(type).to.not.equal('undefined', 'WebView is not created')
})
describe('src attribute', () => {
it('specifies the page to load', async () => {
const message = await startLoadingWebViewAndWaitForMessage(webview, {
@ -1289,7 +1280,13 @@ describe('<webview> tag', function () {
describe('did-attach-webview event', () => {
it('is emitted when a webview has been attached', async () => {
const w = await openTheWindow({ show: false })
const w = await openTheWindow({
show: false,
webPreferences: {
webviewTag: true,
nodeIntegration: true
}
})
w.loadFile(path.join(fixtures, 'pages', 'webview-did-attach-event.html'))
const [, webContents] = await emittedOnce(w.webContents, 'did-attach-webview')
@ -1299,7 +1296,13 @@ describe('<webview> tag', function () {
})
it('loads devtools extensions registered on the parent window', async () => {
const w = await openTheWindow({ show: false })
const w = await openTheWindow({
show: false,
webPreferences: {
webviewTag: true,
nodeIntegration: true
}
})
BrowserWindow.removeDevToolsExtension('foo')
const extensionPath = path.join(__dirname, 'fixtures', 'devtools-extensions', 'foo')
@ -1391,6 +1394,8 @@ describe('<webview> tag', function () {
const w = await openTheWindow({
show: false,
webPreferences: {
webviewTag: true,
nodeIntegration: true,
zoomFactor: 1.2
}
})
@ -1405,6 +1410,8 @@ describe('<webview> tag', function () {
return openTheWindow({
show: false,
webPreferences: {
webviewTag: true,
nodeIntegration: true,
zoomFactor: 1.2
}
}).then((w) => {
@ -1434,6 +1441,8 @@ describe('<webview> tag', function () {
return openTheWindow({
show: false,
webPreferences: {
webviewTag: true,
nodeIntegration: true,
zoomFactor: 1.2
}
}).then((w) => {
@ -1458,6 +1467,8 @@ describe('<webview> tag', function () {
const w = await openTheWindow({
show: false,
webPreferences: {
webviewTag: true,
nodeIntegration: true,
zoomFactor: 1.2
}
})