Fix malformed URL error when relative path contains colon in first segment #4623
+92
−2
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.
Summary
Fixes #3080
Per RFC 3986 section 4.2, a colon in the first segment of a relative-path reference can be mistaken for a scheme name. For example,
user:email={email}/loginafter parameter substitution becomesuser:[email protected]/login, which OkHttp interprets as having auser:scheme.This PR adds
encodeColonInFirstPathSegment()which encodes colons in the first path segment of relative URLs as%3A, preventing the URL resolution from misinterpreting them as URL schemes.Before:
@put("user:email={email}/login") → Malformed URL error
After:
@put("user:email={email}/login") → http://example.com/user%[email protected]/login
Changes
encodeColonInFirstPathSegment()helper method inRequestBuilder.javaget()andaddQueryParam()methods before URL resolutionTest plan
getWithPathAndQueryColonParamtestgetWithColonInRelativeUrlFirstSegmentregression test matching the exact issue scenario