build: enable JS semicolons (#22783)
This commit is contained in:
Samuel Attard
GitHub
parent
24e21467b9
commit
5d657dece4
354 changed files with 21512 additions and 21510 deletions
|
|
@ -1,126 +1,126 @@
|
|||
import { expect } from 'chai'
|
||||
import * as path from 'path'
|
||||
import * as http from 'http'
|
||||
import { emittedNTimes, emittedOnce } from './events-helpers'
|
||||
import { closeWindow } from './window-helpers'
|
||||
import { app, BrowserWindow, ipcMain } from 'electron'
|
||||
import { AddressInfo } from 'net'
|
||||
import { ifdescribe } from './spec-helpers'
|
||||
import { expect } from 'chai';
|
||||
import * as path from 'path';
|
||||
import * as http from 'http';
|
||||
import { emittedNTimes, emittedOnce } from './events-helpers';
|
||||
import { closeWindow } from './window-helpers';
|
||||
import { app, BrowserWindow, ipcMain } from 'electron';
|
||||
import { AddressInfo } from 'net';
|
||||
import { ifdescribe } from './spec-helpers';
|
||||
|
||||
describe('renderer nodeIntegrationInSubFrames', () => {
|
||||
const generateTests = (description: string, webPreferences: any) => {
|
||||
describe(description, () => {
|
||||
const fixtureSuffix = webPreferences.webviewTag ? '-webview' : ''
|
||||
let w: BrowserWindow
|
||||
const fixtureSuffix = webPreferences.webviewTag ? '-webview' : '';
|
||||
let w: BrowserWindow;
|
||||
|
||||
beforeEach(async () => {
|
||||
await closeWindow(w)
|
||||
await closeWindow(w);
|
||||
w = new BrowserWindow({
|
||||
show: false,
|
||||
width: 400,
|
||||
height: 400,
|
||||
webPreferences
|
||||
})
|
||||
})
|
||||
});
|
||||
});
|
||||
|
||||
afterEach(async () => {
|
||||
await closeWindow(w)
|
||||
w = null as unknown as BrowserWindow
|
||||
})
|
||||
await closeWindow(w);
|
||||
w = null as unknown as BrowserWindow;
|
||||
});
|
||||
|
||||
it('should load preload scripts in top level iframes', async () => {
|
||||
const detailsPromise = emittedNTimes(ipcMain, 'preload-ran', 2)
|
||||
w.loadFile(path.resolve(__dirname, `fixtures/sub-frames/frame-container${fixtureSuffix}.html`))
|
||||
const [event1, event2] = await detailsPromise
|
||||
expect(event1[0].frameId).to.not.equal(event2[0].frameId)
|
||||
expect(event1[0].frameId).to.equal(event1[2])
|
||||
expect(event2[0].frameId).to.equal(event2[2])
|
||||
})
|
||||
const detailsPromise = emittedNTimes(ipcMain, 'preload-ran', 2);
|
||||
w.loadFile(path.resolve(__dirname, `fixtures/sub-frames/frame-container${fixtureSuffix}.html`));
|
||||
const [event1, event2] = await detailsPromise;
|
||||
expect(event1[0].frameId).to.not.equal(event2[0].frameId);
|
||||
expect(event1[0].frameId).to.equal(event1[2]);
|
||||
expect(event2[0].frameId).to.equal(event2[2]);
|
||||
});
|
||||
|
||||
it('should load preload scripts in nested iframes', async () => {
|
||||
const detailsPromise = emittedNTimes(ipcMain, 'preload-ran', 3)
|
||||
w.loadFile(path.resolve(__dirname, `fixtures/sub-frames/frame-with-frame-container${fixtureSuffix}.html`))
|
||||
const [event1, event2, event3] = await detailsPromise
|
||||
expect(event1[0].frameId).to.not.equal(event2[0].frameId)
|
||||
expect(event1[0].frameId).to.not.equal(event3[0].frameId)
|
||||
expect(event2[0].frameId).to.not.equal(event3[0].frameId)
|
||||
expect(event1[0].frameId).to.equal(event1[2])
|
||||
expect(event2[0].frameId).to.equal(event2[2])
|
||||
expect(event3[0].frameId).to.equal(event3[2])
|
||||
})
|
||||
const detailsPromise = emittedNTimes(ipcMain, 'preload-ran', 3);
|
||||
w.loadFile(path.resolve(__dirname, `fixtures/sub-frames/frame-with-frame-container${fixtureSuffix}.html`));
|
||||
const [event1, event2, event3] = await detailsPromise;
|
||||
expect(event1[0].frameId).to.not.equal(event2[0].frameId);
|
||||
expect(event1[0].frameId).to.not.equal(event3[0].frameId);
|
||||
expect(event2[0].frameId).to.not.equal(event3[0].frameId);
|
||||
expect(event1[0].frameId).to.equal(event1[2]);
|
||||
expect(event2[0].frameId).to.equal(event2[2]);
|
||||
expect(event3[0].frameId).to.equal(event3[2]);
|
||||
});
|
||||
|
||||
it('should correctly reply to the main frame with using event.reply', async () => {
|
||||
const detailsPromise = emittedNTimes(ipcMain, 'preload-ran', 2)
|
||||
w.loadFile(path.resolve(__dirname, `fixtures/sub-frames/frame-container${fixtureSuffix}.html`))
|
||||
const [event1] = await detailsPromise
|
||||
const pongPromise = emittedOnce(ipcMain, 'preload-pong')
|
||||
event1[0].reply('preload-ping')
|
||||
const details = await pongPromise
|
||||
expect(details[1]).to.equal(event1[0].frameId)
|
||||
})
|
||||
const detailsPromise = emittedNTimes(ipcMain, 'preload-ran', 2);
|
||||
w.loadFile(path.resolve(__dirname, `fixtures/sub-frames/frame-container${fixtureSuffix}.html`));
|
||||
const [event1] = await detailsPromise;
|
||||
const pongPromise = emittedOnce(ipcMain, 'preload-pong');
|
||||
event1[0].reply('preload-ping');
|
||||
const details = await pongPromise;
|
||||
expect(details[1]).to.equal(event1[0].frameId);
|
||||
});
|
||||
|
||||
it('should correctly reply to the sub-frames with using event.reply', async () => {
|
||||
const detailsPromise = emittedNTimes(ipcMain, 'preload-ran', 2)
|
||||
w.loadFile(path.resolve(__dirname, `fixtures/sub-frames/frame-container${fixtureSuffix}.html`))
|
||||
const [, event2] = await detailsPromise
|
||||
const pongPromise = emittedOnce(ipcMain, 'preload-pong')
|
||||
event2[0].reply('preload-ping')
|
||||
const details = await pongPromise
|
||||
expect(details[1]).to.equal(event2[0].frameId)
|
||||
})
|
||||
const detailsPromise = emittedNTimes(ipcMain, 'preload-ran', 2);
|
||||
w.loadFile(path.resolve(__dirname, `fixtures/sub-frames/frame-container${fixtureSuffix}.html`));
|
||||
const [, event2] = await detailsPromise;
|
||||
const pongPromise = emittedOnce(ipcMain, 'preload-pong');
|
||||
event2[0].reply('preload-ping');
|
||||
const details = await pongPromise;
|
||||
expect(details[1]).to.equal(event2[0].frameId);
|
||||
});
|
||||
|
||||
it('should correctly reply to the nested sub-frames with using event.reply', async () => {
|
||||
const detailsPromise = emittedNTimes(ipcMain, 'preload-ran', 3)
|
||||
w.loadFile(path.resolve(__dirname, `fixtures/sub-frames/frame-with-frame-container${fixtureSuffix}.html`))
|
||||
const [, , event3] = await detailsPromise
|
||||
const pongPromise = emittedOnce(ipcMain, 'preload-pong')
|
||||
event3[0].reply('preload-ping')
|
||||
const details = await pongPromise
|
||||
expect(details[1]).to.equal(event3[0].frameId)
|
||||
})
|
||||
const detailsPromise = emittedNTimes(ipcMain, 'preload-ran', 3);
|
||||
w.loadFile(path.resolve(__dirname, `fixtures/sub-frames/frame-with-frame-container${fixtureSuffix}.html`));
|
||||
const [, , event3] = await detailsPromise;
|
||||
const pongPromise = emittedOnce(ipcMain, 'preload-pong');
|
||||
event3[0].reply('preload-ping');
|
||||
const details = await pongPromise;
|
||||
expect(details[1]).to.equal(event3[0].frameId);
|
||||
});
|
||||
|
||||
it('should not expose globals in main world', async () => {
|
||||
const detailsPromise = emittedNTimes(ipcMain, 'preload-ran', 2)
|
||||
w.loadFile(path.resolve(__dirname, `fixtures/sub-frames/frame-container${fixtureSuffix}.html`))
|
||||
const details = await detailsPromise
|
||||
const senders = details.map(event => event[0].sender)
|
||||
const isolatedGlobals = await Promise.all(senders.map(sender => sender.webContents.executeJavaScript('window.isolatedGlobal')))
|
||||
const detailsPromise = emittedNTimes(ipcMain, 'preload-ran', 2);
|
||||
w.loadFile(path.resolve(__dirname, `fixtures/sub-frames/frame-container${fixtureSuffix}.html`));
|
||||
const details = await detailsPromise;
|
||||
const senders = details.map(event => event[0].sender);
|
||||
const isolatedGlobals = await Promise.all(senders.map(sender => sender.webContents.executeJavaScript('window.isolatedGlobal')));
|
||||
for (const result of isolatedGlobals) {
|
||||
if (webPreferences.contextIsolation) {
|
||||
expect(result).to.be.undefined()
|
||||
expect(result).to.be.undefined();
|
||||
} else {
|
||||
expect(result).to.equal(true)
|
||||
expect(result).to.equal(true);
|
||||
}
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
const generateConfigs = (webPreferences: any, ...permutations: {name: string, webPreferences: any}[]) => {
|
||||
const configs = [{ webPreferences, names: [] as string[] }]
|
||||
const configs = [{ webPreferences, names: [] as string[] }];
|
||||
for (let i = 0; i < permutations.length; i++) {
|
||||
const length = configs.length
|
||||
const length = configs.length;
|
||||
for (let j = 0; j < length; j++) {
|
||||
const newConfig = Object.assign({}, configs[j])
|
||||
const newConfig = Object.assign({}, configs[j]);
|
||||
newConfig.webPreferences = Object.assign({},
|
||||
newConfig.webPreferences, permutations[i].webPreferences)
|
||||
newConfig.names = newConfig.names.slice(0)
|
||||
newConfig.names.push(permutations[i].name)
|
||||
configs.push(newConfig)
|
||||
newConfig.webPreferences, permutations[i].webPreferences);
|
||||
newConfig.names = newConfig.names.slice(0);
|
||||
newConfig.names.push(permutations[i].name);
|
||||
configs.push(newConfig);
|
||||
}
|
||||
}
|
||||
|
||||
return configs.map((config: any) => {
|
||||
if (config.names.length > 0) {
|
||||
config.title = `with ${config.names.join(', ')} on`
|
||||
config.title = `with ${config.names.join(', ')} on`;
|
||||
} else {
|
||||
config.title = 'without anything special turned on'
|
||||
config.title = 'without anything special turned on';
|
||||
}
|
||||
delete config.names
|
||||
delete config.names;
|
||||
|
||||
return config as {title: string, webPreferences: any}
|
||||
})
|
||||
}
|
||||
return config as {title: string, webPreferences: any};
|
||||
});
|
||||
};
|
||||
|
||||
generateConfigs(
|
||||
{
|
||||
|
|
@ -140,14 +140,14 @@ describe('renderer nodeIntegrationInSubFrames', () => {
|
|||
webPreferences: { webviewTag: true, preload: false }
|
||||
}
|
||||
).forEach(config => {
|
||||
generateTests(config.title, config.webPreferences)
|
||||
})
|
||||
generateTests(config.title, config.webPreferences);
|
||||
});
|
||||
|
||||
describe('internal <iframe> inside of <webview>', () => {
|
||||
let w: BrowserWindow
|
||||
let w: BrowserWindow;
|
||||
|
||||
beforeEach(async () => {
|
||||
await closeWindow(w)
|
||||
await closeWindow(w);
|
||||
w = new BrowserWindow({
|
||||
show: false,
|
||||
width: 400,
|
||||
|
|
@ -157,53 +157,53 @@ describe('renderer nodeIntegrationInSubFrames', () => {
|
|||
nodeIntegrationInSubFrames: true,
|
||||
webviewTag: true
|
||||
}
|
||||
})
|
||||
})
|
||||
});
|
||||
});
|
||||
|
||||
afterEach(async () => {
|
||||
await closeWindow(w)
|
||||
w = null as unknown as BrowserWindow
|
||||
})
|
||||
await closeWindow(w);
|
||||
w = null as unknown as BrowserWindow;
|
||||
});
|
||||
|
||||
it('should not load preload scripts', async () => {
|
||||
const promisePass = emittedOnce(ipcMain, 'webview-loaded')
|
||||
const promisePass = emittedOnce(ipcMain, 'webview-loaded');
|
||||
const promiseFail = emittedOnce(ipcMain, 'preload-in-frame').then(() => {
|
||||
throw new Error('preload loaded in internal frame')
|
||||
})
|
||||
await w.loadURL('about:blank')
|
||||
return Promise.race([promisePass, promiseFail])
|
||||
})
|
||||
})
|
||||
})
|
||||
throw new Error('preload loaded in internal frame');
|
||||
});
|
||||
await w.loadURL('about:blank');
|
||||
return Promise.race([promisePass, promiseFail]);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
// app.getAppMetrics() does not return sandbox information on Linux.
|
||||
ifdescribe(process.platform !== 'linux')('cross-site frame sandboxing', () => {
|
||||
let server: http.Server
|
||||
let crossSiteUrl: string
|
||||
let serverUrl: string
|
||||
let server: http.Server;
|
||||
let crossSiteUrl: string;
|
||||
let serverUrl: string;
|
||||
|
||||
before(function (done) {
|
||||
server = http.createServer((req, res) => {
|
||||
res.end(`<iframe name="frame" src="${crossSiteUrl}" />`)
|
||||
})
|
||||
res.end(`<iframe name="frame" src="${crossSiteUrl}" />`);
|
||||
});
|
||||
server.listen(0, '127.0.0.1', () => {
|
||||
serverUrl = `http://127.0.0.1:${(server.address() as AddressInfo).port}/`
|
||||
crossSiteUrl = `http://localhost:${(server.address() as AddressInfo).port}/`
|
||||
done()
|
||||
})
|
||||
})
|
||||
serverUrl = `http://127.0.0.1:${(server.address() as AddressInfo).port}/`;
|
||||
crossSiteUrl = `http://localhost:${(server.address() as AddressInfo).port}/`;
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
after(() => {
|
||||
server.close()
|
||||
server = null as unknown as http.Server
|
||||
})
|
||||
server.close();
|
||||
server = null as unknown as http.Server;
|
||||
});
|
||||
|
||||
let w: BrowserWindow
|
||||
let w: BrowserWindow;
|
||||
|
||||
afterEach(async () => {
|
||||
await closeWindow(w)
|
||||
w = null as unknown as BrowserWindow
|
||||
})
|
||||
await closeWindow(w);
|
||||
w = null as unknown as BrowserWindow;
|
||||
});
|
||||
|
||||
const generateSpecs = (description: string, webPreferences: any) => {
|
||||
describe(description, () => {
|
||||
|
|
@ -211,45 +211,45 @@ ifdescribe(process.platform !== 'linux')('cross-site frame sandboxing', () => {
|
|||
w = new BrowserWindow({
|
||||
show: false,
|
||||
webPreferences
|
||||
})
|
||||
});
|
||||
|
||||
await w.loadURL(serverUrl)
|
||||
await w.loadURL(serverUrl);
|
||||
|
||||
const pidMain = w.webContents.getOSProcessId()
|
||||
const pidFrame = (w.webContents as any)._getOSProcessIdForFrame('frame', crossSiteUrl)
|
||||
const pidMain = w.webContents.getOSProcessId();
|
||||
const pidFrame = (w.webContents as any)._getOSProcessIdForFrame('frame', crossSiteUrl);
|
||||
|
||||
const metrics = app.getAppMetrics()
|
||||
const metrics = app.getAppMetrics();
|
||||
const isProcessSandboxed = function (pid: number) {
|
||||
const entry = metrics.filter(metric => metric.pid === pid)[0]
|
||||
return entry && entry.sandboxed
|
||||
}
|
||||
const entry = metrics.filter(metric => metric.pid === pid)[0];
|
||||
return entry && entry.sandboxed;
|
||||
};
|
||||
|
||||
const sandboxMain = !!(webPreferences.sandbox || process.mas)
|
||||
const sandboxFrame = sandboxMain || !webPreferences.nodeIntegrationInSubFrames
|
||||
const sandboxMain = !!(webPreferences.sandbox || process.mas);
|
||||
const sandboxFrame = sandboxMain || !webPreferences.nodeIntegrationInSubFrames;
|
||||
|
||||
expect(isProcessSandboxed(pidMain)).to.equal(sandboxMain)
|
||||
expect(isProcessSandboxed(pidFrame)).to.equal(sandboxFrame)
|
||||
})
|
||||
})
|
||||
}
|
||||
expect(isProcessSandboxed(pidMain)).to.equal(sandboxMain);
|
||||
expect(isProcessSandboxed(pidFrame)).to.equal(sandboxFrame);
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
generateSpecs('nodeIntegrationInSubFrames = false, sandbox = false', {
|
||||
nodeIntegrationInSubFrames: false,
|
||||
sandbox: false
|
||||
})
|
||||
});
|
||||
|
||||
generateSpecs('nodeIntegrationInSubFrames = false, sandbox = true', {
|
||||
nodeIntegrationInSubFrames: false,
|
||||
sandbox: true
|
||||
})
|
||||
});
|
||||
|
||||
generateSpecs('nodeIntegrationInSubFrames = true, sandbox = false', {
|
||||
nodeIntegrationInSubFrames: true,
|
||||
sandbox: false
|
||||
})
|
||||
});
|
||||
|
||||
generateSpecs('nodeIntegrationInSubFrames = true, sandbox = true', {
|
||||
nodeIntegrationInSubFrames: true,
|
||||
sandbox: true
|
||||
})
|
||||
})
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue