Skip to content

Commit b5e482b

Browse files
authored
Enable entitlements by default (#122907)
Entitlements are almost complete. This commit enables them by default, in preparation for 8.18/9.0.
1 parent 88cf248 commit b5e482b

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
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
@@ -28,7 +28,7 @@ final class SystemJvmOptions {
2828
static List<String> systemJvmOptions(Settings nodeSettings, final Map<String, String> sysprops) {
2929
String distroType = sysprops.get("es.distribution.type");
3030
boolean isHotspot = sysprops.getOrDefault("sun.management.compiler", "").contains("HotSpot");
31-
boolean entitlementsExplicitlyEnabled = Booleans.parseBoolean(sysprops.getOrDefault("es.entitlements.enabled", "false"));
31+
boolean entitlementsExplicitlyEnabled = Booleans.parseBoolean(sysprops.getOrDefault("es.entitlements.enabled", "true"));
3232
// java 24+ only supports entitlements, but it may be enabled on earlier versions explicitly
3333
boolean useEntitlements = RuntimeVersionFeature.isSecurityManagerAvailable() == false || entitlementsExplicitlyEnabled;
3434
return Stream.of(

libs/entitlement/src/main/java/org/elasticsearch/entitlement/initialization/EntitlementInitialization.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ private static PolicyManager createPolicyManager() {
178178
if (bootstrapArgs.pidFile() != null) {
179179
serverModuleFileDatas.add(FileData.ofPath(bootstrapArgs.pidFile(), READ_WRITE));
180180
}
181+
181182
Collections.addAll(
182183
serverScopes,
183184
new Scope(
@@ -186,6 +187,7 @@ private static PolicyManager createPolicyManager() {
186187
new CreateClassLoaderEntitlement(),
187188
new FilesEntitlement(
188189
List.of(
190+
// TODO: what in es.base is accessing shared repo?
189191
FileData.ofRelativePath(Path.of(""), SHARED_REPO, READ_WRITE),
190192
FileData.ofRelativePath(Path.of(""), DATA, READ_WRITE)
191193
)

server/src/main/java/org/elasticsearch/bootstrap/Elasticsearch.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,9 @@ private static Bootstrap initPhase1() {
120120
final PrintStream out = getStdout();
121121
final PrintStream err = getStderr();
122122
final ServerArgs args;
123-
final boolean entitlementsExplicitlyEnabled = Booleans.parseBoolean(System.getProperty("es.entitlements.enabled", "false"));
123+
final boolean entitlementsEnabled = Booleans.parseBoolean(System.getProperty("es.entitlements.enabled", "true"));
124124
// java 24+ only supports entitlements, but it may be enabled on earlier versions explicitly
125-
final boolean useEntitlements = RuntimeVersionFeature.isSecurityManagerAvailable() == false || entitlementsExplicitlyEnabled;
125+
final boolean useEntitlements = RuntimeVersionFeature.isSecurityManagerAvailable() == false || entitlementsEnabled;
126126
try {
127127
initSecurityProperties();
128128

0 commit comments

Comments
 (0)