File tree Expand file tree Collapse file tree 2 files changed +8
-2
lines changed
distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli
server/src/main/java/org/elasticsearch/bootstrap Expand file tree Collapse file tree 2 files changed +8
-2
lines changed Original file line number Diff line number Diff line change 1111
1212import org .elasticsearch .common .settings .Settings ;
1313import org .elasticsearch .common .util .concurrent .EsExecutors ;
14+ import org .elasticsearch .core .Booleans ;
1415import org .elasticsearch .core .UpdateForV9 ;
1516import org .elasticsearch .jdk .RuntimeVersionFeature ;
1617
@@ -26,7 +27,9 @@ final class SystemJvmOptions {
2627 static List <String > systemJvmOptions (Settings nodeSettings , final Map <String , String > sysprops ) {
2728 String distroType = sysprops .get ("es.distribution.type" );
2829 boolean isHotspot = sysprops .getOrDefault ("sun.management.compiler" , "" ).contains ("HotSpot" );
29- boolean useEntitlements = Boolean .parseBoolean (sysprops .getOrDefault ("es.entitlements.enabled" , "false" ));
30+ boolean entitlementsExplicitlyEnabled = Booleans .parseBoolean (sysprops .getOrDefault ("es.entitlements.enabled" , "false" ));
31+ // java 24+ only supports entitlements, but it may be enabled on earlier versions explicitly
32+ boolean useEntitlements = RuntimeVersionFeature .isSecurityManagerAvailable () == false || entitlementsExplicitlyEnabled ;
3033 return Stream .of (
3134 Stream .of (
3235 /*
Original file line number Diff line number Diff line change 2828import org .elasticsearch .common .transport .BoundTransportAddress ;
2929import org .elasticsearch .common .util .concurrent .RunOnce ;
3030import org .elasticsearch .core .AbstractRefCounted ;
31+ import org .elasticsearch .core .Booleans ;
3132import org .elasticsearch .core .IOUtils ;
3233import org .elasticsearch .core .SuppressForbidden ;
3334import org .elasticsearch .entitlement .bootstrap .EntitlementBootstrap ;
@@ -109,7 +110,9 @@ private static Bootstrap initPhase1() {
109110 final PrintStream out = getStdout ();
110111 final PrintStream err = getStderr ();
111112 final ServerArgs args ;
112- final boolean useEntitlements = Boolean .parseBoolean (System .getProperty ("es.entitlements.enabled" ));
113+ final boolean entitlementsExplicitlyEnabled = Booleans .parseBoolean (System .getProperty ("es.entitlements.enabled" , "false" ));
114+ // java 24+ only supports entitlements, but it may be enabled on earlier versions explicitly
115+ final boolean useEntitlements = RuntimeVersionFeature .isSecurityManagerAvailable () == false || entitlementsExplicitlyEnabled ;
113116 try {
114117 initSecurityProperties ();
115118
You can’t perform that action at this time.
0 commit comments