Skip to content

Commit fe100a7

Browse files
committed
WIP still passing
1 parent 8a851a3 commit fe100a7

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
import java.io.InputStream;
1313
import java.io.PrintStream;
1414
import java.io.PrintWriter;
15+
import java.net.ContentHandlerFactory;
16+
import java.net.DatagramSocketImplFactory;
17+
import java.net.FileNameMap;
18+
import java.net.SocketImplFactory;
1519
import java.net.URL;
1620
import java.net.URLStreamHandlerFactory;
1721
import java.util.List;
@@ -151,7 +155,6 @@ public interface EntitlementChecker {
151155
// Can't call bridge
152156
// void check$java_util_logging_LogManager$(Class<?> callerClass);
153157

154-
/* These seem to cause network errors in other tests
155158
void check$java_net_DatagramSocket$$setDatagramSocketImplFactory(Class<?> callerClass, DatagramSocketImplFactory fac);
156159

157160
void check$java_net_HttpURLConnection$$setFollowRedirects(Class<?> callerClass, boolean set);
@@ -165,6 +168,5 @@ public interface EntitlementChecker {
165168
void check$java_net_URLConnection$$setFileNameMap(Class<?> callerClass, FileNameMap map);
166169

167170
void check$java_net_URLConnection$$setContentHandlerFactory(Class<?> callerClass, ContentHandlerFactory fac);
168-
*/
169171

170172
}

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -252,42 +252,42 @@ public ElasticsearchEntitlementChecker(PolicyManager policyManager) {
252252
policyManager.checkChangeJVMGlobalState(callerClass);
253253
}
254254

255-
// @Override
255+
@Override
256256
public void check$java_net_DatagramSocket$$setDatagramSocketImplFactory(Class<?> callerClass, DatagramSocketImplFactory fac) {
257257
policyManager.checkChangeJVMGlobalState(callerClass);
258258
}
259259

260-
// @Override
260+
@Override
261261
public void check$java_net_HttpURLConnection$$setFollowRedirects(Class<?> callerClass, boolean set) {
262262
policyManager.checkChangeJVMGlobalState(callerClass);
263263
}
264264

265-
// @Override
265+
@Override
266266
public void check$java_net_ServerSocket$$setSocketFactory(Class<?> callerClass, SocketImplFactory fac) {
267267
policyManager.checkChangeJVMGlobalState(callerClass);
268268
}
269269

270-
// @Override
270+
@Override
271271
public void check$java_net_Socket$$setSocketImplFactory(Class<?> callerClass, SocketImplFactory fac) {
272272
policyManager.checkChangeJVMGlobalState(callerClass);
273273
}
274274

275-
// @Override
275+
@Override
276276
public void check$java_net_URL$$setURLStreamHandlerFactory(Class<?> callerClass, URLStreamHandlerFactory fac) {
277277
policyManager.checkChangeJVMGlobalState(callerClass);
278278
}
279279

280-
// @Override
280+
@Override
281281
public void check$java_net_URLConnection$$setFileNameMap(Class<?> callerClass, FileNameMap map) {
282282
policyManager.checkChangeJVMGlobalState(callerClass);
283283
}
284284

285-
// @Override
285+
@Override
286286
public void check$java_net_URLConnection$$setContentHandlerFactory(Class<?> callerClass, ContentHandlerFactory fac) {
287287
policyManager.checkChangeJVMGlobalState(callerClass);
288288
}
289289

290-
// @Override
290+
@Override
291291
public void check$javax_net_ssl_HttpsURLConnection$setSSLSocketFactory(
292292
Class<?> callerClass,
293293
HttpsURLConnection connection,
@@ -296,17 +296,17 @@ public ElasticsearchEntitlementChecker(PolicyManager policyManager) {
296296
policyManager.checkSetHttpsConnectionProperties(callerClass);
297297
}
298298

299-
// @Override
299+
@Override
300300
public void check$javax_net_ssl_HttpsURLConnection$$setDefaultSSLSocketFactory(Class<?> callerClass, SSLSocketFactory sf) {
301301
policyManager.checkChangeJVMGlobalState(callerClass);
302302
}
303303

304-
// @Override
304+
@Override
305305
public void check$javax_net_ssl_HttpsURLConnection$$setDefaultHostnameVerifier(Class<?> callerClass, HostnameVerifier hv) {
306306
policyManager.checkChangeJVMGlobalState(callerClass);
307307
}
308308

309-
// @Override
309+
@Override
310310
public void check$javax_net_ssl_SSLContext$$setDefault(Class<?> callerClass, SSLContext context) {
311311
policyManager.checkChangeJVMGlobalState(callerClass);
312312
}

0 commit comments

Comments
 (0)