Prevent hostname being replaced with IP during handshake#5038
Merged
obiltschnig merged 1 commit intopocoproject:mainfrom Oct 2, 2025
Merged
Prevent hostname being replaced with IP during handshake#5038obiltschnig merged 1 commit intopocoproject:mainfrom
obiltschnig merged 1 commit intopocoproject:mainfrom
Conversation
Before the handshake is performed, SecureSocketImpl::stateClientConnected overrides the peer hostname with its IP address, making it impossible to send SNI during the handshake in SecureSocketImpl::stateClientHandshakeStart. This behavior essentially breaks SNI and prevents the library from being used with load balancers that rely on SNI to determine the destination host. Everywhere else, the peer hostname is replaced by the IP address only when the peer hostname is empty. That makes total sense; however, it seems like this check was forgotten in SecureSocketImpl::stateClientConnected.
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.
Before the handshake is performed, SecureSocketImpl::stateClientConnected overrides the peer hostname with its IP address, making it impossible to send SNI during the handshake in SecureSocketImpl::stateClientHandshakeStart.
This behavior essentially breaks SNI and prevents the library from being used with load balancers that rely on SNI to determine the destination host.
Everywhere else, the peer hostname is replaced by the IP address only when the peer hostname is empty. That makes total sense; however, it seems like this check was forgotten in SecureSocketImpl::stateClientConnected.
status.github.comrequires SNI, so this example demonstrates the problem:The output will be
Looking at Wireshark we can see that Client Hello does not contain SNI.

With the fix in the PR everything works and we can see SNI in the Client Hello message:
