fix(web): fix empty trailer parsing causing infinite parser loop #1883
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
|
I want to add a test for this fix, however I got stuck trying to actually create trailers for a unary request with tonic? It seems to me that trailers are not actually supported by the server, and so therefore it becomes pretty difficult to test this functionality. I tried also with a streaming call to see if I could work around it that way, but no joy there either. |
djc
approved these changes
Aug 22, 2024
tonic-web/src/call.rs
Outdated
| @@ -305,7 +305,11 @@ where | |||
| } | |||
| FindTrailers::IncompleteBuf => continue, | |||
| FindTrailers::Done(len) => { | |||
| Poll::Ready(Some(Ok(Frame::data(buf.split_to(len).freeze())))) | |||
| if len > 0 { | |||
There was a problem hiding this comment.
Nit: please spell it like this:
Poll::Ready(match len {
0 => None,
_ => Some(Ok(Frame::data(buf.split_to(len).freeze()))),
})There was a problem hiding this comment.
cargo fmt ended up inlining this expression with FindTrailers::Done(len) =>, which is neat enough I think
zakhenry
force-pushed
the
fix/trailer-parsing-infinite-loop
branch
2 times, most recently
from
5aafae7 to
315c9c2
Compare
zakhenry
force-pushed
the
fix/trailer-parsing-infinite-loop
branch
from
315c9c2 to
26a939b
Compare
|
Not sure what these CI failures are - the code does work as I'm using my fork as a git dep |
|
I rerun the CI and it seems successful. |
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.
Motivation
Attempting to parse a grpc response from an envoy proxy that inserts trailers causes an infinite loop
Solution
Digging in to the code I found that there was an attempt to read more data after parsing trailers but the buffer was empty, ending up in the same place again. Guarding this fixes the issue and I can successfully fetch a message.
Note this fix needs to be combined with #1880 to get a valid grpc response back (otherwise it panics earlier).