Throw error if query element doesn't end with END_OBJECT #20528
Merged
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
Followup to elastic#20515 where we added validation that after we parse a query within a query element, we should not get a field name. Truth is that the only token allowed at that point is END_OBJECT, as our DSL allows only one single query within the query object: ``` { "query" : { "term" : { "field" : "value" } } } ``` We can then check that after parsing of the query we have an end_object that closes the query itself (which we already do). Following that we can check that the query object is immediately closed, as there are no other tokens that can be present in that position. Relates to elastic#20515
nik9000
approved these changes
Sep 16, 2016
| @@ -370,7 +370,7 @@ public void testTooManyQueriesInObject() throws IOException { | |||
| String query = "{\"bool\" : {\"" + clauseType | |||
| + "\" : { \"match\" : { \"foo\" : \"bar\" } , \"match\" : { \"baz\" : \"buzz\" } } } }"; | |||
There was a problem hiding this comment.
Could you indent this object so it is easier to read?
| } catch (ParsingException e) { | ||
| assertThat(e.getMessage(), containsString("filters")); | ||
| ParsingException e = expectThrows(ParsingException.class, () -> SearchSourceBuilder.fromXContent | ||
| (createParseContext(parser), |
There was a problem hiding this comment.
Having the ( on this line is pretty strange. Can you move it back up?
areek
approved these changes
Sep 16, 2016
javanna
added a commit
that referenced
this pull request
Sep 16, 2016
* Throw error if query element doesn't end with END_OBJECT Followup to #20515 where we added validation that after we parse a query within a query element, we should not get a field name. Truth is that the only token allowed at that point is END_OBJECT, as our DSL allows only one single query within the query object: ``` { "query" : { "term" : { "field" : "value" } } } ``` We can then check that after parsing of the query we have an end_object that closes the query itself (which we already do). Following that we can check that the query object is immediately closed, as there are no other tokens that can be present in that position. Relates to #20515
clintongormley
added
:Search/Search
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.
Followup to #20515 where we added validation that after we parse a query within a query element, we should not get a field name. Truth is that the only token allowed at that point is END_OBJECT, as our DSL allows only one single query within the query object:
We can then check that after parsing of the query we have an end_object that closes the query itself (which we already do). Following that we can check that the query object is immediately closed, as there are no other tokens that can be present in that position.
See #19791 (diff) too
Relates to #20515