Fix trusted proxy client IP matching#139
Merged
Merged
Conversation
a8e19a0 to
a85c489
Compare
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
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.
Impact
Defender previously evaluated
r.RemoteAddr, the immediate peer address, instead of Caddy's resolvedclient_iprequest variable. In deployments behind a trusted proxy, CDN, or load balancer, a blocked client could be allowed when the direct proxy address was not in a blocked range. This is a bypass of Defender's IP-based blocking policy for affected proxy deployments.Patches
This patch makes Defender prefer Caddy's resolved
client_ipvalue when present, with a fallback toRemoteAddrfor direct request contexts. It also adds regression coverage for a blockedclient_ipbehind an unblocked direct peer.Users should upgrade to the first release containing this patch.
Workarounds
Before upgrading, users can block the proxy or load balancer IP ranges directly, but that is usually too broad and may block legitimate traffic. Deployments that do not rely on trusted proxy client IP resolution are less exposed.
References
client_ipandremote_ip: https://caddyserver.com/docs/caddyfile/matchers#client-iptrusted_proxiesdocumentation: https://caddyserver.com/docs/caddyfile/options#trusted-proxiesValidation
go test . -run TestDefenderServeHTTP_UsesCaddyClientIP -count=1go test ./...