honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-08 22:14:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disallow creating indices starting with '-' or '+'

Browse Source 
Previously this was possible, which was problematic when issuing a
request like `DELETE /-myindex`, which was interpretted as "delete
everything except for myindex".

Resolves #19800
This commit is contained in:
Lee Hinman 2016-08-17 14:58:28 -06:00
parent 066afcf3c3
commit 6030acb43b
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java
View File

@ -144,7 +144,7 @@ public class MetaDataCreateIndexService extends AbstractComponent {
this.activeShardsObserver = new ActiveShardsObserver(settings, clusterService, threadPool); this.activeShardsObserver = new ActiveShardsObserver(settings, clusterService, threadPool);
} }
public void validateIndexName(String index, ClusterState state) { public static void validateIndexName(String index, ClusterState state) {
if (state.routingTable().hasIndex(index)) { if (state.routingTable().hasIndex(index)) {
throw new IndexAlreadyExistsException(state.routingTable().index(index).getIndex()); throw new IndexAlreadyExistsException(state.routingTable().index(index).getIndex());
} }
@ -157,8 +157,8 @@ public class MetaDataCreateIndexService extends AbstractComponent {
if (index.contains("#")) { if (index.contains("#")) {
throw new InvalidIndexNameException(index, "must not contain '#'"); throw new InvalidIndexNameException(index, "must not contain '#'");
} }
if (index.charAt(0) == '_') { if (index.charAt(0) == '_' || index.charAt(0) == '-' || index.charAt(0) == '+') {
throw new InvalidIndexNameException(index, "must not start with '_'"); throw new InvalidIndexNameException(index, "must not start with '_', '-', or '+'");
} }
if (!index.toLowerCase(Locale.ROOT).equals(index)) { if (!index.toLowerCase(Locale.ROOT).equals(index)) {
throw new InvalidIndexNameException(index, "must be lowercase"); throw new InvalidIndexNameException(index, "must be lowercase");

2
core/src/main/java/org/elasticsearch/snapshots/RestoreService.java
View File

@ -257,7 +257,7 @@ public class RestoreService extends AbstractComponent implements ClusterStateLis
if (currentIndexMetaData == null) { if (currentIndexMetaData == null) {
// Index doesn't exist - create it and start recovery // Index doesn't exist - create it and start recovery
// Make sure that the index we are about to create has a validate name // Make sure that the index we are about to create has a validate name
createIndexService.validateIndexName(renamedIndexName, currentState); MetaDataCreateIndexService.validateIndexName(renamedIndexName, currentState);
createIndexService.validateIndexSettings(renamedIndexName, snapshotIndexMetaData.getSettings()); createIndexService.validateIndexSettings(renamedIndexName, snapshotIndexMetaData.getSettings());
IndexMetaData.Builder indexMdBuilder = IndexMetaData.builder(snapshotIndexMetaData).state(IndexMetaData.State.OPEN).index(renamedIndexName); IndexMetaData.Builder indexMdBuilder = IndexMetaData.builder(snapshotIndexMetaData).state(IndexMetaData.State.OPEN).index(renamedIndexName);
indexMdBuilder.settings(Settings.builder().put(snapshotIndexMetaData.getSettings()).put(IndexMetaData.SETTING_INDEX_UUID, UUIDs.randomBase64UUID())); indexMdBuilder.settings(Settings.builder().put(snapshotIndexMetaData.getSettings()).put(IndexMetaData.SETTING_INDEX_UUID, UUIDs.randomBase64UUID()));

6
core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexServiceTests.java
View File

@ -191,7 +191,9 @@ public class MetaDataCreateIndexServiceTests extends ESTestCase {
validateIndexName("index#name", "must not contain '#'"); validateIndexName("index#name", "must not contain '#'");
validateIndexName("_indexname", "must not start with '_'"); validateIndexName("_indexname", "must not start with '_', '-', or '+'");
validateIndexName("-indexname", "must not start with '_', '-', or '+'");
validateIndexName("+indexname", "must not start with '_', '-', or '+'");
validateIndexName("INDEXNAME", "must be lowercase"); validateIndexName("INDEXNAME", "must be lowercase");
@ -201,7 +203,7 @@ public class MetaDataCreateIndexServiceTests extends ESTestCase {
private void validateIndexName(String indexName, String errorMessage) { private void validateIndexName(String indexName, String errorMessage) {
InvalidIndexNameException e = expectThrows(InvalidIndexNameException.class, InvalidIndexNameException e = expectThrows(InvalidIndexNameException.class,
() -> getCreateIndexService().validateIndexName(indexName, ClusterState.builder(ClusterName.CLUSTER_NAME_SETTING () -> MetaDataCreateIndexService.validateIndexName(indexName, ClusterState.builder(ClusterName.CLUSTER_NAME_SETTING
.getDefault(Settings.EMPTY)).build())); .getDefault(Settings.EMPTY)).build()));
assertThat(e.getMessage(), endsWith(errorMessage)); assertThat(e.getMessage(), endsWith(errorMessage));
} }

8
docs/reference/migration/migrate_5_0/index-apis.asciidoc
View File

@ -49,3 +49,11 @@ CPU usage can be obtained from `OsStats.Cpu#getPercent`.
Suggest stats exposed through `suggest` in indices stats has been merged Suggest stats exposed through `suggest` in indices stats has been merged
with `search` stats. `suggest` stats is exposed as part of `search` stats. with `search` stats. `suggest` stats is exposed as part of `search` stats.
==== Creating indices starting with '-' or '+'
Elasticsearch no longer allows indices to be created started with '-' or '+', so
that the multi-index matching and expansion is not confused. It was previously
possible (but a really bad idea) to create indices starting with a hyphen or
plus sign. Any index already existing with these preceding characters will
continue to work normally.