http-proxy: verify CONNECT response headers#21927
Closed
alhudz wants to merge 1 commit into
Closed
Conversation
bagder
approved these changes
Jun 9, 2026
Member
|
Thanks! |
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.
The HTTP/1 proxy
CONNECTresponse is read a line at a time insingle_header()(lib/cf-h1-proxy.c) and each line is handed to the application as a header (CLIENTWRITE_HEADER | CLIENTWRITE_CONNECT) without passing throughCurl_verify_header(). Regular response headers and chunked trailers both go through that helper, which rejects an embedded nul byte and a stray carriage return. So a malicious or MITM proxy can place a nul byte in aCONNECTresponse header and have it delivered toCURLOPT_HEADERFUNCTIONwith the nul still in it, the same confusion the helper already guards against for normal headers.The fix calls
Curl_verify_header()on eachCONNECTline before it is delivered, bringing this path in line with the regular header path. The check belongs here because this is the only HTTP/1 reader that emits proxy response headers to the client; it also covers theCONNECT-UDP path, as both go throughsingle_header(), while the HTTP/2 proxy path is already validated by nghttp2.test2107drives aCONNECTreply carrying a nul byte in a header and expectsCURLE_WEIRD_SERVER_REPLY(it returns0without the patch).