Skip to content

Commit 28ce53f

Browse files
authored
[Entitlements] Fix "No SecurityManager when entitlements are enabled" (#119742)
1 parent 80547f8 commit 28ce53f

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/SystemJvmOptions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ private static Stream<String> maybeWorkaroundG1Bug() {
141141

142142
@UpdateForV9(owner = UpdateForV9.Owner.CORE_INFRA)
143143
private static Stream<String> maybeAllowSecurityManager(boolean useEntitlements) {
144-
if (useEntitlements == false && RuntimeVersionFeature.isSecurityManagerAvailable()) {
144+
if (RuntimeVersionFeature.isSecurityManagerAvailable()) {
145145
// Will become conditional on useEntitlements once entitlements can run without SM
146146
return Stream.of("-Djava.security.manager=allow");
147147
}

x-pack/qa/security-example-spi-extension/src/main/java/org/elasticsearch/example/ExampleSecurityExtension.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
public class ExampleSecurityExtension implements SecurityExtension {
3737

3838
static {
39-
if (RuntimeVersionFeature.isSecurityManagerAvailable()) {
39+
final boolean useEntitlements = Boolean.parseBoolean(System.getProperty("es.entitlements.enabled"));
40+
if (useEntitlements == false && RuntimeVersionFeature.isSecurityManagerAvailable()) {
4041
// check that the extension's policy works.
4142
AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
4243
System.getSecurityManager().checkPropertyAccess("myproperty");

0 commit comments

Comments
 (0)