fix: resolve client IP from the rightmost untrusted X-Forwarded-For entry (backport 2.34) - #27236
Merged
Merged
Conversation
BobbyHo
marked this pull request as ready for review
July 14, 2026 15:47
mtojek
self-requested a review
July 16, 2026 07:05
mtojek
approved these changes
Jul 16, 2026
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 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.
Backports #26646 to release/2.34 (Stable/ESR).
A client could spoof its X-Forwarded-For value by prepending a fake IP;
getRemoteAddresstook the leftmost comma-delimited token, so appending proxies (nginx, ALB, Cloudflare) never overrode the spoofed value. This fedhttpmw.RateLimit(per-IP login throttling) and audit logIPAddressfields, enabling rate-limit bypass and audit falsification.This is the security fix tracked in PLAT-258 / coder/security-disclosures#9 (SEC-FC61DF2BF7). It already shipped in mainline (v2.35.0); this PR brings it to the Stable/ESR line.
Clean cherry-pick, no conflicts.
coderd/httpmw/realip_test.gocovers the spoofing scenario.