Skip to content

Commit 2c7d7e1

Browse files
committed
fix(decompress): limit decompressed response size
Bound each decompression stage with a configurable maxSize (default 64 MiB) and reject oversized decoded responses with ResponseExceededMaxSizeError, preventing single-layer and chained compression bombs from unbounded output allocation. Updates stream error cleanup, type declarations, and docs. Fixes: GHSA-3xpg-4rpp-hhhm CVE: CVE-2026-84890 Signed-off-by: Matteo Collina <[email protected]> (cherry picked from commit fc33d62a28c2aaa9ba59d31ee820ccfbc1a818b7)
1 parent b6c5a00 commit 2c7d7e1

4 files changed

Lines changed: 358 additions & 16 deletions

File tree

‎lib/interceptor/decompress.js‎

Lines changed: 146 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
'use strict'
22

33
const { createInflate, createGunzip, createBrotliDecompress, createZstdDecompress } = require('node:zlib')
4-
const { pipeline } = require('node:stream')
4+
const { pipeline, Transform: TransformStream } = require('node:stream')
5+
const { InvalidArgumentError, ResponseExceededMaxSizeError } = require('../core/errors')
56
const DecoratorHandler = require('../handler/decorator-handler')
67
const { runtimeFeatures } = require('../util/runtime-features')
78

@@ -21,27 +22,68 @@ const supportedEncodings = {
2122
}
2223

2324
const defaultSkipStatusCodes = /** @type {const} */ ([204, 304])
25+
const defaultMaxSize = 64 * 1024 * 1024
26+
27+
/**
28+
* Limits the output of one stage in a decompression chain.
29+
* @param {number} maxSize - Maximum output size in bytes
30+
* @returns {Transform}
31+
*/
32+
function createMaxSizeLimiter (maxSize) {
33+
let size = 0
34+
35+
return new TransformStream({
36+
transform (chunk, _encoding, callback) {
37+
const decompressedSize = size + chunk.length
38+
if (decompressedSize > maxSize) {
39+
callback(new ResponseExceededMaxSizeError(
40+
`Decompressed response size (${decompressedSize}) exceeded maxSize (${maxSize})`
41+
))
42+
return
43+
}
44+
45+
size = decompressedSize
46+
callback(null, chunk)
47+
}
48+
})
49+
}
2450

2551
let warningEmitted = /** @type {boolean} */ (false)
2652

2753
/**
2854
* @typedef {Object} DecompressHandlerOptions
2955
* @property {number[]|Readonly<number[]>} [skipStatusCodes=[204, 304]] - List of status codes to skip decompression for
3056
* @property {boolean} [skipErrorResponses] - Whether to skip decompression for error responses (status codes >= 400)
57+
* @property {number} [maxSize=67108864] - Maximum decompressed response size in bytes
3158
*/
3259

