honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Watcher: Remove REST hijacking operations (elastic/x-pack-elasticsearch#2132) 

As all the triggering is now done on the shards, people can use
bulk, *-by-query and regular index/delete operations on the watcher
index and do not need to use the dedicated APIs.

We can now remove the long existing rest operation hijacking code.

Original commit: elastic/x-pack-elasticsearch@08f4f4c3de
This commit is contained in:
Alexander Reelsen 2017-08-01 09:49:28 +02:00 committed by GitHub
parent 5b1bf9a31e
commit 9ea032998b
3 changed files with 1 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugin/src/main/java/org/elasticsearch/xpack/watcher/Watcher.java
View File

@ -110,7 +110,6 @@ import org.elasticsearch.xpack.watcher.rest.action.RestActivateWatchAction;
import org.elasticsearch.xpack.watcher.rest.action.RestDeleteWatchAction;
import org.elasticsearch.xpack.watcher.rest.action.RestExecuteWatchAction;
import org.elasticsearch.xpack.watcher.rest.action.RestGetWatchAction;
import org.elasticsearch.xpack.watcher.rest.action.RestHijackOperationAction;
import org.elasticsearch.xpack.watcher.rest.action.RestPutWatchAction;
import org.elasticsearch.xpack.watcher.rest.action.RestWatchServiceAction;
import org.elasticsearch.xpack.watcher.rest.action.RestWatcherStatsAction;
@ -438,8 +437,7 @@ public class Watcher implements ActionPlugin {
new RestWatchServiceAction(settings, restController),
new RestAckWatchAction(settings, restController),
new RestActivateWatchAction(settings, restController),
new RestExecuteWatchAction(settings, restController),
new RestHijackOperationAction(settings, restController));
new RestExecuteWatchAction(settings, restController));
}
public void onIndexModule(IndexModule module) {

104
plugin/src/main/java/org/elasticsearch/xpack/watcher/rest/action/RestHijackOperationAction.java
View File

@ -1,104 +0,0 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
package org.elasticsearch.xpack.watcher.rest.action;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.rest.BytesRestResponse;
import org.elasticsearch.rest.RestController;
import org.elasticsearch.rest.RestRequest;
import org.elasticsearch.rest.RestStatus;
import org.elasticsearch.xpack.watcher.client.WatcherClient;
import org.elasticsearch.xpack.watcher.rest.WatcherRestHandler;
import org.elasticsearch.xpack.watcher.watch.Watch;
import java.io.IOException;
import static org.elasticsearch.rest.RestRequest.Method.DELETE;
import static org.elasticsearch.rest.RestRequest.Method.GET;
import static org.elasticsearch.rest.RestRequest.Method.POST;
import static org.elasticsearch.rest.RestRequest.Method.PUT;
public class RestHijackOperationAction extends WatcherRestHandler {
private static final String ALLOW_DIRECT_ACCESS_TO_WATCH_INDEX_SETTING = "xpack.watcher.index.rest.direct_access";
public RestHijackOperationAction(Settings settings, RestController controller) {
super(settings);
if (!settings.getAsBoolean(ALLOW_DIRECT_ACCESS_TO_WATCH_INDEX_SETTING, false)) {
WatcherRestHandler unsupportedHandler = new UnsupportedHandler(settings);
controller.registerHandler(POST, Watch.INDEX + "/watch", this);
controller.registerHandler(POST, Watch.INDEX + "/watch/{id}", this);
controller.registerHandler(PUT, Watch.INDEX + "/watch/{id}", this);
controller.registerHandler(POST, Watch.INDEX + "/watch/{id}/_update", this);
controller.registerHandler(DELETE, Watch.INDEX + "/watch/_query", this);
controller.registerHandler(DELETE, Watch.INDEX + "/watch/{id}", this);
controller.registerHandler(GET, Watch.INDEX + "/watch/{id}", this);
controller.registerHandler(POST, Watch.INDEX + "/watch/_bulk", unsupportedHandler);
controller.registerHandler(POST, Watch.INDEX + "/_bulk", unsupportedHandler);
controller.registerHandler(PUT, Watch.INDEX + "/watch/_bulk", unsupportedHandler);
controller.registerHandler(PUT, Watch.INDEX + "/_bulk", unsupportedHandler);
controller.registerHandler(DELETE, Watch.INDEX, unsupportedHandler);
controller.registerHandler(POST, Watch.INDEX + "/_delete_by_query", unsupportedHandler);
controller.registerHandler(POST, Watch.INDEX + "/watch/_delete_by_query", unsupportedHandler);
controller.registerHandler(POST, Watch.INDEX + "/_update_by_query", unsupportedHandler);
controller.registerHandler(POST, Watch.INDEX + "/watch/_update_by_query", unsupportedHandler);
}
}
@Override
public String getName() {
return "xpack_watcher_hijack_operation_action";
}
@Override
public RestChannelConsumer doPrepareRequest(RestRequest request, WatcherClient client) throws IOException {
// we have to consume the id parameter lest the request will fail for the wrong reason
if (request.hasParam("id")) {
request.param("id");
}
return channel -> {
try (XContentBuilder builder = channel.newErrorBuilder()) {
builder.startObject().field("error", "This endpoint is not supported for " +
request.method().name() + " on " + Watch.INDEX + " index. Please use " +
request.method().name() + " " + URI_BASE + "/watch/<watch_id> instead");
builder.field("status", RestStatus.BAD_REQUEST.getStatus());
builder.endObject();
channel.sendResponse(new BytesRestResponse(RestStatus.BAD_REQUEST, builder));
}
};
}
private static class UnsupportedHandler extends WatcherRestHandler {
private UnsupportedHandler(Settings settings) {
super(settings);
}
@Override
public String getName() {
return "xpack_watcher_unsupported_action";
}
@Override
public RestChannelConsumer doPrepareRequest(RestRequest request, WatcherClient client) throws IOException {
// we have to consume the id parameter lest the request will fail for the wrong reason
if (request.hasParam("id")) {
request.param("id");
}
return channel -> {
try (XContentBuilder builder = channel.newErrorBuilder()) {
builder.startObject().field("error", "This endpoint is not supported for " +
request.method().name() + " on " + Watch.INDEX + " index.");
builder.field("status", RestStatus.BAD_REQUEST.getStatus());
builder.endObject();
channel.sendResponse(new BytesRestResponse(RestStatus.BAD_REQUEST, builder));
}
};
}
}
}

83
plugin/src/test/resources/rest-api-spec/test/watcher/block_direct_index_access/10_basic.yml
View File

@ -1,83 +0,0 @@
---
"Test Hijack and Block Direct Access to Internal Indices":
- do:
cluster.health:
wait_for_status: yellow
- do:
catch: /not supported/
get:
index: ".watches"
type: "watch"
id: "foo"
- do:
catch: /not supported/
index:
index: ".watches"
type: "watch"
id: "foo"
body: {}
- do:
catch: /not supported/
delete:
index: ".watches"
type: "watch"
id: "foo"
- do:
catch: /not supported/
indices.delete:
index: ".watches"
- do:
catch: /not supported/
update:
index: ".watches"
type: "watch"
id: "foo"
body: {}
- do:
catch: /not supported/
bulk:
index: ".watches"
type: "watch"
body:
- { "index": {}}
- {}
- do:
catch: /not supported/
bulk:
index: ".watches"
body:
- { "index": {}}
- {}
- do:
catch: /not supported/
delete_by_query:
index: ".watches"
body: {}
- do:
catch: /not supported/
delete_by_query:
index: ".watches"
type: "watch"
body: {}
- do:
catch: /not supported/
update_by_query:
index: ".watches"
body: {}
- do:
catch: /not supported/
update_by_query:
index: ".watches"
type: "watch"
body: {}