Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: dont crash on invalid brotli payload #3620

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 33 additions & 15 deletions lib/web/fetch/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,6 @@ const { webidl } = require('./webidl')
const { STATUS_CODES } = require('node:http')
const GET_OR_HEAD = ['GET', 'HEAD']

const noop = () => {}

const defaultUserAgent = typeof __UNDICI_IS_NODE__ !== 'undefined' || typeof esbuildDetection !== 'undefined'
? 'node'
: 'undici'
Expand Down Expand Up @@ -2060,7 +2058,7 @@ async function httpNetworkFetch (

function dispatch ({ body }) {
const url = requestCurrentURL(request)
/** @type {import('../..').Agent} */
/** @type {import('../../..').Agent} */
const agent = fetchParams.controller.dispatcher

return new Promise((resolve, reject) => agent.dispatch(
Expand All @@ -2074,6 +2072,9 @@ async function httpNetworkFetch (
upgrade: request.mode === 'websocket' ? 'websocket' : undefined
},
{
/**
* @type {import('node:stream').Readable|null}
*/
body: null,
abort: null,

Expand Down Expand Up @@ -2114,35 +2115,37 @@ async function httpNetworkFetch (

/** @type {string[]} */
let codings = []
let location = ''

const headersList = new HeadersList()

for (let i = 0; i < rawHeaders.length; i += 2) {
headersList.append(bufferToLowerCasedHeaderName(rawHeaders[i]), rawHeaders[i + 1].toString('latin1'), true)
}

const contentEncoding = headersList.get('content-encoding', true)
if (contentEncoding) {
// https://www.rfc-editor.org/rfc/rfc7231#section-3.1.2.1
// "All content-coding values are case-insensitive..."
codings = contentEncoding.toLowerCase().split(',').map((x) => x.trim())
}
location = headersList.get('location', true)

this.body = new Readable({ read: resume })

const decoders = []
/** @type {[src: import('node:stream').Readable, ...target: import('node:stream').Writable[]]} */
let streams
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
let streams
const streams = []


const willFollow = location && request.redirect === 'follow' &&
redirectStatusSet.has(status)
const willFollow = request.redirect === 'follow' &&
redirectStatusSet.has(status) &&
headersList.get('location', true)

// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Encoding
if (codings.length !== 0 && request.method !== 'HEAD' && request.method !== 'CONNECT' && !nullBodyStatus.includes(status) && !willFollow) {
streams = [this.body]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
streams = [this.body]

for (let i = codings.length - 1; i >= 0; --i) {
const coding = codings[i]
// https://www.rfc-editor.org/rfc/rfc9112.html#section-7.2
if (coding === 'x-gzip' || coding === 'gzip') {
decoders.push(zlib.createGunzip({
streams.push(zlib.createGunzip({
// Be less strict when decoding compressed responses, since sometimes
// servers send slightly invalid responses that are still accepted
// by common browsers.
Expand All @@ -2151,23 +2154,38 @@ async function httpNetworkFetch (
finishFlush: zlib.constants.Z_SYNC_FLUSH
}))
} else if (coding === 'deflate') {
decoders.push(createInflate())
streams.push(createInflate({
flush: zlib.constants.Z_SYNC_FLUSH,
finishFlush: zlib.constants.Z_SYNC_FLUSH
}))
} else if (coding === 'br') {
decoders.push(zlib.createBrotliDecompress())
streams.push(zlib.createBrotliDecompress({
flush: zlib.constants.BROTLI_OPERATION_FLUSH,
finishFlush: zlib.constants.BROTLI_OPERATION_FLUSH
}))
} else {
decoders.length = 0
// If the server sends the payload with a coding which his not
// supported, the body will be passed through without decoding.
streams = undefined
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
streams = undefined
streams.length = 0

break
}
}
}

const onError = this.onError.bind(this)
const callback = (err) => {
if (err) {
onError(err)
}
}

resolve({
status,
statusText,
headersList,
body: decoders.length
? pipeline(this.body, ...decoders, noop)
: this.body.on('error', noop)
body: streams === undefined
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
body: streams === undefined
body: streams.length === 0

? this.body.on('error', onError)
: pipeline(streams, callback).on('error', onError)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
: pipeline(streams, callback).on('error', onError)
: pipeline(this.body, ...streams, callback).on('error', onError)

})

return true
Expand Down
20 changes: 16 additions & 4 deletions lib/web/fetch/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -1338,15 +1338,23 @@ function buildContentRange (rangeStart, rangeEnd, fullLength) {
// interpreted as a zlib stream, otherwise it's interpreted as a
// raw deflate stream.
class InflateStream extends Transform {
#zlibOptions

/** @param {zlib.ZlibOptions} [zlibOptions] */
constructor (zlibOptions) {
super()
this.#zlibOptions = zlibOptions
}

_transform (chunk, encoding, callback) {
if (!this._inflateStream) {
if (chunk.length === 0) {
callback()
return
}
this._inflateStream = (chunk[0] & 0x0F) === 0x08
? zlib.createInflate()
: zlib.createInflateRaw()
? zlib.createInflate(this.#zlibOptions)
: zlib.createInflateRaw(this.#zlibOptions)

this._inflateStream.on('data', this.push.bind(this))
this._inflateStream.on('end', () => this.push(null))
Expand All @@ -1365,8 +1373,12 @@ class InflateStream extends Transform {
}
}

function createInflate () {
return new InflateStream()
/**
* @param {zlib.ZlibOptions} [zlibOptions]
* @returns {InflateStream}
*/
function createInflate (zlibOptions) {
return new InflateStream(zlibOptions)
}

/**
Expand Down
48 changes: 48 additions & 0 deletions test/issue-3616.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
'use strict'

const { createServer } = require('node:http')
const { tspl } = require('@matteo.collina/tspl')
const { describe, test, after } = require('node:test')
const { fetch } = require('..')
const { once } = require('node:events')

describe('https://github.com/nodejs/undici/issues/3616', () => {
const cases = [
'x-gzip',
'gzip',
'deflate',
'br'
]

for (const encoding of cases) {
test(encoding, async t => {
t = tspl(t, { plan: 2 })
const server = createServer((req, res) => {
res.writeHead(200, {
'Content-Length': '0',
Connection: 'close',
'Content-Encoding': encoding
})
res.end()
})

after(() => {
server.close()
})

server.listen(0)

await once(server, 'listening')
const result = await fetch(`http://localhost:${server.address().port}/`)

t.ok(result.body.getReader())

process.on('uncaughtException', (reason) => {
t.fail('Uncaught Exception:', reason, encoding)
})

await new Promise(resolve => setTimeout(resolve, 100))
t.ok(true)
})
}
})
Loading