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

simplify further

This commit is contained in:
Robert Muir 2015-06-27 02:22:11 -04:00
parent 8d04bee8af
commit 36012b9e0f
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/elasticsearch/bootstrap/Security.java
View File

@ -71,8 +71,6 @@ final class Security {
m.put(Pattern.compile(".*lucene-core-.*\\.jar$"), "es.security.jar.lucene.core");
m.put(Pattern.compile(".*jsr166e-.*\\.jar$"), "es.security.jar.twitter.jsr166e");
m.put(Pattern.compile(".*securemock-.*\\.jar$"), "es.security.jar.elasticsearch.securemock");
m.put(Pattern.compile(".*mockito-core-.*\\.jar$"), "es.security.jar.mockito.core");
m.put(Pattern.compile(".*objenesis-.*\\.jar$"), "es.security.jar.objenesis");
SPECIAL_JARS = Collections.unmodifiableMap(m);
}

8
core/src/main/resources/org/elasticsearch/bootstrap/security.policy
View File

@ -42,14 +42,8 @@ grant codeBase "${es.security.jar.twitter.jsr166e}" {
permission java.lang.RuntimePermission "accessClassInPackage.sun.misc";
};
// the following three jars all conspire to support creation of mocks
grant codeBase "${es.security.jar.elasticsearch.securemock}" {
permission java.lang.RuntimePermission "reflectionFactoryAccess";
};
grant codeBase "${es.security.jar.mockito.core}" {
permission java.lang.RuntimePermission "reflectionFactoryAccess";
};
grant codeBase "${es.security.jar.objenesis}" {
// needed to support creation of mocks
permission java.lang.RuntimePermission "reflectionFactoryAccess";
};