fix(doh): use per-connection local address for PROXY protocol#8005
Merged
Conversation
Signed-off-by: Cedric Wang <cedwang@amazon.com>
Contributor
Author
yongtang
approved these changes
Apr 4, 2026
Filippo125
pushed a commit
to Filippo125/coredns
that referenced
this pull request
Apr 10, 2026
…s#8005) Signed-off-by: Filippo <filippo.ferrazini@gmail.com>
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.
Summary
PROXY protocol support was introduced in CoreDNS 1.24.1 in #7738. But when PROXY protocol is enabled on the DoH server,
DoHWriter.laddralways used the static listener address (s.listenAddr) instead of the per-connection destination address from the PROXY protocol header. This is incorrect when the server is behind a load balancer with VIPs, and defeats the purpose of PROXY protocol.http.Server.ConnContextto capturec.LocalAddr()per connectionlocalAddr()helper that reads from context withs.listenAddras fallbacks.listenAddrwiths.localAddr(r)inServeHTTPNote:
r.RemoteAddr(used forraddr) is already correct for TCP — Go'snet/httpreads it fromproxyproto.Conn.RemoteAddr()through the TLS chain.Test plan
TestDoHWriterLaddrFromConnContext— verifies laddr reflects PP destinationTestDoHWriterLaddrFallback— verifies fallback to listenAddr without PPgo test ./core/dnsserver/passes