fix(connect): strip brackets from IPv6 hosts when building the ServerName - #3095
Open
kp-patrick-arns wants to merge 2 commits into
Open
fix(connect): strip brackets from IPv6 hosts when building the ServerName#3095kp-patrick-arns wants to merge 2 commits into
kp-patrick-arns wants to merge 2 commits into
Conversation
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.
Closes #3094
Adds a helper that strips the brackets off an IPv6 literal host and uses it at both
ServerName::try_fromcall sites insrc/connect.rs, the SOCKS path and the HTTP CONNECT tunnel.This is what
HttpsConnectoralready does on the direct path.#2753 fixed the other direction in this file, adding brackets when formatting a SOCKS destination, but the
ServerNameconstruction a few lines away kept the bracketed host.The native-tls paths are untouched. They pass the host on differently and I have not checked whether they have the same problem.
tunnel_to_ipv6_literalintests/proxy.rscovers it: the proxy answers 200 so the client goes on to the handshake, which is where the rejection happened. Without the fix the test fails with "Invalid Server Name".