refactor: extract readBody helper to remove duplicate io.ReadAll calls#1241
Merged
rdimitrov merged 3 commits intomodelcontextprotocol:mainfrom May 4, 2026
Merged
Conversation
argIndex is already used in fmt.Sprintf on line 215 so the blank assignment on the line before was not needed.
The same pattern for reading an error response body appeared in three places across the auth handlers. A shared readBody function in common.go now handles this in one place.
rdimitrov
approved these changes
May 4, 2026
2 tasks
rdimitrov
added a commit
that referenced
this pull request
May 4, 2026
## Summary Follow-up to #1241. Two small tweaks to the `readBody` helper: - **Rename `readBody` → `readErrorBody`.** The helper is only ever called on the error path (after a non-2xx status check), where we want a small string for diagnostics. The generic name made it look reusable on the success path, where streaming JSON decoding is the right approach. The new name pins the intended use down. - **Cap the read with `io.LimitReader` (8 KiB).** Defense in depth — error diagnostics never need more than a few KB, and we shouldn't buffer an arbitrarily large body from an upstream just to format an error message. 8 KiB is well above any realistic GitHub API or JWKS error response. No behavior change on the happy path. On the unhappy path, error messages are now bounded. ## Test plan - [x] `go build ./...` - [x] `go test ./internal/api/handlers/v0/auth/...` 🤖 Generated with [Claude Code](https://claude.com/claude-code)
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.
The same pattern for reading an error response body appeared in three places across the auth handlers:
internal/api/handlers/v0/auth/github_at.go(twice)internal/api/handlers/v0/auth/github_oidc.go(once)A shared
readBodyhelper function added tocommon.gonow handles this in one place.The
ioimport is removed from both files since it is no longer used directly there.