SQL: the SSL default configuration shouldn't override the https protocol if used #34635
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
Collaborator
|
Pinging @elastic/es-search-aggs |
matriv
approved these changes
Oct 20, 2018
| if (!isSSLPropertyPresent && !isSchemaPresent) { | ||
| enabled = StringUtils.parseBoolean(SSL_DEFAULT); | ||
| } else { | ||
| if (isSSLPropertyPresent && isHttpsScheme && !StringUtils.parseBoolean(settings.getProperty(SSL))) { |
Contributor
There was a problem hiding this comment.
I think you can remove isSSLPropertyPresent here, it's always true as it's checked above.
Contributor
Author
There was a problem hiding this comment.
It's not necessarily always true @matriv. The first condition could be false if isSSLPropertyPresent is also false (but isSchemaPresent true). This check is on purpose set like this because I want the exception to be thrown only in that specific case.
astefan
added a commit
to astefan/elasticsearch
that referenced
this pull request
Oct 23, 2018
…col if used (elastic#34635) * The default SSL option shouldn't override the https protocol if specified. Fixes elastic#33817
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
This fixes the bug reported in #33817.