HTTPCLIENT-2433: Prevent concurrent HTTP/2 request body replay - #884
Merged
Merged
Conversation
Member
|
@mkurz The test coverage looks awesome! However I need a little while to digest the proposed fix. Please bear with me. |
ok2c
reviewed
Sep 18, 2026
Member
There was a problem hiding this comment.
@mkurz Your suggested fix is perfectly fine.
For the sake of code consistency could we use the same approach as used in HttpAsyncMainClientExec using AtomicInteger instead of two AtomicBoolean?
Wait for both sides of an HTTP/2 exchange to terminate before completing it, including graceful request termination after RST_STREAM(NO_ERROR). Cover authentication replay with a large file and with a body-less 401 followed by a graceful stream reset.
mkurz
force-pushed
the
HTTPCLIENT-2433
branch
from
September 18, 2026 12:38
17cf048 to
8483a2a
Compare
Contributor
Author
|
@ok2c done! |
Contributor
Author
Member
|
Cherry-picked to |
Member
|
@mkurz Many thanks for reporting the problem and contributing the fix |
Contributor
Author
|
@ok2c thanks for merging them ;) |
Contributor
Author
|
@ok2c do you have an eta when next core and client patch release will be cut? |
Member
|
@mkurz Soon. I will try to cut the core releases this weekend. The client bug I see as less severe as it affects H2 only client, so it may take a bit longer. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This fixes HTTPCLIENT-2433.
When an HTTP/2 authentication challenge completed before the request body had finished,
H2AsyncMainClientExecpreviously notified the execution chain that the exchange was complete immediately. The authentication handler could then release and reuse the same repeatable entity producer while the original HTTP/2 stream was still consuming it, corrupting the replayed request body.The HTTP/2 execution handler now completes the exchange only after both request output and response input have terminated. It also handles a graceful
RST_STREAM(NO_ERROR)after a complete response as request-side termination, allowing authentication replay to continue without hanging.Regression coverage includes:
401followed byRST_STREAM(NO_ERROR), verifying that the authenticated retry completes with the exact 2 MB request body.Reproducer:
https://github.com/mkurz/apache-httpclient5-h2-auth-replay-reproducer
Tests: