Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,10 @@ public interface EntitlementChecker {

void check$java_net_URLClassLoader$(Class<?> callerClass, String name, URL[] urls, ClassLoader parent, URLStreamHandlerFactory factory);

void check$java_net_URLClassLoader$$newInstance(Class<?> callerClass, URL[] urls, ClassLoader parent);

void check$java_net_URLClassLoader$$newInstance(Class<?> callerClass, URL[] urls);

void check$java_security_SecureClassLoader$(Class<?> callerClass);

void check$java_security_SecureClassLoader$(Class<?> callerClass, ClassLoader parent);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,13 @@ static void createClassLoader() throws IOException {
}
}

@EntitlementTest(expectedAccess = PLUGINS)
static void createClassLoaderNewInstance() throws IOException {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we also want to test the overload without the parent classloader (if we can!)

try (var classLoader = URLClassLoader.newInstance(new URL[0], RestEntitlementsCheckAction.class.getClassLoader())) {
// intentionally empty, just let the loader close
}
}

@EntitlementTest(expectedAccess = ALWAYS_DENIED)
static void createLogManager() {
new java.util.logging.LogManager() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,16 @@ public ElasticsearchEntitlementChecker(PolicyChecker policyChecker) {
policyChecker.checkCreateClassLoader(callerClass);
}

@Override
public void check$java_net_URLClassLoader$$newInstance(Class<?> callerClass, URL[] urls) {
policyChecker.checkCreateClassLoader(callerClass);
}

@Override
public void check$java_net_URLClassLoader$$newInstance(Class<?> callerClass, URL[] urls, ClassLoader parent) {
policyChecker.checkCreateClassLoader(callerClass);
}

@Override
public void check$java_security_SecureClassLoader$(Class<?> callerClass) {
policyChecker.checkCreateClassLoader(callerClass);
Expand Down