Skip to content

Commit 663dd2b

Browse files
authored
Delete obsolete SecurityManager testing (#127243) (#127256)
1 parent 5b9fcaa commit 663dd2b

File tree

2 files changed

+0
-28
lines changed

2 files changed

+0
-28
lines changed

server/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import org.elasticsearch.env.Environment;
1919
import org.elasticsearch.env.TestEnvironment;
2020
import org.elasticsearch.index.IndexModule;
21-
import org.elasticsearch.jdk.RuntimeVersionFeature;
2221
import org.elasticsearch.plugin.analysis.CharFilterFactory;
2322
import org.elasticsearch.plugins.scanners.PluginInfo;
2423
import org.elasticsearch.plugins.spi.BarPlugin;
@@ -38,7 +37,6 @@
3837
import java.nio.charset.StandardCharsets;
3938
import java.nio.file.Files;
4039
import java.nio.file.Path;
41-
import java.security.AccessControlException;
4240
import java.util.ArrayList;
4341
import java.util.Arrays;
4442
import java.util.Collection;
@@ -873,22 +871,6 @@ public Reader create(Reader reader) {
873871
}
874872
}
875873

876-
public void testCanCreateAClassLoader() {
877-
assumeTrue("security manager must be available", RuntimeVersionFeature.isSecurityManagerAvailable());
878-
assertEquals(
879-
"access denied (\"java.lang.RuntimePermission\" \"createClassLoader\")",
880-
expectThrows(AccessControlException.class, () -> new Loader(this.getClass().getClassLoader())).getMessage()
881-
);
882-
var loader = PrivilegedOperations.supplierWithCreateClassLoader(() -> new Loader(this.getClass().getClassLoader()));
883-
assertEquals(this.getClass().getClassLoader(), loader.getParent());
884-
}
885-
886-
static final class Loader extends ClassLoader {
887-
Loader(ClassLoader parent) {
888-
super(parent);
889-
}
890-
}
891-
892874
// Closes the URLClassLoaders and UberModuleClassloaders of plugins loaded by the given plugin service.
893875
// We can use the direct ClassLoader from the plugin because tests do not use any parent SPI ClassLoaders.
894876
static void closePluginLoaders(PluginsService pluginService) {

test/framework/src/main/java/org/elasticsearch/test/PrivilegedOperations.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import java.security.PrivilegedExceptionAction;
2727
import java.security.ProtectionDomain;
2828
import java.util.Enumeration;
29-
import java.util.function.Supplier;
3029

3130
import javax.tools.JavaCompiler;
3231

@@ -72,15 +71,6 @@ public static Boolean compilationTaskCall(JavaCompiler.CompilationTask compilati
7271
);
7372
}
7473

75-
public static <T> T supplierWithCreateClassLoader(Supplier<T> supplier) {
76-
return AccessController.doPrivileged(
77-
(PrivilegedAction<T>) () -> supplier.get(),
78-
context,
79-
new RuntimePermission("createClassLoader"),
80-
new RuntimePermission("closeClassLoader")
81-
);
82-
}
83-
8474
@SuppressForbidden(reason = "need to create file permission")
8575
private static FilePermission newAllFilesReadPermission() {
8676
return new FilePermission("<<ALL FILES>>", "read");

0 commit comments

Comments
 (0)