Fixes #5079 - :authority header for IPv6 address not having square br… #5128
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
…ackets. On the client: * Origin.Address.host is passed through HostPort.normalizeHost(), so that if it is IPv6 is bracketed. Now the ipv6 address passed to an `HttClient` request is bracketed. * HttpRequest was de-bracketing the host, but now it does not anymore. On the server: * Request.getLocalAddr(), getLocalName(), getRemoteAddr(), getRemoteHost(), getServerName(), when dealing with an IPv6 address, return it bracketed. The reason to return bracketed IPv6 also from *Addr() methods is that if it is used with InetAddress/InetSocketAddress it still works, but often it is interpreted as a URI host so brackets are necessary. * DoSFilter was blindly bracketing - now it does not. Added a number of test cases, and fixed those that expected non-bracketed IPv6. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
|
Some test failures in ...
|
…ackets. Fixed Jenkins failures by disabling tests that require IPv6 if it is not available. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
gregw
approved these changes
Aug 11, 2020
| * @return the host itself | ||
| * @deprecated no replacement, do not use it | ||
| */ | ||
| @Deprecated |
There was a problem hiding this comment.
should the impl at least call HostPort.normalize so that it works if somebody does call it?
There was a problem hiding this comment.
Also, perhaps add some apidoc text telling developers what the options are now that it's deprecated ...
/**
* @deprecated use {@link HostPort#normalize(String)} instead.
*/
@DeprecatedThere was a problem hiding this comment.
Nope, the method should not be used. It's protected so only subclasses could use it, but they should not - there is no need to normalize the host anymore.
I initially followed @gregw suggestion to call HostPort.normalizeHost(), but actually this method was doing exactly the opposite. So either restore the old behavior, or keep this new one that does nothing.
…ackets. Updates after review. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
…ackets. Reverted code changes to HttpClient.normalizeHost(). Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Closed
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.
…ackets.
On the client:
so that if it is IPv6 is bracketed.
Now the ipv6 address passed to an
HttClientrequest is bracketed.On the server:
getRemoteHost(), getServerName(), when dealing with an IPv6 address,
return it bracketed.
The reason to return bracketed IPv6 also from *Addr() methods is that
if it is used with InetAddress/InetSocketAddress it still works, but
often it is interpreted as a URI host so brackets are necessary.
Added a number of test cases, and fixed those that expected
non-bracketed IPv6.
Signed-off-by: Simone Bordet simone.bordet@gmail.com