HTTP2 loopback server WaitForCancellationAsync should validate error code sent #59313
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
ghost
added
the
community-contribution
|
Tagging subscribers to this area: @dotnet/ncl Issue DetailsIssue #58235
|
danmoseley
reviewed
Sep 19, 2021
| @@ -973,7 +973,7 @@ public override async Task WaitForCancellationAsync(bool ignoreIncomingData = tr | |||
| { | |||
| Assert.Equal(FrameType.RstStream, frame.Type); | |||
| } | |||
| } while (frame.Type != FrameType.RstStream); | |||
| } while (frame.Type != FrameType.RstStream || (frame is RstStreamFrame rstStreamFrame && rstStreamFrame.ErrorCode != 0x8)); | |||
There was a problem hiding this comment.
Suggested change
| } while (frame.Type != FrameType.RstStream || (frame is RstStreamFrame rstStreamFrame && rstStreamFrame.ErrorCode != 0x8)); | |
| } while (frame.Type != FrameType.RstStream || (frame is RstStreamFrame rstStreamFrame && rstStreamFrame.ErrorCode != ProtocolErrors.CANCEL)); |
I think
There was a problem hiding this comment.
ErrorCode property is an int, so I casted the enum
karelz
approved these changes
Sep 30, 2021
geoffkizer
suggested changes
Sep 30, 2021
| @@ -973,7 +973,7 @@ public override async Task WaitForCancellationAsync(bool ignoreIncomingData = tr | |||
| { | |||
| Assert.Equal(FrameType.RstStream, frame.Type); | |||
| } | |||
| } while (frame.Type != FrameType.RstStream); | |||
| } while (frame.Type != FrameType.RstStream || (frame is RstStreamFrame rstStreamFrame && rstStreamFrame.ErrorCode != (int)ProtocolErrors.CANCEL)); | |||
There was a problem hiding this comment.
We should not receive any RstStream frame other than one containing the CANCEL.
As written, this will just ignore a RstStream that doesn't contain CANCEL.
There was a problem hiding this comment.
So we should rather just assert that the error code is CANCEL, is that what you mean @geoffkizer?
karelz
approved these changes
Sep 30, 2021
geoffkizer
approved these changes
Oct 11, 2021
This was referenced Oct 25, 2021
|
Unrelated test failures:
|
|
Thanks for your PR @pedrobsaila! |
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 #58235