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

Use official public API to register query cache and index searcher wrapper 

Closes elastic/elasticsearch#794

Original commit: elastic/x-pack-elasticsearch@eb94fbd145
This commit is contained in:
Simon Willnauer 2015-10-27 14:20:26 +01:00
parent 90335855cb
commit c132e55020
3 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
shield/src/main/java/org/elasticsearch/index/ProtectedServiceInstaller.java
View File

@ -1,24 +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.index;
import org.elasticsearch.shield.ShieldPlugin;
import org.elasticsearch.shield.authz.accesscontrol.OptOutQueryCache;
import org.elasticsearch.shield.authz.accesscontrol.ShieldIndexSearcherWrapper;
/**
* This class installs package protected extension points on the {@link IndexModule}
*/
public class ProtectedServiceInstaller {
public static void install(IndexModule module, boolean clientMode) {
module.indexSearcherWrapper = ShieldIndexSearcherWrapper.class;
if (clientMode == false) {
module.registerQueryCache(ShieldPlugin.OPT_OUT_QUERY_CACHE, OptOutQueryCache::new);
}
}
}

11
shield/src/main/java/org/elasticsearch/shield/ShieldPlugin.java
View File

@ -29,12 +29,13 @@ import org.elasticsearch.shield.authc.Realms;
import org.elasticsearch.shield.authc.support.SecuredString; import org.elasticsearch.shield.authc.support.SecuredString;
import org.elasticsearch.shield.authc.support.UsernamePasswordToken; import org.elasticsearch.shield.authc.support.UsernamePasswordToken;
import org.elasticsearch.shield.authz.AuthorizationModule; import org.elasticsearch.shield.authz.AuthorizationModule;
import org.elasticsearch.index.ProtectedServiceInstaller;
import org.elasticsearch.shield.authz.accesscontrol.OptOutQueryCache; import org.elasticsearch.shield.authz.accesscontrol.OptOutQueryCache;
import org.elasticsearch.shield.authz.accesscontrol.ShieldIndexSearcherWrapper;
import org.elasticsearch.shield.authz.store.FileRolesStore; import org.elasticsearch.shield.authz.store.FileRolesStore;
import org.elasticsearch.shield.crypto.CryptoModule; import org.elasticsearch.shield.crypto.CryptoModule;
import org.elasticsearch.shield.crypto.InternalCryptoService; import org.elasticsearch.shield.crypto.InternalCryptoService;
import org.elasticsearch.shield.license.LicenseModule; import org.elasticsearch.shield.license.LicenseModule;
import org.elasticsearch.shield.license.ShieldLicenseState;
import org.elasticsearch.shield.license.ShieldLicensee; import org.elasticsearch.shield.license.ShieldLicensee;
import org.elasticsearch.shield.rest.ShieldRestModule; import org.elasticsearch.shield.rest.ShieldRestModule;
import org.elasticsearch.shield.rest.action.RestShieldInfoAction; import org.elasticsearch.shield.rest.action.RestShieldInfoAction;
@ -68,6 +69,7 @@ public class ShieldPlugin extends Plugin {
private final Settings settings; private final Settings settings;
private final boolean enabled; private final boolean enabled;
private final boolean clientMode; private final boolean clientMode;
private final ShieldLicenseState shieldLicenseState = new ShieldLicenseState();
public ShieldPlugin(Settings settings) { public ShieldPlugin(Settings settings) {
this.settings = settings; this.settings = settings;
@ -99,7 +101,7 @@ public class ShieldPlugin extends Plugin {
} else { } else {
return Arrays.<Module>asList( return Arrays.<Module>asList(
new ShieldModule(settings), new ShieldModule(settings),
new LicenseModule(settings), new LicenseModule(settings, shieldLicenseState),
new CryptoModule(settings), new CryptoModule(settings),
new AuthenticationModule(settings), new AuthenticationModule(settings),
new AuthorizationModule(settings), new AuthorizationModule(settings),
@ -153,7 +155,10 @@ public class ShieldPlugin extends Plugin {
if (enabled == false) { if (enabled == false) {
return; return;
} }
ProtectedServiceInstaller.install(module, clientMode); module.setSearcherWrapper((indexService) -> new ShieldIndexSearcherWrapper(indexService.getIndexSettings(), indexService.queryParserService(), indexService.mapperService(), indexService.bitsetFilterCache(), shieldLicenseState));
if (clientMode == false) {
module.registerQueryCache(ShieldPlugin.OPT_OUT_QUERY_CACHE, OptOutQueryCache::new);
}
} }
public void onModule(ActionModule module) { public void onModule(ActionModule module) {

7
shield/src/main/java/org/elasticsearch/shield/license/LicenseModule.java
View File

@ -13,15 +13,18 @@ import org.elasticsearch.shield.support.AbstractShieldModule;
*/ */
public class LicenseModule extends AbstractShieldModule.Node { public class LicenseModule extends AbstractShieldModule.Node {
public LicenseModule(Settings settings) { private final ShieldLicenseState shieldLicenseState;
public LicenseModule(Settings settings, ShieldLicenseState shieldLicenseState) {
super(settings); super(settings);
verifyLicensePlugin(); verifyLicensePlugin();
this.shieldLicenseState = shieldLicenseState;
} }
@Override @Override
protected void configureNode() { protected void configureNode() {
bind(ShieldLicensee.class).asEagerSingleton(); bind(ShieldLicensee.class).asEagerSingleton();
bind(ShieldLicenseState.class).asEagerSingleton(); bind(ShieldLicenseState.class).toInstance(shieldLicenseState);
} }
private void verifyLicensePlugin() { private void verifyLicensePlugin() {