reverseproxy: close connection on proxy protocol error paths#7836
Open
Ackberry wants to merge 3 commits into
Open
reverseproxy: close connection on proxy protocol error paths#7836Ackberry wants to merge 3 commits into
Ackberry wants to merge 3 commits into
Conversation
…er a successful dial, the four error returns in the ProxyProtocol block of dialContext returned without closing the established connection, leaking the socket. Close conn on each path. Fixes one item from caddyserver#7833." Signed-off-by: Ackberry <akbari@usf.edu>
|
|
steadytao
changed the title
Author
|
Hey @steadytao , just wanted to remind you of this PR! |
steadytao
requested changes
Jul 11, 2026
steadytao
left a comment
steadytao
left a comment
Member
There was a problem hiding this comment.
Sorry this took me a while. The close calls are in the right places from what I can see but please add a regression test proving that an established connection is closed when proxy-protocol setup fails.
steadytao
requested changes
Jul 12, 2026
steadytao
left a comment
steadytao
left a comment
Member
There was a problem hiding this comment.
The requested regression test is still missing; please add one proving that the established connection is closed when proxy-protocol setup fails.
Author
|
sorry took a while. On it now. |
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
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.
Assistance Disclosure
AI was used. I used Claude Code to help draft PR message and understand the codebase. I worked as a peer-programmer.
What this does
In
HTTPTransport's customdialContextclosure (modules/caddyhttp/reverseproxy/httptransport.go), the connection is established viadialer.DialContextand then, whenproxy_protocolis configured, several error paths returned without closing the already-open connection, leaking the socket:This closes
connon each of those paths. The dial-failure return (where no connection exists yet) and the success path are unchanged.Addresses the reverse proxy item in #7833. Per the maintainer's suggestion in that issue, the other reported leaks are left for separate PRs by area.
Testing
go build ./...go test -race ./modules/caddyhttp/reverseproxy/passes