Skip to content

Commit 6f62ad6

Browse files
committed
Put network tests back
1 parent fe100a7 commit 6f62ad6

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

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

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ static CheckAction alwaysDenied(Runnable action) {
8787
checkActions = Map.ofEntries(
8888
entry("runtime_exit", deniedToPlugins(RestEntitlementsCheckAction::runtimeExit)),
8989
entry("runtime_halt", deniedToPlugins(RestEntitlementsCheckAction::runtimeHalt)),
90-
entry("create_classloader", forPlugins(RestEntitlementsCheckAction::createClassLoader)),
9190
entry("processBuilder_start", deniedToPlugins(RestEntitlementsCheckAction::processBuilder_start)),
9291
entry("processBuilder_startPipeline", deniedToPlugins(RestEntitlementsCheckAction::processBuilder_startPipeline)),
92+
entry("create_classloader", forPlugins(RestEntitlementsCheckAction::createClassLoader))
9393
entry("set_https_connection_properties", forPlugins(RestEntitlementsCheckAction::setHttpsConnectionProperties)),
9494
entry("set_default_ssl_socket_factory", alwaysDenied(RestEntitlementsCheckAction::setDefaultSSLSocketFactory)),
9595
entry("set_default_hostname_verifier", alwaysDenied(RestEntitlementsCheckAction::setDefaultHostnameVerifier)),
@@ -111,15 +111,18 @@ static CheckAction alwaysDenied(Runnable action) {
111111
entry("calendarNameProvider", alwaysDenied(RestEntitlementsCheckAction::calendarNameProvider$)),
112112
entry("currencyNameProvider", alwaysDenied(RestEntitlementsCheckAction::currencyNameProvider$)),
113113
entry("localeNameProvider", alwaysDenied(RestEntitlementsCheckAction::localeNameProvider$)),
114-
entry("timeZoneNameProvider", alwaysDenied(RestEntitlementsCheckAction::timeZoneNameProvider$))
114+
entry("timeZoneNameProvider", alwaysDenied(RestEntitlementsCheckAction::timeZoneNameProvider$)),
115115
// entry("logManager", alwaysDenied(RestEntitlementsCheckAction::logManager$)),
116-
// entry("datagramSocket_setDatagramSocketImplFactory", alwaysDenied(RestEntitlementsCheckAction::datagramSocket$$setDatagramSocketImplFactory)),
117-
// entry("httpURLConnection_setFollowRedirects", alwaysDenied(RestEntitlementsCheckAction::httpURLConnection$$setFollowRedirects)),
118-
// entry("serverSocket_setSocketFactory", alwaysDenied(RestEntitlementsCheckAction::serverSocket$$setSocketFactory)),
119-
// entry("socket_setSocketImplFactory", alwaysDenied(RestEntitlementsCheckAction::socket$$setSocketImplFactory)),
120-
// entry("url_setURLStreamHandlerFactory", alwaysDenied(RestEntitlementsCheckAction::url$$setURLStreamHandlerFactory)),
121-
// entry("urlConnection_setFileNameMap", alwaysDenied(RestEntitlementsCheckAction::urlConnection$$setFileNameMap)),
122-
// entry("urlConnection_setContentHandlerFactory", alwaysDenied(RestEntitlementsCheckAction::urlConnection$$setContentHandlerFactory))
116+
117+
// This group is a bit nasty: if entitlements don't prevent these, then networking is
118+
// irreparably borked for the remainder of the test run.
119+
entry("datagramSocket_setDatagramSocketImplFactory", alwaysDenied(RestEntitlementsCheckAction::datagramSocket$$setDatagramSocketImplFactory)),
120+
entry("httpURLConnection_setFollowRedirects", alwaysDenied(RestEntitlementsCheckAction::httpURLConnection$$setFollowRedirects)),
121+
entry("serverSocket_setSocketFactory", alwaysDenied(RestEntitlementsCheckAction::serverSocket$$setSocketFactory)),
122+
entry("socket_setSocketImplFactory", alwaysDenied(RestEntitlementsCheckAction::socket$$setSocketImplFactory)),
123+
entry("url_setURLStreamHandlerFactory", alwaysDenied(RestEntitlementsCheckAction::url$$setURLStreamHandlerFactory)),
124+
entry("urlConnection_setFileNameMap", alwaysDenied(RestEntitlementsCheckAction::urlConnection$$setFileNameMap)),
125+
entry("urlConnection_setContentHandlerFactory", alwaysDenied(RestEntitlementsCheckAction::urlConnection$$setContentHandlerFactory)),
123126
);
124127
}
125128

0 commit comments

Comments
 (0)