Skip to content

Fix ClassCastException on malformed mappings in create index #22371

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

Open
vishdivs wants to merge 3 commits into
base: main
Choose a base branch
from
+44 −0
Open

Fix ClassCastException on malformed mappings in create index #22371

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
e000d8b
Fix ClassCastException on malformed mappings in create index
Jul 1, 2026
4a61a97
Adding Integ test
Jul 1, 2026
7c1adf9
replacing mapping with mappings
Jul 1, 2026
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
20 changes: 20 additions & 0 deletions ...rc/internalClusterTest/java/org/opensearch/action/admin/indices/create/CreateIndexIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

package org.opensearch.action.admin.indices.create;

import org.opensearch.OpenSearchParseException;
import org.opensearch.action.UnavailableShardsException;
import org.opensearch.action.admin.cluster.state.ClusterStateResponse;
import org.opensearch.action.admin.indices.alias.Alias;
Expand All @@ -56,6 +57,7 @@
import org.opensearch.common.xcontent.XContentFactory;
import org.opensearch.core.action.ActionListener;
import org.opensearch.core.common.bytes.BytesReference;
import org.opensearch.core.xcontent.MediaTypeRegistry;
import org.opensearch.index.IndexNotFoundException;
import org.opensearch.index.IndexService;
import org.opensearch.index.IndexSettings;
Expand Down Expand Up @@ -442,6 +444,24 @@ public void testCreateIndexWithNullReplicaCountPickUpClusterReplica() {
}
}

public void testCreateIndexWithMappingsAsString() {
CreateIndexRequest request = new CreateIndexRequest("test");
OpenSearchParseException e = expectThrows(
OpenSearchParseException.class,
() -> request.source("{\"mappings\": \"{}\"}", MediaTypeRegistry.JSON)
);
assertEquals("key [mappings] must be an object", e.getMessage());
}

public void testCreateIndexWithMappingsNestedValueAsString() {
CreateIndexRequest request = new CreateIndexRequest("test");
OpenSearchParseException e = expectThrows(
OpenSearchParseException.class,
() -> request.source("{\"mappings\": {\"properties\": \"invalid\"}}", MediaTypeRegistry.JSON)
);
assertEquals("values inside key [mappings] must be an object", e.getMessage());
}

public void testCreateIndexWithContextSettingsAndTemplate() throws Exception {
int numReplicas = 1;
String indexName = "test-idx-1";
Expand Down
6 changes: 6 additions & 0 deletions server/src/main/java/org/opensearch/action/admin/indices/create/CreateIndexRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,8 +527,14 @@ public CreateIndexRequest source(Map<String, ?> source, DeprecationHandler depre
}
settings((Map<String, Object>) entry.getValue());
} else if (MAPPINGS.match(name, deprecationHandler)) {
if (entry.getValue() instanceof Map == false) {
throw new OpenSearchParseException("key [mappings] must be an object");
}
Map<String, Object> mappings = (Map<String, Object>) entry.getValue();
for (Map.Entry<String, Object> entry1 : mappings.entrySet()) {
if (entry1.getValue() instanceof Map == false) {
throw new OpenSearchParseException("values inside key [mappings] must be an object");
}
mapping(entry1.getKey(), (Map<String, Object>) entry1.getValue());
}
} else if (ALIASES.match(name, deprecationHandler)) {
Expand Down
18 changes: 18 additions & 0 deletions server/src/test/java/org/opensearch/action/admin/indices/create/CreateIndexRequestTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,24 @@ public void testContext() throws IOException {
}
}

public void testMappingsType() throws IOException {
XContentBuilder builder = MediaTypeRegistry.contentBuilder(randomFrom(XContentType.values()));
builder.startObject().startArray("mappings").endArray().endObject();

CreateIndexRequest parsedCreateIndexRequest = new CreateIndexRequest();
OpenSearchParseException e = expectThrows(OpenSearchParseException.class, () -> parsedCreateIndexRequest.source(builder));
assertThat(e.getMessage(), equalTo("key [mappings] must be an object"));
}

public void testMappingsNestedValueType() throws IOException {
XContentBuilder builder = MediaTypeRegistry.contentBuilder(randomFrom(XContentType.values()));
builder.startObject().startObject("mappings").field("properties", "invalid_string_value").endObject().endObject();

CreateIndexRequest parsedCreateIndexRequest = new CreateIndexRequest();
OpenSearchParseException e = expectThrows(OpenSearchParseException.class, () -> parsedCreateIndexRequest.source(builder));
assertThat(e.getMessage(), equalTo("values inside key [mappings] must be an object"));
}

public static void assertMappingsEqual(Map<String, String> expected, Map<String, String> actual) throws IOException {
assertEquals(expected.keySet(), actual.keySet());

Expand Down
Loading