fix: only trust x-forwarded-host from configured trusted proxies (#2… - #26296
Merged
f0ssel merged 1 commit intoJun 11, 2026
Conversation
Docs preview📖 View docs preview for |
|
👋 Hey @geokat! This PR is targeting the Only bug fixes should be cherry-picked to release branches. If this is a bug fix, please update the PR title to match the conventional commit format: If this is not a bug fix, it likely should not target a release branch. |
geokat
added
the
release/breaking
geokat
changed the title
f0ssel
approved these changes
Jun 11, 2026
f0ssel
marked this pull request as ready for review
June 11, 2026 20:02
f0ssel
deleted the
george/r234/backport-plat-259-only-trust-x-forwarded-host-from-trusted-proxies
branch
June 11, 2026 20:03
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.
Backport of #26204 (commit b5ef700) to
release/2.34Replace RequestHost with httpmw.EffectiveHost, which honors
X-Forwarded-Host only when the original socket peer is a configured
trusted origin, otherwise falling back to the received Host header.
Cherry-pick was clean; tests pass on this branch.
Note
Breaking change. See the original PR for the breaking-change details.