Skip to content

Commit 33a9cc8

Browse files
committed
Revert "[Entitlements] Add URLConnection instrumentation for file protocol (#123824)"
This reverts commit 92b6ba7.
1 parent 92b6ba7 commit 33a9cc8

File tree

5 files changed

+0
-266
lines changed

5 files changed

+0
-266
lines changed

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1148,26 +1148,6 @@ void checkPathRegister(
11481148
WatchEvent.Modifier... modifiers
11491149
);
11501150

1151-
// URLConnection
1152-
1153-
void check$sun_net_www_protocol_file_FileURLConnection$connect(Class<?> callerClass, java.net.URLConnection that);
1154-
1155-
void check$sun_net_www_protocol_file_FileURLConnection$getHeaderFields(Class<?> callerClass, java.net.URLConnection that);
1156-
1157-
void check$sun_net_www_protocol_file_FileURLConnection$getHeaderField(Class<?> callerClass, java.net.URLConnection that, String name);
1158-
1159-
void check$sun_net_www_protocol_file_FileURLConnection$getHeaderField(Class<?> callerClass, java.net.URLConnection that, int n);
1160-
1161-
void check$sun_net_www_protocol_file_FileURLConnection$getContentLength(Class<?> callerClass, java.net.URLConnection that);
1162-
1163-
void check$sun_net_www_protocol_file_FileURLConnection$getContentLengthLong(Class<?> callerClass, java.net.URLConnection that);
1164-
1165-
void check$sun_net_www_protocol_file_FileURLConnection$getHeaderFieldKey(Class<?> callerClass, java.net.URLConnection that, int n);
1166-
1167-
void check$sun_net_www_protocol_file_FileURLConnection$getLastModified(Class<?> callerClass, java.net.URLConnection that);
1168-
1169-
void check$sun_net_www_protocol_file_FileURLConnection$getInputStream(Class<?> callerClass, java.net.URLConnection that);
1170-
11711151
////////////////////
11721152
//
11731153
// Thread management

libs/entitlement/qa/entitled-plugin/src/main/java/org/elasticsearch/entitlement/qa/entitled/EntitledActions.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,4 @@ public static URLConnection createHttpsURLConnection() throws IOException {
7171
public static URLConnection createFtpURLConnection() throws IOException {
7272
return URI.create("ftp://127.0.0.1:12345/").toURL().openConnection();
7373
}
74-
75-
public static URLConnection createFileURLConnection() throws IOException {
76-
var fileUrl = createTempFileForWrite().toUri().toURL();
77-
return fileUrl.openConnection();
78-
}
7974
}

libs/entitlement/qa/entitlement-test-plugin/src/main/java/org/elasticsearch/entitlement/qa/test/RestEntitlementsCheckAction.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,6 @@ static CheckAction alwaysDenied(CheckedRunnable<Exception> action) {
194194
getTestEntries(PathActions.class),
195195
getTestEntries(SpiActions.class),
196196
getTestEntries(SystemActions.class),
197-
getTestEntries(URLConnectionFileActions.class),
198197
getTestEntries(URLConnectionNetworkActions.class),
199198
getTestEntries(VersionSpecificManageThreadsActions.class),
200199
getTestEntries(VersionSpecificNioFileSystemActions.class)

libs/entitlement/qa/entitlement-test-plugin/src/main/java/org/elasticsearch/entitlement/qa/test/URLConnectionFileActions.java

Lines changed: 0 additions & 117 deletions
This file was deleted.

0 commit comments

Comments
 (0)