Skip to content

Commit 36e8af7

Browse files
authored
Removing unneeded check on SSLSession#getSessionContext (#120191) (#120220)
1 parent 9953986 commit 36e8af7

File tree

3 files changed

+0
-23
lines changed

3 files changed

+0
-23
lines changed

libs/entitlement/bridge/src/main/java/org/elasticsearch/entitlement/bridge/EntitlementChecker.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import javax.net.ssl.HostnameVerifier;
3333
import javax.net.ssl.HttpsURLConnection;
3434
import javax.net.ssl.SSLContext;
35-
import javax.net.ssl.SSLSession;
3635
import javax.net.ssl.SSLSocketFactory;
3736

3837
@SuppressWarnings("unused") // Called from instrumentation code inserted by the Entitlements agent
@@ -193,9 +192,6 @@ public interface EntitlementChecker {
193192

194193
void check$java_net_URL$(Class<?> callerClass, URL context, String spec, URLStreamHandler handler);
195194

196-
// The only implementation of SSLSession#getSessionContext(); unfortunately it's an interface, so we need to check the implementation
197-
void check$sun_security_ssl_SSLSessionImpl$getSessionContext(Class<?> callerClass, SSLSession sslSession);
198-
199195
void check$java_net_DatagramSocket$bind(Class<?> callerClass, DatagramSocket that, SocketAddress addr);
200196

201197
void check$java_net_DatagramSocket$connect(Class<?> callerClass, DatagramSocket that, InetAddress addr);

libs/entitlement/qa/common/src/main/java/org/elasticsearch/entitlement/qa/common/RestEntitlementsCheckAction.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@
5959

6060
import javax.net.ssl.HttpsURLConnection;
6161
import javax.net.ssl.SSLContext;
62-
import javax.net.ssl.SSLSession;
63-
import javax.net.ssl.SSLSocket;
64-
import javax.net.ssl.SSLSocketFactory;
6562

6663
import static java.util.Map.entry;
6764
import static org.elasticsearch.entitlement.qa.common.RestEntitlementsCheckAction.CheckAction.alwaysDenied;
@@ -149,7 +146,6 @@ static CheckAction alwaysDenied(CheckedRunnable<Exception> action) {
149146
entry("createURLStreamHandlerProvider", alwaysDenied(RestEntitlementsCheckAction::createURLStreamHandlerProvider)),
150147
entry("createURLWithURLStreamHandler", alwaysDenied(RestEntitlementsCheckAction::createURLWithURLStreamHandler)),
151148
entry("createURLWithURLStreamHandler2", alwaysDenied(RestEntitlementsCheckAction::createURLWithURLStreamHandler2)),
152-
entry("sslSessionImpl_getSessionContext", alwaysDenied(RestEntitlementsCheckAction::sslSessionImplGetSessionContext)),
153149
entry("datagram_socket_bind", forPlugins(RestEntitlementsCheckAction::bindDatagramSocket)),
154150
entry("datagram_socket_connect", forPlugins(RestEntitlementsCheckAction::connectDatagramSocket)),
155151
entry("datagram_socket_send", forPlugins(RestEntitlementsCheckAction::sendDatagramSocket)),
@@ -169,15 +165,6 @@ public URLStreamHandler createURLStreamHandler(String protocol) {
169165
};
170166
}
171167

172-
private static void sslSessionImplGetSessionContext() throws IOException {
173-
SSLSocketFactory factory = HttpsURLConnection.getDefaultSSLSocketFactory();
174-
try (SSLSocket socket = (SSLSocket) factory.createSocket()) {
175-
SSLSession session = socket.getSession();
176-
177-
session.getSessionContext();
178-
}
179-
}
180-
181168
@SuppressWarnings("deprecation")
182169
private static void createURLWithURLStreamHandler() throws MalformedURLException {
183170
var x = new URL("http", "host", 1234, "file", new URLStreamHandler() {

libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/api/ElasticsearchEntitlementChecker.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import javax.net.ssl.HostnameVerifier;
3737
import javax.net.ssl.HttpsURLConnection;
3838
import javax.net.ssl.SSLContext;
39-
import javax.net.ssl.SSLSession;
4039
import javax.net.ssl.SSLSocketFactory;
4140

4241
/**
@@ -352,11 +351,6 @@ public ElasticsearchEntitlementChecker(PolicyManager policyManager) {
352351
policyManager.checkChangeNetworkHandling(callerClass);
353352
}
354353

355-
@Override
356-
public void check$sun_security_ssl_SSLSessionImpl$getSessionContext(Class<?> callerClass, SSLSession sslSession) {
357-
policyManager.checkReadSensitiveNetworkInformation(callerClass);
358-
}
359-
360354
@Override
361355
public void check$java_net_DatagramSocket$bind(Class<?> callerClass, DatagramSocket that, SocketAddress addr) {
362356
policyManager.checkNetworkAccess(callerClass, NetworkEntitlement.LISTEN_ACTION);

0 commit comments

Comments
 (0)