fix: dont crash on invalid brotli payload #3620
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
KhafraDev
requested changes
Sep 18, 2024
There was a problem hiding this comment.
an error listener should still be added onto pipeline(...)... this only fixes the one case
#3616 (comment)
|
@KhafraDev better? |
ronag
requested changes
Sep 19, 2024
lib/web/fetch/index.js
Outdated
Comment on lines
2181
to
2183
| body: streams === undefined | ||
| ? this.body.on('error', noop) | ||
| : pipeline(streams, noop).on('error', noop) |
There was a problem hiding this comment.
this is just hiding a bug somewhere else
|
@KhafraDev |
KhafraDev
reviewed
Sep 20, 2024
|
|
||
| this.body = new Readable({ read: resume }) | ||
|
|
||
| const decoders = [] | ||
| /** @type {[src: import('node:stream').Readable, ...target: import('node:stream').Writable[]]} */ | ||
| let streams |
There was a problem hiding this comment.
Suggested change
| let streams | |
| const streams = [] |
|
|
||
| // 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] |
There was a problem hiding this comment.
Suggested change
| streams = [this.body] |
| 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 |
There was a problem hiding this comment.
Suggested change
| streams = undefined | |
| streams.length = 0 |
| body: decoders.length | ||
| ? pipeline(this.body, ...decoders, noop) | ||
| : this.body.on('error', noop) | ||
| body: streams === undefined |
There was a problem hiding this comment.
Suggested change
| body: streams === undefined | |
| body: streams.length === 0 |
| : this.body.on('error', noop) | ||
| body: streams === undefined | ||
| ? this.body.on('error', onError) | ||
| : pipeline(streams, callback).on('error', onError) |
There was a problem hiding this comment.
Suggested change
| : pipeline(streams, callback).on('error', onError) | |
| : pipeline(this.body, ...streams, callback).on('error', onError) |
|
Tbh i dont like the suggested changes. So I retract this PR. No bad feelings ;). |
|
I will work on it tomorrow. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #3616 by setting the corresponding flags for brotli like we did for gzip in #2126
https://nodejs.org/api/zlib.html#compressing-http-requests-and-responses
But why does deflate not need those flags?