3360
class DecompressHandler extends DecoratorHandler {
3461
/** @type {Transform[]} */
3562
#decompressors = []
63+
/** @type {Record<string, string | string[]> | undefined} */
64+
#trailers
3665
/** @type {Readonly<number[]>} */
3766
#skipStatusCodes
3867
/** @type {boolean} */
3968
#skipErrorResponses
69+
/** @type {number} */
70+
#maxSize
71+
/** @type {number} */
72+
#decompressedSize = 0
73+
/** @type {boolean} */
74+
#terminated = false
75+
/** @type {boolean} */
76+
#inputEnded = false
77+
78+
constructor (handler, { skipStatusCodes = defaultSkipStatusCodes, skipErrorResponses = true, maxSize = defaultMaxSize } = {}) {
79+
if (!Number.isSafeInteger(maxSize) || maxSize < 1) {
80+
throw new InvalidArgumentError('maxSize must be a positive integer')
81+
}
4082

41-
constructor (handler, { skipStatusCodes = defaultSkipStatusCodes, skipErrorResponses = true } = {}) {
4283
super(handler)
4384
this.#skipStatusCodes = skipStatusCodes
4485
this.#skipErrorResponses = skipErrorResponses
86+
this.#maxSize = maxSize
4587
}
4688

4789
/**
@@ -61,7 +103,7 @@ class DecompressHandler extends DecoratorHandler {
61103
* Creates a chain of decompressors for multiple content encodings
62104
*
63105
* @param {string} encodings - Comma-separated list of content encodings
64-
* @returns {Array<DecompressorStream>} - Array of decompressor streams
106+
* @returns {Array<Transform>} - Array of decompressor and limiting streams
65107
* @throws {Error} - If the number of content-encodings exceeds the maximum allowed
66108
*/
67109
#createDecompressionChain (encodings) {
@@ -89,7 +131,40 @@ class DecompressHandler extends DecoratorHandler {
89131
decompressors.push(supportedEncodings[encoding]())
90132
}
91133

92-
return decompressors
134+
if (decompressors.length < 2) {
135+
return decompressors
136+
}
137+
138+
/** @type {Transform[]} */
139+
const streams = []
140+
for (let i = 0; i < decompressors.length; i++) {
141+
streams.push(decompressors[i])
142+
if (i < decompressors.length - 1) {
143+
streams.push(createMaxSizeLimiter(this.#maxSize))
144+
}
145+
}
146+
147+
return streams
148+
}
149+
150+
/**
151+
* Stops decompression and reports an error.
152+
* @param {Controller} controller - The controller to coordinate with
153+
* @param {Error} error - The decompression error
154+
* @returns {void}
155+
*/
156+
#fail (controller, error) {
157+
if (this.#terminated) {
158+
return
159+
}
160+
161+
if (this.#inputEnded) {
162+
// The request is already marked complete once the compressed input ends,
163+
// so controller.abort() can no longer propagate decoder flush errors.
164+
this.onResponseError(controller, error)
165+
} else {
166+
controller.abort(error)
167+
}
93168
}
94169

95170
/**
@@ -100,8 +175,21 @@ class DecompressHandler extends DecoratorHandler {
100175
*/
101176
#setupDecompressorEvents (decompressor, controller) {
102177
decompressor.on('readable', () => {
178+
if (this.#terminated) {
179+
return
180+
}
181+
103182
let chunk
104183
while ((chunk = decompressor.read()) !== null) {
184+
const decompressedSize = this.#decompressedSize + chunk.length
185+
if (decompressedSize > this.#maxSize) {
186+
this.#fail(controller, new ResponseExceededMaxSizeError(
187+
`Decompressed response size (${decompressedSize}) exceeded maxSize (${this.#maxSize})`
188+
))
189+
return
190+
}
191+
192+
this.#decompressedSize = decompressedSize
105193
const result = super.onResponseData(controller, chunk)
106194
if (result === false) {
107195
break
@@ -110,7 +198,7 @@ class DecompressHandler extends DecoratorHandler {
110198
})
111199

112200
decompressor.on('error', (error) => {
113-
super.onResponseError(controller, error)
201+
this.#fail(controller, error)
114202
})
115203
}
116204

@@ -124,7 +212,13 @@ class DecompressHandler extends DecoratorHandler {
124212
this.#setupDecompressorEvents(decompressor, controller)
125213

126214
decompressor.on('end', () => {
127-
super.onResponseEnd(controller, {})
215+
if (this.#terminated) {
216+
return
217+
}
218+
219+
this.#terminated = true
220+
this.#cleanupDecompressors()
221+
super.onResponseEnd(controller, this.#trailers)
128222
})
129223
}
130224

@@ -138,11 +232,18 @@ class DecompressHandler extends DecoratorHandler {
138232
this.#setupDecompressorEvents(lastDecompressor, controller)
139233

140234
pipeline(this.#decompressors, (err) => {
235+
if (this.#terminated) {
236+
return
237+
}
238+
141239
if (err) {
142-
super.onResponseError(controller, err)
240+
this.#fail(controller, err)
143241
return
144242
}
145-
super.onResponseEnd(controller, {})
243+
244+
this.#terminated = true
245+
this.#cleanupDecompressors()
246+
super.onResponseEnd(controller, this.#trailers)
146247
})
147248
}
148249

@@ -181,6 +282,33 @@ class DecompressHandler extends DecoratorHandler {
181282
// Remove compression headers since we're decompressing
182283
const { 'content-encoding': _, 'content-length': __, ...newHeaders } = headers
183284

285+
if (controller?.rawHeaders) {
286+
const rawHeaders = controller.rawHeaders
287+
288+
if (Array.isArray(rawHeaders)) {
289+
const filteredHeaders = []
290+
for (let i = 0; i < rawHeaders.length; i += 2) {
291+
const headerName = rawHeaders[i]
292+
const name = Buffer.isBuffer(headerName) ? headerName.toString('latin1') : `${headerName}`
293+
const lowerName = name.toLowerCase()
294+
295+
if (lowerName === 'content-encoding' || lowerName === 'content-length') {
296+
continue
297+
}
298+
299+
filteredHeaders.push(rawHeaders[i], rawHeaders[i + 1])
300+
}
301+
rawHeaders.splice(0, rawHeaders.length, ...filteredHeaders)
302+
} else if (typeof rawHeaders === 'object') {
303+
for (const name of Object.keys(rawHeaders)) {
304+
const lowerName = name.toLowerCase()
305+
if (lowerName === 'content-encoding' || lowerName === 'content-length') {
306+
delete rawHeaders[name]
307+
}
308+
}
309+
}
310+
}
311+
184312
if (this.#decompressors.length === 1) {
185313
this.#setupSingleDecompressor(controller)
186314
} else {
@@ -210,8 +338,9 @@ class DecompressHandler extends DecoratorHandler {
210338
*/
211339
onResponseEnd (controller, trailers) {
212340
if (this.#decompressors.length > 0) {
341+
this.#inputEnded = true
342+
this.#trailers = trailers
213343
this.#decompressors[0].end()
214-
this.#cleanupDecompressors()
215344
return
216345
}
217346
super.onResponseEnd(controller, trailers)
@@ -223,12 +352,15 @@ class DecompressHandler extends DecoratorHandler {
223352
* @returns {void}
224353
*/
225354
onResponseError (controller, err) {
226-
if (this.#decompressors.length > 0) {
227-
for (const decompressor of this.#decompressors) {
228-
decompressor.destroy(err)
229-
}
230-
this.#cleanupDecompressors()
355+
if (this.#terminated) {
356+
return
357+
}
358+
359+
this.#terminated = true
360+
for (const decompressor of this.#decompressors) {
361+
decompressor.destroy()
231362
}
363+
this.#cleanupDecompressors()
232364
super.onResponseError(controller, err)
233365
}
234366
}

0 commit comments

Comments
 (0)