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

chore: bump chromium to e049d599a8332b9b2785b0178be74 (master) (#20314)

Browse source
This commit is contained in:
Electron Bot 2019-10-18 15:57:34 -04:00 • committed by Jeremy Apthorp
parent 0090616f7b
commit 3ac3fbdbfb
94 changed files with 670 additions and 1213 deletions
Download patch file Download diff file Expand all files Collapse all files

53
spec-main/security-warnings-spec.ts
View file

@ -8,7 +8,15 @@ import { BrowserWindow, WebPreferences } from 'electron'
import { closeWindow } from './window-helpers'
import { AddressInfo } from 'net';
import { emittedOnce } from './events-helpers';
import { emittedUntil } from './events-helpers';
const messageContainsSecurityWarning = (event: Event, level: number, message: string) => {
return message.indexOf('Electron Security Warning') > -1
}
const isLoaded = (event: Event, level: number, message: string) => {
return (message === 'loaded')
}
describe('security warnings', () => {
let server: http.Server
@ -73,26 +81,21 @@ describe('security warnings', () => {
})
w.loadURL(`${serverUrl}/base-page-security.html`)
const [,, message] = await emittedOnce(w.webContents, 'console-message')
const [,, message] = await emittedUntil(w.webContents, 'console-message', messageContainsSecurityWarning)
expect(message).to.include('Node.js Integration with Remote Content')
})
it('should not warn about Node.js integration with remote content from localhost', (done) => {
it('should not warn about Node.js integration with remote content from localhost', async () => {
w = new BrowserWindow({
show: false,
webPreferences: {
nodeIntegration: true
}
})
w.webContents.once('console-message', (e, level, message) => {
expect(message).to.not.include('Node.js Integration with Remote Content')
if (message === 'loaded') {
done()
}
})
w.loadURL(`${serverUrl}/base-page-security-onload-message.html`)
const [,, message] = await emittedUntil(w.webContents, 'console-message', isLoaded)
expect(message).to.not.include('Node.js Integration with Remote Content')
})
const generateSpecs = (description: string, webPreferences: WebPreferences) => {
@ -107,7 +110,7 @@ describe('security warnings', () => {
})
w.loadURL(`${serverUrl}/base-page-security.html`)
const [,, message] = await emittedOnce(w.webContents, 'console-message')
const [,, message] = await emittedUntil(w.webContents, 'console-message', messageContainsSecurityWarning)
expect(message).to.include('Disabled webSecurity')
})
@ -122,7 +125,7 @@ describe('security warnings', () => {
useCsp = false
w.loadURL(`${serverUrl}/base-page-security.html`)
const [,, message] = await emittedOnce(w.webContents, 'console-message')
const [,, message] = await emittedUntil(w.webContents, 'console-message', messageContainsSecurityWarning)
expect(message).to.include('Insecure Content-Security-Policy')
})
@ -136,7 +139,7 @@ describe('security warnings', () => {
})
w.loadURL(`${serverUrl}/base-page-security.html`)
const [,, message] = await emittedOnce(w.webContents, 'console-message')
const [,, message] = await emittedUntil(w.webContents, 'console-message', messageContainsSecurityWarning)
expect(message).to.include('allowRunningInsecureContent')
})
@ -150,7 +153,7 @@ describe('security warnings', () => {
})
w.loadURL(`${serverUrl}/base-page-security.html`)
const [,, message] = await emittedOnce(w.webContents, 'console-message')
const [,, message] = await emittedUntil(w.webContents, 'console-message', messageContainsSecurityWarning)
expect(message).to.include('experimentalFeatures')
})
@ -164,7 +167,7 @@ describe('security warnings', () => {
})
w.loadURL(`${serverUrl}/base-page-security.html`)
const [,, message] = await emittedOnce(w.webContents, 'console-message')
const [,, message] = await emittedUntil(w.webContents, 'console-message', messageContainsSecurityWarning)
expect(message).to.include('enableBlinkFeatures')
})
@ -175,7 +178,7 @@ describe('security warnings', () => {
})
w.loadURL(`${serverUrl}/webview-allowpopups.html`)
const [,, message] = await emittedOnce(w.webContents, 'console-message')
const [,, message] = await emittedUntil(w.webContents, 'console-message', messageContainsSecurityWarning)
expect(message).to.include('allowpopups')
})
@ -186,7 +189,7 @@ describe('security warnings', () => {
})
w.loadURL(`${serverUrl}/insecure-resources.html`)
const [,, message] = await emittedOnce(w.webContents, 'console-message')
const [,, message] = await emittedUntil(w.webContents, 'console-message', messageContainsSecurityWarning)
expect(message).to.include('Insecure Resources')
})
@ -197,7 +200,7 @@ describe('security warnings', () => {
})
w.loadURL(`${serverUrl}/insecure-resources.html`)
const [,, message] = await emittedOnce(w.webContents, 'console-message')
const [,, message] = await emittedUntil(w.webContents, 'console-message', messageContainsSecurityWarning)
expect(message).to.not.include('insecure-resources.html')
})
@ -208,24 +211,18 @@ describe('security warnings', () => {
})
w.loadURL(`${serverUrl}/base-page-security.html`)
const [,, message] = await emittedOnce(w.webContents, 'console-message')
const [,, message] = await emittedUntil(w.webContents, 'console-message', messageContainsSecurityWarning)
expect(message).to.include('enableRemoteModule')
})
it('should not warn about enabled remote module with remote content from localhost', (done) => {
it('should not warn about enabled remote module with remote content from localhost', async () => {
w = new BrowserWindow({
show: false,
webPreferences
})
w.webContents.once('console-message', (e, level, message) => {
expect(message).to.not.include('enableRemoteModule')
if (message === 'loaded') {
done()
}
})
w.loadURL(`${serverUrl}/base-page-security-onload-message.html`)
const [,, message] = await emittedUntil(w.webContents, 'console-message', isLoaded)
expect(message).to.not.include('enableRemoteModule')
})
})
}