Skip to content

Closes #112812 Avoid copying to a non-existent field when dynamic mappings are disabled #113290

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

Closed
wants to merge 3 commits into from
Closed

Closes #112812 Avoid copying to a non-existent field when dynamic mappings are disabled #113290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4786ef0
adding non existent field verification to copy to
henriquepaes1 Sep 20, 2024
1843499
adding verification for dynamic mapping
henriquepaes1 Sep 20, 2024
fd1a517
Merge branch 'main' into 112812-copy-to-non-existent-field
henriquepaes1 Dec 5, 2024
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
5 changes: 5 additions & 0 deletions server/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,13 +334,18 @@ public final void validate(MappingLookup mappers) {
}

final String sourceScope = mappers.nestedLookup().getNestedParent(this.fullPath());
ObjectMapper.Dynamic dynamic = mappers.getMapping().getRoot().dynamic;
boolean needsFieldVerification = dynamic != null && dynamic.equals(ObjectMapper.Dynamic.FALSE);
for (String copyTo : this.copyTo().copyToFields()) {
if (mappers.isMultiField(copyTo)) {
throw new IllegalArgumentException("[copy_to] may not be used to copy to a multi-field: [" + copyTo + "]");
}
if (mappers.isObjectField(copyTo)) {
throw new IllegalArgumentException("Cannot copy to field [" + copyTo + "] since it is mapped as an object");
}
if (needsFieldVerification && mappers.getMapper(copyTo) == null){
throw new IllegalArgumentException("Cannot copy to field [" + copyTo + "] since it is a non existent field");
}

final String targetScope = mappers.nestedLookup().getNestedParent(copyTo);
checkNestedScopeCompatibility(sourceScope, targetScope);
Expand Down
32 changes: 32 additions & 0 deletions server/src/test/java/org/elasticsearch/index/mapper/CopyToMapperTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,6 +645,38 @@ public void testCopyFromMultiField() {
assertThat(e.getMessage(), Matchers.containsString("[copy_to] may not be used to copy from a multi-field: [field.bar]"));
}

public void testCopyToNonExistentFieldDynamicFalse() {
Exception e = expectThrows(IllegalArgumentException.class, () -> createDocumentMapper(topMapping(b -> {
b.field("dynamic", "false");
b.startObject("properties");
{
b.startObject("test_field");
{
b.field("type", "text");
b.field("copy_to", "missing_field");
}
b.endObject();
}
b.endObject();
})));
assertThat(e.getMessage(), Matchers.containsString("Cannot copy to field [missing_field] since it is a non existent field"));
}

public void testCopyToNonExistentFieldDynamicTrue() throws IOException {
DocumentMapper mapper = createDocumentMapper(topMapping(b -> {
b.field("dynamic", "true");
b.startObject("properties");
{
b.startObject("test_field");
{
b.field("type", "text");
b.field("copy_to", "missing_field");
}
b.endObject();
}
b.endObject();}));
}

public void testCopyToDateRangeFailure() throws Exception {
DocumentMapper docMapper = createDocumentMapper(topMapping(b -> {
b.startObject("properties");
Expand Down