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

Scripting: Allow to disable dynamic script execution, closes #1763.

This commit is contained in:
Shay Banon 2012-03-06 22:03:02 +02:00
parent a4945aa5e8
commit 6b11b760ae
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/elasticsearch/script/ScriptService.java
View File

@ -58,6 +58,8 @@ public class ScriptService extends AbstractComponent {
// TODO expose some cache aspects like expiration and max size
private final Cache<CacheKey, CompiledScript> cache = CacheBuilder.newBuilder().build();
private final boolean disableDynamic;
public ScriptService(Settings settings) {
this(settings, new Environment(), ImmutableSet.<ScriptEngineService>builder()
.add(new MvelScriptEngineService(settings))
@ -70,6 +72,7 @@ public class ScriptService extends AbstractComponent {
super(settings);
this.defaultLang = componentSettings.get("default_lang", "mvel");
this.disableDynamic = componentSettings.getAsBoolean("disable_dynamic", false);
ImmutableMap.Builder<String, ScriptEngineService> builder = ImmutableMap.builder();
for (ScriptEngineService scriptEngine : scriptEngines) {
@ -142,6 +145,9 @@ public class ScriptService extends AbstractComponent {
if (lang == null) {
lang = defaultLang;
}
if (dynamicScriptDisabled(lang)) {
throw new ScriptException("dynamic scripting disabled");
}
CacheKey cacheKey = new CacheKey(lang, script);
compiled = cache.getIfPresent(cacheKey);
if (compiled != null) {
@ -185,6 +191,14 @@ public class ScriptService extends AbstractComponent {
cache.invalidateAll();
}
private boolean dynamicScriptDisabled(String lang) {
if (!disableDynamic) {
return false;
}
// we allow "native" executions since they register through plugins, so they are "allowed"
return !"native".equals(lang);
}
public static class CacheKey {
public final String lang;
public final String script;