Fix URI construction. #1896
Merged
Fix URI construction. #1896
+41
−12
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
This fixes two issues. 1) Use the URI constructor with multiple arguments to construct the placeholder URI for direct address, so that special characters can be correctly escaped. This resolves grpc#1883. It requires the second fix. 2) Stop URI from mistreating paths as authorities. There is a bug in URI constructors that take multiple arguments. They simply concatenate escaped components and try to parse the resulting string. For example, URI("dns", null, "//127.0.0.1", null), which is what we do internally when the application passes "/127.0.0.1" as the target, is supposed to create a [scheme="dns", path="//127.0.0.1"]. Instead, it internally composes "dns://127.0.0.1", which is parsed into [scheme="dns", authority="127.0.0.1"]. To avoid this issue, we pass empty string instead of null as the authority to the URI constructor. The constructor would make "dns:////127.0.0.1" internally which can be parsed correctly.
|
@zhangkun83 LGTM |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This fixes two issues.
It requires the second fix.
There is a bug in URI constructors that take multiple arguments. They simply concatenate escaped components and try to parse the resulting string.
For example,
URI("dns", null, "//127.0.0.1", null), which is what we do internally when the application passes"/127.0.0.1"as the target, is supposed to create a[scheme="dns", path="//127.0.0.1"]. Instead, it internally composes"dns://127.0.0.1", which is parsed into[scheme="dns", authority="127.0.0.1"].To avoid this issue, we pass empty string instead of null as the authority to the URI constructor. The constructor would make
"dns:////127.0.0.1"internally which can be parsed correctly.