Skip to content

Commit 8466d26

Browse files
authored
[9.0] Enable entitlements by default (elastic#122907) (elastic#123402)
* Enable entitlements by default (elastic#122907) Entitlements are almost complete. This commit enables them by default, in preparation for 8.18/9.0. * mute test
1 parent 4706068 commit 8466d26

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
@@ -258,6 +258,9 @@ tests:
258258
- class: org.elasticsearch.repositories.blobstore.testkit.analyze.MinioRepositoryAnalysisRestIT
259259
method: testRepositoryAnalysis
260260
issue: https://github.com/elastic/elasticsearch/issues/122670
261+
- class: org.elasticsearch.analysis.common.CommonAnalysisClientYamlTestSuiteIT
262+
method: test {yaml=analysis-common/40_token_filters/stemmer_override file access}
263+
issue: https://github.com/elastic/elasticsearch/issues/121625
261264

262265
# Examples:
263266
#

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)