Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Race condition & memory leak in TypedFilter #9925

Merged
merged 1 commit into from
Nov 2, 2024
Merged

Race condition & memory leak in TypedFilter #9925

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 8 additions & 20 deletions core/src/main/java/jenkins/security/stapler/TypedFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
import hudson.ExtensionList;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import jenkins.util.SystemProperties;
Expand All @@ -25,8 +23,6 @@
public class TypedFilter implements FieldRef.Filter, FunctionList.Filter {
private static final Logger LOGGER = Logger.getLogger(TypedFilter.class.getName());

private static final Map<Class<?>, Boolean> staplerCache = new HashMap<>();

private boolean isClassAcceptable(Class<?> clazz) {
if (clazz.isArray()) {
// special case to allow klass.isArray() dispatcher
Expand All @@ -46,31 +42,23 @@ private boolean isClassAcceptable(Class<?> clazz) {
return false;
}
}
return SKIP_TYPE_CHECK || isStaplerRelevantCached(clazz);
return SKIP_TYPE_CHECK || isStaplerRelevant.get(clazz);
}

private static boolean isStaplerRelevantCached(@NonNull Class<?> clazz) {
if (staplerCache.containsKey(clazz)) {
return staplerCache.get(clazz);
private static final ClassValue<Boolean> isStaplerRelevant = new ClassValue<>() {
@Override
protected Boolean computeValue(Class<?> clazz) {
return isSpecificClassStaplerRelevant(clazz) || isSuperTypesStaplerRelevant(clazz);
Copy link
Member Author

Choose a reason for hiding this comment

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

(hide WS)

}
boolean ret = isStaplerRelevant(clazz);

staplerCache.put(clazz, ret);
return ret;
}

@Restricted(NoExternalUse.class)
public static boolean isStaplerRelevant(@NonNull Class<?> clazz) {
return isSpecificClassStaplerRelevant(clazz) || isSuperTypesStaplerRelevant(clazz);
}
};

private static boolean isSuperTypesStaplerRelevant(@NonNull Class<?> clazz) {
Class<?> superclass = clazz.getSuperclass();
if (superclass != null && isStaplerRelevantCached(superclass)) {
if (superclass != null && isStaplerRelevant.get(superclass)) {
return true;
}
for (Class<?> interfaceClass : clazz.getInterfaces()) {
if (isStaplerRelevantCached(interfaceClass)) {
if (isStaplerRelevant.get(interfaceClass)) {
return true;
}
}
Expand Down
Loading