Apache/nifi
1
0
Fork 0
mirror of https://github.com/apache/nifi.git synced 2025-02-09 11:35:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

NIFI-12072 moved to StackWalker API elimnating usage of SecurityManager (#7742)

Browse Source
This commit is contained in:
Joe Witt 2023-09-16 14:05:22 -07:00 committed by GitHub
parent cb03d6de74
commit cbf5bb98f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/nar/NarThreadContextClassLoader.java
View File

@ -54,15 +54,16 @@ import java.util.Collections;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import java.util.Optional;
/** /**
* THREAD SAFE * THREAD SAFE
*/ */
public class NarThreadContextClassLoader extends URLClassLoader { public class NarThreadContextClassLoader extends URLClassLoader {
static final ContextSecurityManager contextSecurityManager = new ContextSecurityManager();
private final ClassLoader forward = ClassLoader.getSystemClassLoader(); private final ClassLoader forward = ClassLoader.getSystemClassLoader();
private static final List<Class<?>> narSpecificClasses = new ArrayList<>(); private static final List<Class<?>> narSpecificClasses = new ArrayList<>();
@ -135,13 +136,6 @@ public class NarThreadContextClassLoader extends URLClassLoader {
} }
private ClassLoader lookupClassLoader() { private ClassLoader lookupClassLoader() {
final Class<?>[] classStack = contextSecurityManager.getExecutionStack();
for (Class<?> currentClass : classStack) {
final Class<?> narClass = findNarClass(currentClass);
if (narClass != null) {
final ClassLoader desiredClassLoader = narClass.getClassLoader();
// When new Threads are created, the new Thread inherits the ClassLoaderContext of // When new Threads are created, the new Thread inherits the ClassLoaderContext of
// the caller. However, the call stack of that new Thread may not trace back to any NiFi-specific // the caller. However, the call stack of that new Thread may not trace back to any NiFi-specific
// code. Therefore, the NarThreadContextClassLoader will be unable to find the appropriate NAR // code. Therefore, the NarThreadContextClassLoader will be unable to find the appropriate NAR
@ -151,13 +145,18 @@ public class NarThreadContextClassLoader extends URLClassLoader {
// the ContextClassLoader back to the NarThreadContextClassLoader as appropriate via the // the ContextClassLoader back to the NarThreadContextClassLoader as appropriate via the
// {@link FlowEngine.beforeExecute(Thread, Runnable)} and // {@link FlowEngine.beforeExecute(Thread, Runnable)} and
// {@link FlowEngine.afterExecute(Thread, Runnable)} methods. // {@link FlowEngine.afterExecute(Thread, Runnable)} methods.
if (desiredClassLoader instanceof NarClassLoader) {
Thread.currentThread().setContextClassLoader(desiredClassLoader); final StackWalker walker = StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE);
} final Optional<ClassLoader> callerClassLoader = walker.walk(s ->
return desiredClassLoader; s.map(StackWalker.StackFrame::getDeclaringClass)
} .map(this::findNarClass)
} .filter(Objects::nonNull)
return forward; .map(Class::getClassLoader)
.map(cl->cl instanceof NarClassLoader ? cl : null)
.filter(Objects::nonNull)
.findFirst());
callerClassLoader.ifPresent(Thread.currentThread()::setContextClassLoader);
return callerClassLoader.orElse(forward);
} }
private Class<?> findNarClass(final Class<?> cls) { private Class<?> findNarClass(final Class<?> cls) {
@ -181,14 +180,6 @@ public class NarThreadContextClassLoader extends URLClassLoader {
return SingletonHolder.instance; return SingletonHolder.instance;
} }
static class ContextSecurityManager extends SecurityManager {
Class<?>[] getExecutionStack() {
return getClassContext();
}
}
/** /**
* Constructs an instance of the given type using either default no args * Constructs an instance of the given type using either default no args
* constructor or a constructor which takes a NiFiProperties object * constructor or a constructor which takes a NiFiProperties object