fix tls server name extraction for ipv6 authorities in wasi-http#13686
Open
netliomax25-code wants to merge 1 commit into
Open
fix tls server name extraction for ipv6 authorities in wasi-http#13686netliomax25-code wants to merge 1 commit into
netliomax25-code wants to merge 1 commit into
Conversation
rvolosatovs
reviewed
Jun 18, 2026
| /// wrong for the bracketed IPv6 form, so handle it explicitly and return the | ||
| /// bare address without brackets, which is what `rustls`' `ServerName` expects. | ||
| #[cfg(all(feature = "default-send-request", any(feature = "p2", feature = "p3")))] | ||
| fn tls_server_name(authority: &str) -> &str { |
Member
There was a problem hiding this comment.
Could this return ServerName directly?
| match authority.split_once(':') { | ||
| Some((host, _port)) => host, | ||
| None => authority, | ||
| } |
Member
There was a problem hiding this comment.
What do you think about first trying https://doc.rust-lang.org/std/net/enum.SocketAddr.html#impl-FromStr-for-SocketAddr returning ServerName::IpAddress on success and otherwise trying to split off the : part and passing that to ServerName::try_from?
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.
ServerName) withauthority.split(":").next().[2001:db8::1]:443, so that split returns[2001andServerName::try_fromrejects it. HTTPS to an IPv6 literal then always fails the handshake, even though the TCP connect uses the full authority and reaches the right peer.Pull the host out of the authority directly, dropping the brackets for the IPv6 form, in one shared helper used by both sites. Added a unit test covering host:port, IPv4, and the bracketed IPv6 forms.