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

do expressions consistently with other engines

This commit is contained in:
Robert Muir 2015-12-05 22:08:40 -05:00
parent 2169a123a5
commit 3c419c2186
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/lang-expression/src/main/java/org/elasticsearch/script/expression/ExpressionScriptEngineService.java
View File

@ -45,6 +45,7 @@ import org.elasticsearch.script.SearchScript;
import org.elasticsearch.search.MultiValueMode; import org.elasticsearch.search.MultiValueMode;
import org.elasticsearch.search.lookup.SearchLookup; import org.elasticsearch.search.lookup.SearchLookup;
import java.security.AccessControlContext;
import java.security.AccessController; import java.security.AccessController;
import java.security.PrivilegedAction; import java.security.PrivilegedAction;
import java.text.ParseException; import java.text.ParseException;
@ -104,13 +105,15 @@ public class ExpressionScriptEngineService extends AbstractComponent implements
@Override @Override
public Expression run() { public Expression run() {
try { try {
// snapshot our context here, we check on behalf of the expression
AccessControlContext engineContext = AccessController.getContext();
ClassLoader loader = getClass().getClassLoader(); ClassLoader loader = getClass().getClassLoader();
if (sm != null) { if (sm != null) {
loader = new ClassLoader(loader) { loader = new ClassLoader(loader) {
@Override @Override
protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException { protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
try { try {
sm.checkPermission(new ClassPermission(name)); engineContext.checkPermission(new ClassPermission(name));
} catch (SecurityException e) { } catch (SecurityException e) {
throw new ClassNotFoundException(name, e); throw new ClassNotFoundException(name, e);
} }