Skip to content

Commit a4d7297

Browse files
authored
Permanently switch from SecurityManager to Entitlements (elastic#124865) (elastic#125117)
The JDK team has completely disabled the Java SecurityManager from Java 24. Elasticsearch has always used the Java SecurityManager as an additional protection mechanism; in order to retain this second line of defense, the Elasticsearch Core/Infra team has been working on the Entitlements project. Similar to SecurityManager, Entitlements only allow calling specific methods in the JDK when the caller has a matching policy attached. In other words, if some code (in the main Elasticsearch codebase, in a plugin/module, or in a script) attempts to perform a "privileged" operation and it is not entitled to do so, a NotEntitledException will be thrown. This PR includes the minimal set of changes to always use Entitlements, regardless of system properties or Java version. Relates to ES-10921
1 parent 1196173 commit a4d7297

File tree

6 files changed

+18
-22
lines changed

6 files changed

+18
-22
lines changed

build-tools/src/main/java/org/elasticsearch/gradle/testclusters/RunTask.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public abstract class RunTask extends DefaultTestClustersTask {
4242

4343
private Boolean debug = false;
4444
private Boolean cliDebug = false;
45-
private Boolean entitlementsEnabled = false;
45+
4646
private Boolean apmServerEnabled = false;
4747

4848
private Boolean preserveData = false;
@@ -74,9 +74,7 @@ public void setCliDebug(boolean enabled) {
7474
option = "entitlements",
7575
description = "Use the Entitlements agent system in place of SecurityManager to enforce sandbox policies."
7676
)
77-
public void setEntitlementsEnabled(boolean enabled) {
78-
this.entitlementsEnabled = enabled;
79-
}
77+
public void setEntitlementsEnabled(boolean enabled) {}
8078

8179
@Input
8280
public Boolean getDebug() {
@@ -90,7 +88,7 @@ public Boolean getCliDebug() {
9088

9189
@Input
9290
public Boolean getEntitlementsEnabled() {
93-
return entitlementsEnabled;
91+
return true;
9492
}
9593

9694
@Input
@@ -240,9 +238,7 @@ else if (node.getSettingKeys().contains("telemetry.metrics.enabled") == false) {
240238
if (cliDebug) {
241239
enableCliDebug();
242240
}
243-
if (entitlementsEnabled) {
244-
enableEntitlements();
245-
}
241+
enableEntitlements();
246242
}
247243

248244
@TaskAction

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
import org.elasticsearch.common.settings.Settings;
1313
import org.elasticsearch.common.util.concurrent.EsExecutors;
14-
import org.elasticsearch.core.Booleans;
1514
import org.elasticsearch.jdk.RuntimeVersionFeature;
1615

1716
import java.io.IOException;
@@ -28,9 +27,8 @@ static List<String> systemJvmOptions(Settings nodeSettings, final Map<String, St
2827
String distroType = sysprops.get("es.distribution.type");
2928
String javaType = sysprops.get("es.java.type");
3029
boolean isHotspot = sysprops.getOrDefault("sun.management.compiler", "").contains("HotSpot");
31-
boolean entitlementsExplicitlyEnabled = Booleans.parseBoolean(sysprops.getOrDefault("es.entitlements.enabled", "true"));
32-
// java 24+ only supports entitlements, but it may be enabled on earlier versions explicitly
33-
boolean useEntitlements = RuntimeVersionFeature.isSecurityManagerAvailable() == false || entitlementsExplicitlyEnabled;
30+
31+
boolean useEntitlements = true;
3432
return Stream.of(
3533
Stream.of(
3634
/*

docs/changelog/125117.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
pr: 125117
2+
summary: "Permanently switch from Java SecurityManager to Entitlements.
3+
The Java SecurityManager has been deprecated since Java 17, and it is now completely disabled in Java 24. In order
4+
to retain an similar level of protection, Elasticsearch implemented its own protection mechanism, Entitlements.
5+
Starting with this version, Entitlements will permanently replace the Java SecurityManager."
6+
area: Infra/Core
7+
type: upgrade
8+
issues: []

modules/ingest-attachment/src/main/java/org/elasticsearch/ingest/attachment/TikaImpl.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@
1818
import org.apache.tika.parser.ParserDecorator;
1919
import org.elasticsearch.SpecialPermission;
2020
import org.elasticsearch.bootstrap.FilePermissionUtils;
21-
import org.elasticsearch.core.Booleans;
2221
import org.elasticsearch.core.PathUtils;
2322
import org.elasticsearch.core.SuppressForbidden;
2423
import org.elasticsearch.jdk.JarHell;
25-
import org.elasticsearch.jdk.RuntimeVersionFeature;
2624

2725
import java.io.ByteArrayInputStream;
2826
import java.io.IOException;
@@ -129,9 +127,7 @@ static String parse(final byte content[], final Metadata metadata, final int lim
129127
: null;
130128

131129
private static boolean isUsingSecurityManager() {
132-
boolean entitlementsEnabled = Booleans.parseBoolean(System.getProperty("es.entitlements.enabled"), false)
133-
|| RuntimeVersionFeature.isSecurityManagerAvailable() == false;
134-
return entitlementsEnabled == false;
130+
return false;
135131
}
136132

137133
// compute some minimal permissions for parsers. they only get r/w access to the java temp directory,

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.elasticsearch.common.transport.BoundTransportAddress;
3030
import org.elasticsearch.common.util.concurrent.RunOnce;
3131
import org.elasticsearch.core.AbstractRefCounted;
32-
import org.elasticsearch.core.Booleans;
3332
import org.elasticsearch.core.CheckedConsumer;
3433
import org.elasticsearch.core.IOUtils;
3534
import org.elasticsearch.core.SuppressForbidden;
@@ -129,9 +128,8 @@ private static Bootstrap initPhase1() {
129128
final PrintStream out = getStdout();
130129
final PrintStream err = getStderr();
131130
final ServerArgs args;
132-
final boolean entitlementsEnabled = Booleans.parseBoolean(System.getProperty("es.entitlements.enabled", "true"));
133-
// java 24+ only supports entitlements, but it may be enabled on earlier versions explicitly
134-
final boolean useEntitlements = RuntimeVersionFeature.isSecurityManagerAvailable() == false || entitlementsEnabled;
131+
132+
final boolean useEntitlements = true;
135133
try {
136134
initSecurityProperties();
137135

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

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

3838
static {
39-
final boolean useEntitlements = Boolean.parseBoolean(System.getProperty("es.entitlements.enabled"));
39+
final boolean useEntitlements = true;
4040
if (useEntitlements == false && RuntimeVersionFeature.isSecurityManagerAvailable()) {
4141
// check that the extension's policy works.
4242
AccessController.doPrivileged((PrivilegedAction<Void>) () -> {

0 commit comments

Comments
 (0)