From 3977d2f17d51439000337b10d289c15306fa30c9 Mon Sep 17 00:00:00 2001 From: Milan Burda Date: Wed, 2 Jan 2019 17:23:30 +0100 Subject: [PATCH] chore: make nodeIntegration / webviewTag defaults false --- atom/browser/web_contents_preferences.cc | 5 +- lib/browser/guest-view-manager.js | 3 +- lib/browser/guest-window-manager.js | 4 +- lib/renderer/init.js | 5 +- spec/api-app-spec.js | 34 ++++++-- spec/api-browser-window-spec.js | 100 ++++++++++++++++------- spec/api-crash-reporter-spec.js | 9 +- spec/api-ipc-main-spec.js | 21 ++++- spec/api-ipc-renderer-spec.js | 14 +++- spec/api-notification-dbus-spec.js | 2 +- spec/api-protocol-spec.js | 7 +- spec/api-remote-spec.js | 2 +- spec/api-session-spec.js | 5 +- spec/api-web-contents-spec.js | 4 +- spec/api-web-frame-spec.js | 7 +- spec/asar-spec.js | 18 ++-- spec/chromium-spec.js | 58 ++++++------- spec/modules-spec.js | 7 +- spec/security-warnings-spec.js | 26 ++---- spec/static/main.js | 4 +- spec/webview-spec.js | 55 ++++++++----- 21 files changed, 254 insertions(+), 136 deletions(-) diff --git a/atom/browser/web_contents_preferences.cc b/atom/browser/web_contents_preferences.cc index 79493be4d7c87..285941e634e64 100644 --- a/atom/browser/web_contents_preferences.cc +++ b/atom/browser/web_contents_preferences.cc @@ -99,9 +99,9 @@ WebContentsPreferences::WebContentsPreferences( // Set WebPreferences defaults onto the JS object SetDefaultBoolIfUndefined(options::kPlugins, false); SetDefaultBoolIfUndefined(options::kExperimentalFeatures, false); - bool node = SetDefaultBoolIfUndefined(options::kNodeIntegration, true); + SetDefaultBoolIfUndefined(options::kNodeIntegration, false); SetDefaultBoolIfUndefined(options::kNodeIntegrationInWorker, false); - SetDefaultBoolIfUndefined(options::kWebviewTag, node); + SetDefaultBoolIfUndefined(options::kWebviewTag, false); SetDefaultBoolIfUndefined(options::kSandbox, false); SetDefaultBoolIfUndefined(options::kNativeWindowOpen, false); SetDefaultBoolIfUndefined(options::kContextIsolation, false); @@ -236,7 +236,6 @@ void WebContentsPreferences::AppendCommandLineSwitches( command_line->AppendSwitch(switches::kNodeIntegrationInWorker); // Check if webview tag creation is enabled, default to nodeIntegration value. - // TODO(kevinsawicki): Default to false in 2.0 if (IsEnabled(options::kWebviewTag)) command_line->AppendSwitch(switches::kWebviewTag); diff --git a/lib/browser/guest-view-manager.js b/lib/browser/guest-view-manager.js index d56a75c985bfd..eabaf5d33cdfb 100644 --- a/lib/browser/guest-view-manager.js +++ b/lib/browser/guest-view-manager.js @@ -202,7 +202,7 @@ const attachGuest = function (event, embedderFrameId, elementInstanceId, guestIn const webPreferences = { guestInstanceId: guestInstanceId, - nodeIntegration: params.nodeintegration != null ? params.nodeintegration : false, + nodeIntegration: params.nodeintegration, enableRemoteModule: params.enableremotemodule, plugins: params.plugins, zoomFactor: embedder._getZoomFactor(), @@ -237,7 +237,6 @@ const attachGuest = function (event, embedderFrameId, elementInstanceId, guestIn ['contextIsolation', true], ['javascript', false], ['nativeWindowOpen', true], - ['nodeIntegration', false], ['enableRemoteModule', false], ['sandbox', true] ]) diff --git a/lib/browser/guest-window-manager.js b/lib/browser/guest-window-manager.js index ffc1bf99dabba..c17936de7ff2a 100644 --- a/lib/browser/guest-window-manager.js +++ b/lib/browser/guest-window-manager.js @@ -13,10 +13,8 @@ const inheritedWebPreferences = new Map([ ['contextIsolation', true], ['javascript', false], ['nativeWindowOpen', true], - ['nodeIntegration', false], ['enableRemoteModule', false], - ['sandbox', true], - ['webviewTag', false] + ['sandbox', true] ]) // Copy attribute of |parent| to |child| if it is not defined in |child|. diff --git a/lib/renderer/init.js b/lib/renderer/init.js index 80620406811dc..5ac4fadfe96d6 100644 --- a/lib/renderer/init.js +++ b/lib/renderer/init.js @@ -34,7 +34,7 @@ require('@electron/internal/renderer/web-frame-init')() const { hasSwitch, getSwitchValue } = require('@electron/internal/renderer/command-line') const contextIsolation = hasSwitch('context-isolation') -let nodeIntegration = hasSwitch('node-integration') +const nodeIntegration = hasSwitch('node-integration') const webviewTag = hasSwitch('webview-tag') const isHiddenPage = hasSwitch('hidden-page') const isBackgroundPage = hasSwitch('background-page') @@ -60,14 +60,11 @@ if (contextIsolation) { if (window.location.protocol === 'chrome-devtools:') { // Override some inspector APIs. require('@electron/internal/renderer/inspector') - nodeIntegration = false } else if (window.location.protocol === 'chrome-extension:') { // Add implementations of chrome API. require('@electron/internal/renderer/chrome-api').injectTo(window.location.hostname, isBackgroundPage, window) - nodeIntegration = false } else if (window.location.protocol === 'chrome:') { // Disable node integration for chrome UI scheme. - nodeIntegration = false } else { // Override default web functions. require('@electron/internal/renderer/window-setup')(ipcRenderer, guestInstanceId, openerId, isHiddenPage, usesNativeWindowOpen) diff --git a/spec/api-app-spec.js b/spec/api-app-spec.js index af4e48740257f..3574830d96958 100644 --- a/spec/api-app-spec.js +++ b/spec/api-app-spec.js @@ -32,7 +32,10 @@ describe('electron module', () => { window = new BrowserWindow({ show: false, width: 400, - height: 400 + height: 400, + webPreferences: { + nodeIntegration: true + } }) }) @@ -298,7 +301,12 @@ describe('app module', () => { password: 'electron' } - w = new BrowserWindow({ show: false }) + w = new BrowserWindow({ + show: false, + webPreferences: { + nodeIntegration: true + } + }) w.webContents.on('did-finish-load', () => { expect(w.webContents.getTitle()).to.equal('authorized') @@ -375,7 +383,12 @@ describe('app module', () => { expect(webContents).to.equal(w.webContents) done() }) - w = new BrowserWindow({ show: false }) + w = new BrowserWindow({ + show: false, + webPreferences: { + nodeIntegration: true + } + }) w.loadURL('about:blank') w.webContents.executeJavaScript(`require('electron').desktopCapturer.getSources({ types: ['screen'] }, () => {})`) }) @@ -386,7 +399,12 @@ describe('app module', () => { expect(moduleName).to.equal('test') done() }) - w = new BrowserWindow({ show: false }) + w = new BrowserWindow({ + show: false, + webPreferences: { + nodeIntegration: true + } + }) w.loadURL('about:blank') w.webContents.executeJavaScript(`require('electron').remote.require('test')`) }) @@ -397,7 +415,12 @@ describe('app module', () => { expect(globalName).to.equal('test') done() }) - w = new BrowserWindow({ show: false }) + w = new BrowserWindow({ + show: false, + webPreferences: { + nodeIntegration: true + } + }) w.loadURL('about:blank') w.webContents.executeJavaScript(`require('electron').remote.getGlobal('test')`) }) @@ -590,6 +613,7 @@ describe('app module', () => { w = new BrowserWindow({ show: false, webPreferences: { + nodeIntegration: true, partition: 'empty-certificate' } }) diff --git a/spec/api-browser-window-spec.js b/spec/api-browser-window-spec.js index 8f49111116951..ac649c70db119 100644 --- a/spec/api-browser-window-spec.js +++ b/spec/api-browser-window-spec.js @@ -34,7 +34,8 @@ describe('BrowserWindow module', () => { width: 400, height: 400, webPreferences: { - backgroundThrottling: false + backgroundThrottling: false, + nodeIntegration: true } } @@ -1283,7 +1284,10 @@ describe('BrowserWindow module', () => { w.destroy() w = new BrowserWindow({ show: false, - webPreferences: { preload } + webPreferences: { + nodeIntegration: true, + preload + } }) const p = emittedOnce(ipcMain, 'answer') w.loadFile(path.join(fixtures, 'api', 'preload.html')) @@ -1296,7 +1300,8 @@ describe('BrowserWindow module', () => { w = new BrowserWindow({ show: false, webPreferences: { - preload: preload + nodeIntegration: true, + preload } }) const p = emittedOnce(ipcMain, 'answer') @@ -1308,7 +1313,10 @@ describe('BrowserWindow module', () => { const preload = path.join(fixtures, 'module', 'access-blink-apis.js') const w = await openTheWindow({ show: false, - webPreferences: { preload } + webPreferences: { + nodeIntegration: true, + preload + } }) const p = emittedOnce(ipcMain, 'answer') w.loadFile(path.join(fixtures, 'api', 'preload.html')) @@ -1350,6 +1358,7 @@ describe('BrowserWindow module', () => { w = new BrowserWindow({ show: false, webPreferences: { + nodeIntegration: true, preload: path.join(fixtures, 'module', 'set-global-preload-3.js') } }) @@ -1368,7 +1377,8 @@ describe('BrowserWindow module', () => { w = new BrowserWindow({ show: false, webPreferences: { - preload: preload, + nodeIntegration: true, + preload, additionalArguments: ['--my-magic-arg'] } }) @@ -1385,7 +1395,8 @@ describe('BrowserWindow module', () => { w = new BrowserWindow({ show: false, webPreferences: { - preload: preload, + nodeIntegration: true, + preload, additionalArguments: ['--my-magic-arg=foo'] } }) @@ -1394,7 +1405,7 @@ describe('BrowserWindow module', () => { }) describe('"node-integration" option', () => { - it('disables node integration when specified to false', (done) => { + it('disables node integration by default', (done) => { const preload = path.join(fixtures, 'module', 'send-later.js') ipcMain.once('answer', (event, typeofProcess, typeofBuffer) => { assert.strictEqual(typeofProcess, 'undefined') @@ -1405,8 +1416,7 @@ describe('BrowserWindow module', () => { w = new BrowserWindow({ show: false, webPreferences: { - preload: preload, - nodeIntegration: false + preload } }) w.loadFile(path.join(fixtures, 'api', 'blank.html')) @@ -1422,7 +1432,6 @@ describe('BrowserWindow module', () => { const w = await openTheWindow({ show: false, webPreferences: { - nodeIntegration: false, preload, sandbox } @@ -1437,7 +1446,6 @@ describe('BrowserWindow module', () => { const w = await openTheWindow({ show: false, webPreferences: { - nodeIntegration: false, preload, sandbox, enableRemoteModule: false @@ -1476,8 +1484,9 @@ describe('BrowserWindow module', () => { w = new BrowserWindow({ show: false, webPreferences: { + nodeIntegration: true, sandbox: true, - preload: preload + preload } }) w.loadFile(path.join(fixtures, 'api', 'preload.html')) @@ -1493,6 +1502,7 @@ describe('BrowserWindow module', () => { w = new BrowserWindow({ show: false, webPreferences: { + nodeIntegration: true, sandbox: true, preload: preloadSpecialChars } @@ -1505,8 +1515,9 @@ describe('BrowserWindow module', () => { w = new BrowserWindow({ show: false, webPreferences: { + nodeIntegration: true, sandbox: true, - preload: preload + preload } }) const htmlPath = path.join(fixtures, 'api', 'sandbox.html?exit-event') @@ -1527,8 +1538,9 @@ describe('BrowserWindow module', () => { w = new BrowserWindow({ show: false, webPreferences: { + nodeIntegration: true, sandbox: true, - preload: preload + preload } }) ipcRenderer.send('set-web-preferences-on-next-new-window', w.webContents.id, 'preload', preload) @@ -1653,7 +1665,7 @@ describe('BrowserWindow module', () => { show: false, webPreferences: { sandbox: true, - preload: preload + preload } }) ipcRenderer.send('set-web-preferences-on-next-new-window', w.webContents.id, 'preload', preload) @@ -1738,7 +1750,7 @@ describe('BrowserWindow module', () => { w = new BrowserWindow({ show: false, webPreferences: { - preload: preload, + preload, sandbox: true } }) @@ -1761,7 +1773,7 @@ describe('BrowserWindow module', () => { w = new BrowserWindow({ show: false, webPreferences: { - preload: preload, + preload, sandbox: true } }) @@ -1794,7 +1806,7 @@ describe('BrowserWindow module', () => { w = new BrowserWindow({ show: false, webPreferences: { - preload: preload, + preload, sandbox: true } }) @@ -1843,7 +1855,7 @@ describe('BrowserWindow module', () => { show: false, webPreferences: { sandbox: true, - preload: preload + preload } }) w.loadFile(path.join(fixtures, 'api', 'preload.html')) @@ -1855,7 +1867,7 @@ describe('BrowserWindow module', () => { show: false, webPreferences: { sandbox: true, - preload: preload, + preload, webviewTag: true } }) @@ -1875,6 +1887,7 @@ describe('BrowserWindow module', () => { w = new BrowserWindow({ show: false, webPreferences: { + nodeIntegration: true, nativeWindowOpen: true } }) @@ -1962,7 +1975,6 @@ describe('BrowserWindow module', () => { w = new BrowserWindow({ show: true, webPreferences: { - nodeIntegration: false, nativeWindowOpen: true } }) @@ -1971,7 +1983,6 @@ describe('BrowserWindow module', () => { const p = emittedOnce(ipcMain, 'answer') w.loadFile(path.join(fixtures, 'api', 'window-open-location-open.html')) const [, args, typeofProcess] = await p - expect(args).to.include('--node-integration=false') expect(args).to.include('--native-window-open') expect(typeofProcess).to.eql('undefined') }) @@ -2093,7 +2104,14 @@ describe('BrowserWindow module', () => { afterEach(() => { ipcMain.removeAllListeners('pong') }) it('visibilityState is initially visible despite window being hidden', (done) => { - w = new BrowserWindow({ show: false, width: 100, height: 100 }) + w = new BrowserWindow({ + show: false, + width: 100, + height: 100, + webPreferences: { + nodeIntegration: true + } + }) let readyToShow = false w.once('ready-to-show', () => { @@ -2111,7 +2129,13 @@ describe('BrowserWindow module', () => { w.loadFile(path.join(fixtures, 'pages', 'visibilitychange.html')) }) it('visibilityState changes when window is hidden', (done) => { - w = new BrowserWindow({ width: 100, height: 100 }) + w = new BrowserWindow({ + width: 100, + height: 100, + webPreferences: { + nodeIntegration: true + } + }) onNextVisibilityChange((visibilityState, hidden) => { assert.strictEqual(visibilityState, 'visible') @@ -2129,7 +2153,13 @@ describe('BrowserWindow module', () => { w.loadFile(path.join(fixtures, 'pages', 'visibilitychange.html')) }) it('visibilityState changes when window is shown', (done) => { - w = new BrowserWindow({ width: 100, height: 100 }) + w = new BrowserWindow({ + width: 100, + height: 100, + webPreferences: { + nodeIntegration: true + } + }) onNextVisibilityChange((visibilityState, hidden) => { onVisibilityChange((visibilityState, hidden) => { @@ -2155,7 +2185,13 @@ describe('BrowserWindow module', () => { return done() } - w = new BrowserWindow({ width: 100, height: 100 }) + w = new BrowserWindow({ + width: 100, + height: 100, + webPreferences: { + nodeIntegration: true + } + }) onNextVisibilityChange((visibilityState, hidden) => { onVisibilityChange((visibilityState, hidden) => { @@ -2181,7 +2217,13 @@ describe('BrowserWindow module', () => { return done() } - w = new BrowserWindow({ width: 100, height: 100 }) + w = new BrowserWindow({ + width: 100, + height: 100, + webPreferences: { + nodeIntegration: true + } + }) onNextVisibilityChange((visibilityState, hidden) => { assert.strictEqual(visibilityState, 'visible') @@ -2204,7 +2246,8 @@ describe('BrowserWindow module', () => { width: 100, height: 100, webPreferences: { - backgroundThrottling: false + backgroundThrottling: false, + nodeIntegration: true } }) @@ -3189,6 +3232,7 @@ describe('BrowserWindow module', () => { w = new BrowserWindow({ show: false, webPreferences: { + nodeIntegration: true, partition: 'temp' } }) diff --git a/spec/api-crash-reporter-spec.js b/spec/api-crash-reporter-spec.js index a4de55b84f343..bd9928a3308f3 100644 --- a/spec/api-crash-reporter-spec.js +++ b/spec/api-crash-reporter-spec.js @@ -10,7 +10,7 @@ const url = require('url') const { closeWindow } = require('./window-helpers') const { remote } = require('electron') -const { app, BrowserWindow, crashReporter } = remote.require('electron') +const { app, BrowserWindow, crashReporter } = remote describe('crashReporter module', () => { if (process.mas || process.env.DISABLE_CRASH_REPORTER_TESTS) return @@ -188,7 +188,11 @@ describe('crashReporter module', () => { }) } - generateSpecs('without sandbox', {}) + generateSpecs('without sandbox', { + webPreferences: { + nodeIntegration: true + } + }) generateSpecs('with sandbox', { webPreferences: { sandbox: true, @@ -197,6 +201,7 @@ describe('crashReporter module', () => { }) generateSpecs('with remote module disabled', { webPreferences: { + nodeIntegration: true, enableRemoteModule: false } }) diff --git a/spec/api-ipc-main-spec.js b/spec/api-ipc-main-spec.js index 47a9ee6c6573e..de7fb222e1e74 100644 --- a/spec/api-ipc-main-spec.js +++ b/spec/api-ipc-main-spec.js @@ -24,7 +24,12 @@ describe('ipc main module', () => { afterEach(() => { ipcMain.removeAllListeners('send-sync-message') }) it('does not crash when reply is not sent and browser is destroyed', (done) => { - w = new BrowserWindow({ show: false }) + w = new BrowserWindow({ + show: false, + webPreferences: { + nodeIntegration: true + } + }) ipcMain.once('send-sync-message', (event) => { event.returnValue = null done() @@ -33,7 +38,12 @@ describe('ipc main module', () => { }) it('does not crash when reply is sent by multiple listeners', (done) => { - w = new BrowserWindow({ show: false }) + w = new BrowserWindow({ + show: false, + webPreferences: { + nodeIntegration: true + } + }) ipcMain.on('send-sync-message', (event) => { event.returnValue = null }) @@ -59,7 +69,12 @@ describe('ipc main module', () => { describe('remote objects registry', () => { it('does not dereference until the render view is deleted (regression)', (done) => { - w = new BrowserWindow({ show: false }) + w = new BrowserWindow({ + show: false, + webPreferences: { + nodeIntegration: true + } + }) ipcMain.once('error-message', (event, message) => { const correctMsgStart = message.startsWith('Cannot call function \'getURL\' on missing remote object') diff --git a/spec/api-ipc-renderer-spec.js b/spec/api-ipc-renderer-spec.js index 97e95a0a00763..343df56cca7f4 100644 --- a/spec/api-ipc-renderer-spec.js +++ b/spec/api-ipc-renderer-spec.js @@ -199,7 +199,12 @@ describe('ipc renderer module', () => { describe('remote listeners', () => { it('detaches listeners subscribed to destroyed renderers, and shows a warning', (done) => { - w = new BrowserWindow({ show: false }) + w = new BrowserWindow({ + show: false, + webPreferences: { + nodeIntegration: true + } + }) w.webContents.once('did-finish-load', () => { w.webContents.once('did-finish-load', () => { @@ -227,7 +232,12 @@ describe('ipc renderer module', () => { describe('ipcRenderer.on', () => { it('is not used for internals', async () => { - w = new BrowserWindow({ show: false }) + w = new BrowserWindow({ + show: false, + webPreferences: { + nodeIntegration: true + } + }) await w.loadURL('about:blank') const script = `require('electron').ipcRenderer.eventNames()` diff --git a/spec/api-notification-dbus-spec.js b/spec/api-notification-dbus-spec.js index 34eb78c949790..3c6193e0a3266 100644 --- a/spec/api-notification-dbus-spec.js +++ b/spec/api-notification-dbus-spec.js @@ -11,7 +11,7 @@ const dbus = require('dbus-native') const Promise = require('bluebird') const { remote } = require('electron') -const { app } = remote.require('electron') +const { app } = remote const skip = process.platform !== 'linux' || process.arch === 'ia32' || diff --git a/spec/api-protocol-spec.js b/spec/api-protocol-spec.js index d2d8760c33c7d..afc7f277c5d32 100644 --- a/spec/api-protocol-spec.js +++ b/spec/api-protocol-spec.js @@ -1045,7 +1045,12 @@ describe('protocol module', () => { let success = null beforeEach(() => { - w = new BrowserWindow({ show: false }) + w = new BrowserWindow({ + show: false, + webPreferences: { + nodeIntegration: true + } + }) success = false }) diff --git a/spec/api-remote-spec.js b/spec/api-remote-spec.js index 77956cf7d18e5..253f411376ce6 100644 --- a/spec/api-remote-spec.js +++ b/spec/api-remote-spec.js @@ -526,7 +526,7 @@ describe('remote module', () => { w = new BrowserWindow({ show: false, webPreferences: { - preload: preload + preload } }) w.once('closed', () => done()) diff --git a/spec/api-session-spec.js b/spec/api-session-spec.js index f7c68f990cb50..5c7c9080f0d0e 100644 --- a/spec/api-session-spec.js +++ b/spec/api-session-spec.js @@ -26,7 +26,10 @@ describe('session module', () => { w = new BrowserWindow({ show: false, width: 400, - height: 400 + height: 400, + webPreferences: { + nodeIntegration: true + } }) }) diff --git a/spec/api-web-contents-spec.js b/spec/api-web-contents-spec.js index 7be13271b974f..79866f251b052 100644 --- a/spec/api-web-contents-spec.js +++ b/spec/api-web-contents-spec.js @@ -32,7 +32,9 @@ describe('webContents module', () => { width: 400, height: 400, webPreferences: { - backgroundThrottling: false + backgroundThrottling: false, + nodeIntegration: true, + webviewTag: true } }) }) diff --git a/spec/api-web-frame-spec.js b/spec/api-web-frame-spec.js index ad5d43df77b36..a4779506a623a 100644 --- a/spec/api-web-frame-spec.js +++ b/spec/api-web-frame-spec.js @@ -146,7 +146,12 @@ describe('webFrame module', function () { }) it('calls a spellcheck provider', async () => { - w = new BrowserWindow({ show: false }) + w = new BrowserWindow({ + show: false, + webPreferences: { + nodeIntegration: true + } + }) await w.loadFile(path.join(fixtures, 'pages', 'webframe-spell-check.html')) w.focus() await w.webContents.executeJavaScript('document.querySelector("input").focus()', true) diff --git a/spec/asar-spec.js b/spec/asar-spec.js index bc26959fbfb62..867e0464d20f6 100644 --- a/spec/asar-spec.js +++ b/spec/asar-spec.js @@ -10,8 +10,7 @@ const { closeWindow } = require('./window-helpers') const nativeImage = require('electron').nativeImage const remote = require('electron').remote -const ipcMain = remote.require('electron').ipcMain -const BrowserWindow = remote.require('electron').BrowserWindow +const { ipcMain, BrowserWindow } = remote describe('asar package', function () { const fixtures = path.join(__dirname, 'fixtures') @@ -1134,7 +1133,10 @@ describe('asar package', function () { w = new BrowserWindow({ show: false, width: 400, - height: 400 + height: 400, + webPreferences: { + nodeIntegration: true + } }) const p = path.resolve(fixtures, 'asar', 'web.asar', 'index.html') ipcMain.once('dirname', function (event, dirname) { @@ -1152,7 +1154,10 @@ describe('asar package', function () { w = new BrowserWindow({ show: false, width: 400, - height: 400 + height: 400, + webPreferences: { + nodeIntegration: true + } }) const p = path.resolve(fixtures, 'asar', 'script.asar', 'index.html') w.loadFile(p) @@ -1172,7 +1177,10 @@ describe('asar package', function () { w = new BrowserWindow({ show: false, width: 400, - height: 400 + height: 400, + webPreferences: { + nodeIntegration: true + } }) const p = path.resolve(fixtures, 'asar', 'video.asar', 'index.html') w.loadFile(p) diff --git a/spec/chromium-spec.js b/spec/chromium-spec.js index 361781480e355..461389fb054c4 100644 --- a/spec/chromium-spec.js +++ b/spec/chromium-spec.js @@ -112,12 +112,7 @@ describe('chromium feature', () => { describe('loading jquery', () => { it('does not crash', (done) => { - w = new BrowserWindow({ - show: false, - webPreferences: { - nodeIntegration: false - } - }) + w = new BrowserWindow({ show: false }) w.webContents.once('did-finish-load', () => { done() }) w.webContents.once('crashed', () => done(new Error('WebContents crashed.'))) w.loadFile(path.join(fixtures, 'pages', 'jquery.html')) @@ -176,6 +171,7 @@ describe('chromium feature', () => { w = new BrowserWindow({ show: false, webPreferences: { + nodeIntegration: true, session: ses } }) @@ -216,6 +212,7 @@ describe('chromium feature', () => { w = new BrowserWindow({ show: false, webPreferences: { + nodeIntegration: true, partition: 'sw-file-scheme-spec' } }) @@ -253,7 +250,10 @@ describe('chromium feature', () => { w = new BrowserWindow({ show: false, - webPreferences: { session: customSession } + webPreferences: { + nodeIntegration: true, + session: customSession + } }) w.webContents.on('ipc-message', (event, args) => { if (args[0] === 'reload') { @@ -294,6 +294,7 @@ describe('chromium feature', () => { w = new BrowserWindow({ show: false, webPreferences: { + nodeIntegration: true, partition: 'geolocation-spec' } }) @@ -388,26 +389,6 @@ describe('chromium feature', () => { b = window.open(windowUrl, '', 'nodeIntegration=no,show=no') }) - it('disables webviewTag when node integration is disabled on the parent window', (done) => { - let b = null - listener = (event) => { - assert.strictEqual(event.data.isWebViewUndefined, true) - b.close() - done() - } - window.addEventListener('message', listener) - - const windowUrl = require('url').format({ - pathname: `${fixtures}/pages/window-opener-no-web-view-tag.html`, - protocol: 'file', - query: { - p: `${fixtures}/pages/window-opener-web-view.html` - }, - slashes: true - }) - b = window.open(windowUrl, '', 'nodeIntegration=no,show=no') - }) - // TODO(codebytere): re-enable this test xit('disables node integration when it is disabled on the parent window for chrome devtools URLs', (done) => { let b = null @@ -604,7 +585,12 @@ describe('chromium feature', () => { describe('window.opener', () => { const url = `file://${fixtures}/pages/window-opener.html` it('is null for main window', (done) => { - w = new BrowserWindow({ show: false }) + w = new BrowserWindow({ + show: false, + webPreferences: { + nodeIntegration: true + } + }) w.webContents.once('ipc-message', (event, args) => { assert.deepStrictEqual(args, ['opener', null]) done() @@ -1008,7 +994,9 @@ describe('chromium feature', () => { }) beforeEach(() => { - contents = webContents.create({}) + contents = webContents.create({ + nodeIntegration: true + }) }) afterEach(() => { @@ -1102,8 +1090,10 @@ describe('chromium feature', () => { const testLocalStorageAfterXSiteRedirect = (testTitle, extraPreferences = {}) => { it(testTitle, (done) => { - const webPreferences = { show: false, ...extraPreferences } - w = new BrowserWindow(webPreferences) + w = new BrowserWindow({ + show: false, + ...extraPreferences + }) let redirected = false w.webContents.on('crashed', () => { assert.fail('renderer crashed / was killed') @@ -1417,7 +1407,11 @@ describe('chromium feature', () => { beforeEach(async () => { w = new BrowserWindow({ - show: true + show: true, + webPreferences: { + nodeIntegration: true, + webviewTag: true + } }) const webviewReady = emittedOnce(w.webContents, 'did-attach-webview') diff --git a/spec/modules-spec.js b/spec/modules-spec.js index 89844f59f61e0..a18c9fc21e29b 100644 --- a/spec/modules-spec.js +++ b/spec/modules-spec.js @@ -162,7 +162,12 @@ describe('modules support', () => { let w beforeEach(() => { - w = new BrowserWindow({ show: false }) + w = new BrowserWindow({ + show: false, + webPreferences: { + nodeIntegration: true + } + }) }) afterEach(async () => { diff --git a/spec/security-warnings-spec.js b/spec/security-warnings-spec.js index ac53e0d3beea5..7fd73562fa560 100644 --- a/spec/security-warnings-spec.js +++ b/spec/security-warnings-spec.js @@ -59,7 +59,12 @@ describe('security warnings', () => { }) it('should warn about Node.js integration with remote content', (done) => { - w = new BrowserWindow({ show: false }) + w = new BrowserWindow({ + show: false, + webPreferences: { + nodeIntegration: true + } + }) w.webContents.once('console-message', (e, level, message) => { assert(message.includes('Node.js Integration with Remote Content'), message) done() @@ -75,7 +80,6 @@ describe('security warnings', () => { show: false, webPreferences: { webSecurity: false, - nodeIntegration: false, ...webPreferences } }) @@ -90,10 +94,7 @@ describe('security warnings', () => { it('should warn about insecure Content-Security-Policy', (done) => { w = new BrowserWindow({ show: false, - webPreferences: { - nodeIntegration: false, - ...webPreferences - } + webPreferences }) w.webContents.once('console-message', (e, level, message) => { @@ -110,7 +111,6 @@ describe('security warnings', () => { show: false, webPreferences: { allowRunningInsecureContent: true, - nodeIntegration: false, ...webPreferences } }) @@ -127,7 +127,6 @@ describe('security warnings', () => { show: false, webPreferences: { experimentalFeatures: true, - nodeIntegration: false, ...webPreferences } }) @@ -144,7 +143,6 @@ describe('security warnings', () => { show: false, webPreferences: { enableBlinkFeatures: ['my-cool-feature'], - nodeIntegration: false, ...webPreferences } }) @@ -159,10 +157,7 @@ describe('security warnings', () => { it('should warn about allowpopups', (done) => { w = new BrowserWindow({ show: false, - webPreferences: { - nodeIntegration: false, - ...webPreferences - } + webPreferences }) w.webContents.once('console-message', (e, level, message) => { assert(message.includes('allowpopups'), message) @@ -175,10 +170,7 @@ describe('security warnings', () => { it('should warn about insecure resources', (done) => { w = new BrowserWindow({ show: false, - webPreferences: { - nodeIntegration: false, - ...webPreferences - } + webPreferences }) w.webContents.once('console-message', (e, level, message) => { assert(message.includes('Insecure Resources'), message) diff --git a/spec/static/main.js b/spec/static/main.js index a9d8fc20488a1..1401e586adc2d 100644 --- a/spec/static/main.js +++ b/spec/static/main.js @@ -124,7 +124,9 @@ app.on('ready', function () { width: 800, height: 600, webPreferences: { - backgroundThrottling: false + backgroundThrottling: false, + nodeIntegration: true, + webviewTag: true } }) window.loadFile('static/index.html', { diff --git a/spec/webview-spec.js b/spec/webview-spec.js index 6357d4f97fb7c..599c5f5c57e31 100644 --- a/spec/webview-spec.js +++ b/spec/webview-spec.js @@ -65,52 +65,43 @@ describe(' tag', function () { }) it('works without script tag in page', async () => { - const w = await openTheWindow({ show: false }) - w.loadFile(path.join(fixtures, 'pages', 'webview-no-script.html')) - await emittedOnce(ipcMain, 'pong') - }) - - it('works with contextIsolation', async () => { const w = await openTheWindow({ show: false, webPreferences: { webviewTag: true, - contextIsolation: true + nodeIntegration: true } }) - w.loadFile(path.join(fixtures, 'pages', 'webview-isolated.html')) + w.loadFile(path.join(fixtures, 'pages', 'webview-no-script.html')) await emittedOnce(ipcMain, 'pong') }) - it('is disabled when nodeIntegration is disabled', async () => { + it('works with contextIsolation', async () => { const w = await openTheWindow({ show: false, webPreferences: { - nodeIntegration: false, - preload: path.join(fixtures, 'module', 'preload-webview.js') + webviewTag: true, + nodeIntegration: true, + contextIsolation: true } }) - - w.loadFile(path.join(fixtures, 'pages', 'webview-no-script.html')) - const [, type] = await emittedOnce(ipcMain, 'webview') - - expect(type).to.equal('undefined', 'WebView still exists') + w.loadFile(path.join(fixtures, 'pages', 'webview-isolated.html')) + await emittedOnce(ipcMain, 'pong') }) - it('is enabled when the webviewTag option is enabled and the nodeIntegration option 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'), - webviewTag: true + nodeIntegration: 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') + expect(type).to.equal('undefined', 'WebView still exists') }) describe('src attribute', () => { @@ -1289,7 +1280,13 @@ describe(' 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(' 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(' tag', function () { const w = await openTheWindow({ show: false, webPreferences: { + webviewTag: true, + nodeIntegration: true, zoomFactor: 1.2 } }) @@ -1405,6 +1410,8 @@ describe(' tag', function () { return openTheWindow({ show: false, webPreferences: { + webviewTag: true, + nodeIntegration: true, zoomFactor: 1.2 } }).then((w) => { @@ -1434,6 +1441,8 @@ describe(' tag', function () { return openTheWindow({ show: false, webPreferences: { + webviewTag: true, + nodeIntegration: true, zoomFactor: 1.2 } }).then((w) => { @@ -1458,6 +1467,8 @@ describe(' tag', function () { const w = await openTheWindow({ show: false, webPreferences: { + webviewTag: true, + nodeIntegration: true, zoomFactor: 1.2 } })