fix: allow reading body from non-2xx responses in net.request (#21055) (#21285)

* fix(urlrequest): allow non-2xx repsponse results

- closes #21046

* test(net): add test cases to verify non-2xx body

* test(session): update spec to match clientrequest behavior

* test(net): update test cases to match clientrequest behavior

* spec: clean up async net spec
This commit is contained in:
Samuel Attard
2019-11-26 13:10:07 -08:00
committed by GitHub
parent 9d1ec6b0eb
commit 64dc86c8c2
3 changed files with 58 additions and 2 deletions

View File

@@ -288,6 +288,7 @@ bool URLRequestNS::Write(v8::Local<v8::Value> data, bool is_last) {
network::ResourceRequest* request_ref = request_.get();
loader_ = network::SimpleURLLoader::Create(std::move(request_),
kTrafficAnnotation);
loader_->SetAllowHttpErrorResults(true);
loader_->SetOnResponseStartedCallback(base::Bind(
&URLRequestNS::OnResponseStarted, weak_factory_.GetWeakPtr()));
loader_->SetOnRedirectCallback(

View File

@@ -3,6 +3,7 @@ import { net as originalNet, session, ClientRequest, BrowserWindow } from 'elect
import * as http from 'http'
import * as url from 'url'
import { AddressInfo } from 'net'
import { emittedOnce } from './events-helpers'
const outstandingRequests: ClientRequest[] = []
const net: {request: (typeof originalNet)['request']} = {
@@ -771,6 +772,53 @@ describe('net module', () => {
})
})
it('should allow to read response body from non-2xx response', async () => {
const bodyData = randomString(kOneKiloByte)
const serverUrl = await respondOnce.toSingleURL((request, response) => {
response.statusCode = 404
response.end(bodyData)
})
let requestResponseEventEmitted = false
let responseDataEventEmitted = false
const urlRequest = net.request(serverUrl)
const eventHandlers = Promise.all([
emittedOnce(urlRequest, 'response')
.then(async (params: any[]) => {
const response: Electron.IncomingMessage = params[0]
requestResponseEventEmitted = true
const statusCode = response.statusCode
expect(statusCode).to.equal(404)
const buffers: Buffer[] = []
response.on('data', (chunk) => {
buffers.push(chunk)
responseDataEventEmitted = true
})
await new Promise((resolve, reject) => {
response.on('error', () => {
reject(new Error('error emitted'))
})
emittedOnce(response, 'end')
.then(() => {
const receivedBodyData = Buffer.concat(buffers)
expect(receivedBodyData.toString()).to.equal(bodyData)
})
.then(resolve)
.catch(reject)
})
}),
emittedOnce(urlRequest, 'close')
])
urlRequest.end()
await eventHandlers
expect(requestResponseEventEmitted).to.equal(true)
expect(responseDataEventEmitted).to.equal(true)
})
describe('webRequest', () => {
afterEach(() => {
session.defaultSession.webRequest.onBeforeRequest(null)

View File

@@ -511,12 +511,19 @@ describe('session module', () => {
const fetch = (url: string) => new Promise((resolve, reject) => {
const request = net.request({ url, session: ses })
request.on('response', (response) => {
let data = ''
let data: string | null = null
response.on('data', (chunk) => {
if (!data) {
data = ''
}
data += chunk
})
response.on('end', () => {
resolve(data)
if (!data) {
reject(new Error('Empty response'))
} else {
resolve(data)
}
})
response.on('error', (error: any) => { reject(new Error(error)) })
})