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

Add settings filtering to node info requests 

Today we don't filter settings in NodeInfo so transport clients get unfiltered settings.
This commit is contained in:
Simon Willnauer 2016-02-04 10:45:32 +01:00
parent 9649c791c1
commit ca1a12e4c3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/main/java/org/elasticsearch/node/service/NodeService.java
View File

@ -29,6 +29,7 @@ import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.component.AbstractComponent; import org.elasticsearch.common.component.AbstractComponent;
import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.settings.SettingsFilter;
import org.elasticsearch.discovery.Discovery; import org.elasticsearch.discovery.Discovery;
import org.elasticsearch.env.Environment; import org.elasticsearch.env.Environment;
import org.elasticsearch.http.HttpServer; import org.elasticsearch.http.HttpServer;
@ -61,6 +62,7 @@ public class NodeService extends AbstractComponent implements Closeable {
private final PluginsService pluginService; private final PluginsService pluginService;
private final CircuitBreakerService circuitBreakerService; private final CircuitBreakerService circuitBreakerService;
private final IngestService ingestService; private final IngestService ingestService;
private final SettingsFilter settingsFilter;
private ScriptService scriptService; private ScriptService scriptService;
@Nullable @Nullable
@ -73,10 +75,10 @@ public class NodeService extends AbstractComponent implements Closeable {
private final Discovery discovery; private final Discovery discovery;
@Inject @Inject
public NodeService(Settings settings, Environment environment, ThreadPool threadPool, MonitorService monitorService, public NodeService(Settings settings, ThreadPool threadPool, MonitorService monitorService,
Discovery discovery, TransportService transportService, IndicesService indicesService, Discovery discovery, TransportService transportService, IndicesService indicesService,
PluginsService pluginService, CircuitBreakerService circuitBreakerService, Version version, PluginsService pluginService, CircuitBreakerService circuitBreakerService, Version version,
ProcessorsRegistry processorsRegistry, ClusterService clusterService) { ProcessorsRegistry processorsRegistry, ClusterService clusterService, SettingsFilter settingsFilter) {
super(settings); super(settings);
this.threadPool = threadPool; this.threadPool = threadPool;
this.monitorService = monitorService; this.monitorService = monitorService;
@ -88,6 +90,7 @@ public class NodeService extends AbstractComponent implements Closeable {
this.pluginService = pluginService; this.pluginService = pluginService;
this.circuitBreakerService = circuitBreakerService; this.circuitBreakerService = circuitBreakerService;
this.ingestService = new IngestService(settings, threadPool, processorsRegistry); this.ingestService = new IngestService(settings, threadPool, processorsRegistry);
this.settingsFilter = settingsFilter;
clusterService.add(ingestService.getPipelineStore()); clusterService.add(ingestService.getPipelineStore());
} }
@ -137,7 +140,7 @@ public class NodeService extends AbstractComponent implements Closeable {
public NodeInfo info(boolean settings, boolean os, boolean process, boolean jvm, boolean threadPool, public NodeInfo info(boolean settings, boolean os, boolean process, boolean jvm, boolean threadPool,
boolean transport, boolean http, boolean plugin) { boolean transport, boolean http, boolean plugin) {
return new NodeInfo(version, Build.CURRENT, discovery.localNode(), serviceAttributes, return new NodeInfo(version, Build.CURRENT, discovery.localNode(), serviceAttributes,
settings ? this.settings : null, settings ? settingsFilter.filter(this.settings) : null,
os ? monitorService.osService().info() : null, os ? monitorService.osService().info() : null,
process ? monitorService.processService().info() : null, process ? monitorService.processService().info() : null,
jvm ? monitorService.jvmService().info() : null, jvm ? monitorService.jvmService().info() : null,