Fix oauth with streamable mcp servers#547
Merged
Merged
Conversation
This reverts commit 1c92feb.
req.Clone makes a shallow copy of the body so the first call would consume the body completely, making the next call after oauth flow an empty request, this would give us a 400 Bad Request. Keep the body so that we can re-inject it into the original request before re-sending with the token. Fixes docker#485 Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
krissetto
approved these changes
Oct 17, 2025
trungutt
approved these changes
Oct 17, 2025
findleyr
reviewed
Oct 22, 2025
| var bodyBytes []byte | ||
| if req.Body != nil && req.Body != http.NoBody { | ||
| var err error | ||
| bodyBytes, err = io.ReadAll(req.Body) |
There was a problem hiding this comment.
Hi, @jba referred me here as I'm fixing this in the MCP client implementation.
I think you need to close the body after reading it, as RoundTripper says that RoundTrip must always close the body.
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
4 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.
req.Clone makes a shallow copy of the body so the first call would
consume the body completely, making the next call after oauth flow an
empty request, this would give us a 400 Bad Request.
Keep the body so that we can re-inject it into the original request
before re-sending with the token.
Fixes #485