Fixes #6276 - Support non-standard domains in SNI and X509. (#6296) #6311
Conversation
This file contains 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
Improved support for IP addresses in X509 (after #5379). Introduced SslContextFactory.Client.SniProvider to allow applications to specify the SNI names to send to the server. Improved logging of SNI processing. Skip X509 matching over IP addresses when the host does not look like an IP address, to avoid reverse DNS lookup. Signed-off-by: Simone Bordet <[email protected]> (cherry picked from commit 04df6d4)
|
Forward port of #6296. |
gregw
requested changes
May 21, 2021
Comment on lines
199
to
204
| // IPv4 is just numbers and dots. | ||
| String ipv4RegExp = "[0-9\\.]+"; | ||
| // IPv6 is hex and colons and possibly brackets. | ||
| String ipv6RegExp = "[0-9a-fA-F:\\[\\]]+"; | ||
| return host.matches(ipv4RegExp) || | ||
| (host.matches(ipv6RegExp) && containsAtLeastTwoColons(host)); |
There was a problem hiding this comment.
I missed this before the port... but shouldn't we precompile these regex's?
Also they can be more precise: IPv4 must start and finish with a digit; IPv6 may have [] only on the outside and must have a : somewhere (which can be done in regex rather than another method). i think this is specially important for ipv6 matching as a-fA-F can spell out words that might be local host names eg "fab"
We may as well go for a complex address regex like https://stackoverflow.com/questions/53497/regular-expression-that-matches-valid-ipv6-addresses, which can be precompiled and will be quick enough to execute... ideally with a single expression rather than two.
Updates after review. Signed-off-by: Simone Bordet <[email protected]>
gregw
approved these changes
May 24, 2021
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.
Improved support for IP addresses in X509 (after #5379).
Introduced SslContextFactory.Client.SniProvider to allow applications to specify the SNI names to send to the server.
Improved logging of SNI processing.
Skip X509 matching over IP addresses when the host does
not look like an IP address, to avoid reverse DNS lookup.
Signed-off-by: Simone Bordet [email protected]
(cherry picked from commit 04df6d4)