Skip to content

Commit 957dc2f

Browse files
[8.18] Enable entitlements by default (#122907) (#123400)
* Enable entitlements by default (#122907) Entitlements are almost complete. This commit enables them by default, in preparation for 8.18/9.0. * mute test --------- Co-authored-by: Elastic Machine <[email protected]>
1 parent 4129fd5 commit 957dc2f

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-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
@@ -179,6 +179,7 @@ private static PolicyManager createPolicyManager() {
179179
if (bootstrapArgs.pidFile() != null) {
180180
serverModuleFileDatas.add(FileData.ofPath(bootstrapArgs.pidFile(), READ_WRITE));
181181
}
182+
182183
Collections.addAll(
183184
serverScopes,
184185
new Scope(
@@ -187,6 +188,7 @@ private static PolicyManager createPolicyManager() {
187188
new CreateClassLoaderEntitlement(),
188189
new FilesEntitlement(
189190
List.of(
191+
// TODO: what in es.base is accessing shared repo?
190192
FileData.ofRelativePath(Path.of(""), SHARED_REPO, READ_WRITE),
191193
FileData.ofRelativePath(Path.of(""), DATA, READ_WRITE)
192194
)

muted-tests.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -453,3 +453,6 @@ tests:
453453
- class: org.elasticsearch.smoketest.DocsClientYamlTestSuiteIT
454454
method: test {yaml=reference/rest-api/common-options/line_102}
455455
issue: https://github.com/elastic/elasticsearch/issues/121748
456+
- class: org.elasticsearch.analysis.common.CommonAnalysisClientYamlTestSuiteIT
457+
method: test {yaml=analysis-common/40_token_filters/stemmer_override file access}
458+
issue: https://github.com/elastic/elasticsearch/issues/121625

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

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

0 commit comments

Comments
 (0)