forked from elastic/elasticsearch
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
RestAPI: Reject forcemerge requests with a body (elastic#30792)
This commit adds validation to forcemerge rest requests which contain a body. All parameters to force merge must be part of http params. closes elastic#29584
- Loading branch information
Showing
2 changed files
with
50 additions
and
0 deletions.
There are no files selected for viewing
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
47 changes: 47 additions & 0 deletions
47
...est/java/org/elasticsearch/action/admin/indices/forcemerge/RestForceMergeActionTests.java
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
/* | ||
* Licensed to Elasticsearch under one or more contributor | ||
* license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright | ||
* ownership. Elasticsearch licenses this file to you under | ||
* the Apache License, Version 2.0 (the "License"); you may | ||
* not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
|
||
package org.elasticsearch.action.admin.indices.forcemerge; | ||
|
||
import org.elasticsearch.client.node.NodeClient; | ||
import org.elasticsearch.common.bytes.BytesArray; | ||
import org.elasticsearch.common.settings.Settings; | ||
import org.elasticsearch.common.xcontent.NamedXContentRegistry; | ||
import org.elasticsearch.common.xcontent.XContentType; | ||
import org.elasticsearch.common.xcontent.json.JsonXContent; | ||
import org.elasticsearch.rest.RestController; | ||
import org.elasticsearch.rest.action.admin.indices.RestForceMergeAction; | ||
import org.elasticsearch.test.ESTestCase; | ||
import org.elasticsearch.test.rest.FakeRestRequest; | ||
|
||
import static org.hamcrest.Matchers.equalTo; | ||
import static org.mockito.Mockito.mock; | ||
|
||
public class RestForceMergeActionTests extends ESTestCase { | ||
|
||
public void testBodyRejection() throws Exception { | ||
final RestForceMergeAction handler = new RestForceMergeAction(Settings.EMPTY, mock(RestController.class)); | ||
String json = JsonXContent.contentBuilder().startObject().field("max_num_segments", 1).endObject().toString(); | ||
final FakeRestRequest request = new FakeRestRequest.Builder(NamedXContentRegistry.EMPTY) | ||
.withContent(new BytesArray(json), XContentType.JSON).build(); | ||
IllegalArgumentException e = expectThrows(IllegalArgumentException.class, | ||
() -> handler.prepareRequest(request, mock(NodeClient.class))); | ||
assertThat(e.getMessage(), equalTo("forcemerge takes arguments in query parameters, not in the request body")); | ||
} | ||
} |