Skip to content

Throw better exception on wrong dynamic_templates syntax #51783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 4, 2020
Merged

Throw better exception on wrong dynamic_templates syntax #51783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
41b90b3
Fix issue #51486
feifeiiiiiiiiiii Feb 1, 2020
62083e0
Fix style and add detail error information
feifeiiiiiiiiiii Feb 4, 2020
8e4460b
Add illegal dynamic templates test
feifeiiiiiiiiiii Feb 4, 2020
3537a18
Update server/src/main/java/org/elasticsearch/index/mapper/RootObject…
feifeiiiiiiiiiii Feb 4, 2020
fa73a21
Fix syntax error
feifeiiiiiiiiiii Feb 4, 2020
5775ade
Update test exception message
feifeiiiiiiiiiii Feb 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions server/src/main/java/org/elasticsearch/index/mapper/RootObjectMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,9 @@ protected boolean processField(RootObjectMapper.Builder builder, String fieldNam
}
]
*/
if ((fieldNode instanceof List) == false) {
throw new MapperParsingException("Dynamic template syntax error. An array of named objects is expected.");
}
List<?> tmplNodes = (List<?>) fieldNode;
List<DynamicTemplate> templates = new ArrayList<>();
for (Object tmplNode : tmplNodes) {
Expand Down
15 changes: 15 additions & 0 deletions server/src/test/java/org/elasticsearch/index/mapper/RootObjectMapperTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,4 +185,19 @@ public void testIllegalFormatField() throws Exception {
assertEquals("Invalid format: [[test_format]]: expected string value", e.getMessage());
}
}

public void testIllegalDynamicTemplates() throws Exception {
String mapping = Strings.toString(XContentFactory.jsonBuilder()
.startObject()
.startObject("type")
.startObject("dynamic_templates")
.endObject()
.endObject()
.endObject());

DocumentMapperParser parser = createIndex("test").mapperService().documentMapperParser();
MapperParsingException e = expectThrows(MapperParsingException.class,
() -> parser.parse("type", new CompressedXContent(mapping)));
assertEquals("Dynamic template syntax error. An array of named objects is expected.", e.getMessage());
}
}