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

fix: make webRequest work for CORS preflight requests (#22407)

Browse source 
* fix: support CORS preflight

* test: webRequest should work for CORS requests
This commit is contained in:
Cheng Zhao 2020-03-02 10:23:43 +09:00 • committed by GitHub
parent ced487467c
commit 4c6150ea3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 132 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

28
spec-main/api-web-request-spec.ts
View file

@ -3,7 +3,7 @@ import * as http from 'http'
import * as qs from 'querystring'
import * as path from 'path'
import * as WebSocket from 'ws'
import { ipcMain, session, WebContents, webContents } from 'electron'
import { ipcMain, protocol, session, WebContents, webContents } from 'electron'
import { AddressInfo } from 'net'
import { emittedOnce } from './events-helpers'
@ -31,6 +31,7 @@ describe('webRequest module', () => {
let defaultURL: string
before((done) => {
protocol.registerStringProtocol('neworigin', (req, cb) => cb(''))
server.listen(0, '127.0.0.1', () => {
const port = (server.address() as AddressInfo).port
defaultURL = `http://127.0.0.1:${port}/`
@ -40,6 +41,7 @@ describe('webRequest module', () => {
after(() => {
server.close()
protocol.unregisterProtocol('neworigin')
})
let contents: WebContents = null as unknown as WebContents
@ -158,7 +160,7 @@ describe('webRequest module', () => {
expect(data).to.equal('/header/received')
})
it('can change CORS headers', async () => {
it('can change request origin', async () => {
ses.webRequest.onBeforeSendHeaders((details, callback) => {
const requestHeaders = details.requestHeaders
requestHeaders.Origin = 'http://new-origin'
@ -168,6 +170,16 @@ describe('webRequest module', () => {
expect(data).to.equal('/new/origin')
})
it('can capture CORS requests', async () => {
let called = false
ses.webRequest.onBeforeSendHeaders((details, callback) => {
called = true
callback({ requestHeaders: details.requestHeaders })
})
await ajax('neworigin://host')
expect(called).to.be.true()
})
it('resets the whole headers', async () => {
const requestHeaders = {
Test: 'header'
@ -222,7 +234,7 @@ describe('webRequest module', () => {
expect(headers).to.match(/^custom: Changed$/m)
})
it('can change CORS headers', async () => {
it('can change response origin', async () => {
ses.webRequest.onHeadersReceived((details, callback) => {
const responseHeaders = details.responseHeaders!
responseHeaders['access-control-allow-origin'] = ['http://new-origin'] as any
@ -232,6 +244,16 @@ describe('webRequest module', () => {
expect(headers).to.match(/^access-control-allow-origin: http:\/\/new-origin$/m)
})
it('can change headers of CORS responses', async () => {
ses.webRequest.onHeadersReceived((details, callback) => {
const responseHeaders = details.responseHeaders!
responseHeaders['Custom'] = ['Changed'] as any
callback({ responseHeaders: responseHeaders })
})
const { headers } = await ajax('neworigin://host')
expect(headers).to.match(/^custom: Changed$/m)
})
it('does not change header by default', async () => {
ses.webRequest.onHeadersReceived((details, callback) => {
callback({})