SQL: fix URI path being lost in case of hosted ES scenario #44776
Conversation
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
astefan
added
>bug
:Analytics/SQL
Contributor
Author
|
@elasticmachine run elasticsearch-ci/packaging-sample |
matriv
approved these changes
Jul 24, 2019
Contributor
matriv
left a comment
matriv
left a comment
There was a problem hiding this comment.
LGTM
For completeness I would add a test with null segment and tests with null and empty uri.
| concatenatedPath = path + "/" + cleanSegment; | ||
| } | ||
| try { | ||
| return new URI(uri.getScheme(), uri.getUserInfo(), uri.getHost(), uri.getPort(), concatenatedPath, |
Contributor
There was a problem hiding this comment.
Why not using new URI(concatenatedPath) ?
Contributor
Author
There was a problem hiding this comment.
Because concatenatedPath is only the uri.getPath() section of the initial URI. If one has http://localhost:9200/es_rest/ path is /es_rest/. And this method's purpose is to add a new segment to the already existent path: http://localhost:9200/es_rest/ + /_sql for example.
astefan
added a commit
that referenced
this pull request
Jul 25, 2019
(cherry picked from commit 06dea85)
astefan
added a commit
that referenced
this pull request
Jul 25, 2019
(cherry picked from commit 06dea85)
astefan
added a commit
that referenced
this pull request
Jul 25, 2019
(cherry picked from commit 06dea85)
astefan
added a commit
that referenced
this pull request
Jul 25, 2019
(cherry picked from commit 06dea85)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
URI.resolve()method doesn't work as we intended it to work and when an URI of the formhttp://localhost:8080/custom_path/is being used (common in reverse proxy scenarios), theresolve("/_sql")(very common path resolve) call will strip thecustom_pathfrom the URI and just put/_sqlinstead. Whereas the desired behavior should be appending the additional segment to the existent URI and creating thehttp://localhost:8080/custom_path/_sqlURI.This PR fixes #44721.