Skip to content

4.x: ConcurrentHashMap guarding added #9114

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

Merged
merged 2 commits into from
Aug 8, 2024
Merged

4.x: ConcurrentHashMap guarding added #9114

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c2ccb8
ConcurrentHashMap guarding added
Verdent Aug 8, 2024
3af87cd
Checkstyle fix
Verdent Aug 8, 2024
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
79 changes: 59 additions & 20 deletions microprofile/security/src/main/java/io/helidon/microprofile/security/SecurityFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import java.util.List;
import java.util.Map;
import java.util.ServiceLoader;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.locks.ReentrantLock;

import io.helidon.common.HelidonServiceLoader;
import io.helidon.common.config.Config;
Expand Down Expand Up @@ -80,7 +80,11 @@ public class SecurityFilter extends SecurityFilterCommon implements ContainerReq
* sharing among them, the caching for security definitions is first keyed on the
* application class.
*/
private final Map<Class<?>, CacheEntry> applicationClassCache = new ConcurrentHashMap<>();
private final Map<Class<?>, CacheEntry> applicationClassCache = new HashMap<>();
private final ReentrantLock applicationClassCacheLock = new ReentrantLock();
private final ReentrantLock resourceClassSecurityLock = new ReentrantLock();
private final ReentrantLock resourceMethodSecurityLock = new ReentrantLock();
private final ReentrantLock subResourceMethodSecurityLock = new ReentrantLock();

private final SecurityContext securityContext;
private final List<AnnotationAnalyzer> analyzers = new LinkedList<>();
Expand Down Expand Up @@ -409,8 +413,13 @@ private SecurityDefinition getMethodSecurity(InvokedResource invokedResource,

String fullPath = fullPathBuilder.toString();
// now full path can be used as a cache
if (subResourceMethodSecurity(appRealClass).containsKey(fullPath)) {
return subResourceMethodSecurity(appRealClass).get(fullPath);
try {
subResourceMethodSecurityLock.lock();
if (subResourceMethodSecurity(appRealClass).containsKey(fullPath)) {
return subResourceMethodSecurity(appRealClass).get(fullPath);
}
} finally {
subResourceMethodSecurityLock.unlock();
}

// now process each definition method and class
Expand Down Expand Up @@ -438,16 +447,25 @@ private SecurityDefinition getMethodSecurity(InvokedResource invokedResource,
current = methodDef;
}

subResourceMethodSecurity(appRealClass).put(fullPath, current);
try {
subResourceMethodSecurityLock.lock();
subResourceMethodSecurity(appRealClass).put(fullPath, current);
} finally {
subResourceMethodSecurityLock.unlock();
}
return current;
}

if (resourceMethodSecurity(appRealClass).containsKey(definitionMethod)) {
return resourceMethodSecurity(appRealClass).get(definitionMethod);
try {
resourceMethodSecurityLock.lock();
if (resourceMethodSecurity(appRealClass).containsKey(definitionMethod)) {
return resourceMethodSecurity(appRealClass).get(definitionMethod);
}
} finally {
resourceMethodSecurityLock.unlock();
}

SecurityDefinition resClassSecurity = resourceClassSecurity(appRealClass)
.computeIfAbsent(definitionClass, aClass -> securityForClass(definitionClass, appClassSecurity));
SecurityDefinition resClassSecurity = obtainClassSecurityDefinition(appRealClass, appClassSecurity, definitionClass);


SecurityDefinition methodDef = processMethod(resClassSecurity, definitionMethod);
Expand All @@ -461,8 +479,12 @@ private SecurityDefinition getMethodSecurity(InvokedResource invokedResource,
.withMethodName(definitionMethod.getName())
.withMethodAnnotations(methodLevelAnnotations)
.build());

resourceMethodSecurity(appRealClass).put(definitionMethod, methodDef);
try {
resourceMethodSecurityLock.lock();
resourceMethodSecurity(appRealClass).put(definitionMethod, methodDef);
} finally {
resourceMethodSecurityLock.unlock();
}

for (AnnotationAnalyzer analyzer : analyzers) {
AnnotationAnalyzer.AnalyzerResponse analyzerResponse = analyzer.analyze(definitionMethod,
Expand All @@ -474,6 +496,18 @@ private SecurityDefinition getMethodSecurity(InvokedResource invokedResource,
return methodDef;
}

private SecurityDefinition obtainClassSecurityDefinition(Class<?> appRealClass, SecurityDefinition appClassSecurity,
Class<?> definitionClass) {
Map<Class<?>, SecurityDefinition> classSecurityDefinitionMap = resourceClassSecurity(appRealClass);
try {
resourceClassSecurityLock.lock();
return classSecurityDefinitionMap.computeIfAbsent(definitionClass,
aClass -> securityForClass(definitionClass, appClassSecurity));
} finally {
resourceClassSecurityLock.unlock();
}
}

private void addCustomAnnotations(Map<Class<? extends Annotation>, List<Annotation>> customAnnotsMap, Class<?> theClass) {
Annotation[] annotations = theClass.getAnnotations();
for (Annotation annotation : annotations) {
Expand Down Expand Up @@ -516,18 +550,23 @@ private static SecurityDefinition processMethod(SecurityDefinition current, Meth
*/
private static class CacheEntry {
private SecurityDefinition appClassSecurity;
private final Map<Class<?>, SecurityDefinition> resourceClassSecurity = new ConcurrentHashMap<>();
private final Map<Method, SecurityDefinition> resourceMethodSecurity = new ConcurrentHashMap<>();
private final Map<String, SecurityDefinition> subResourceMethodSecurity = new ConcurrentHashMap<>();
private final Map<Class<?>, SecurityDefinition> resourceClassSecurity = new HashMap<>();
private final Map<Method, SecurityDefinition> resourceMethodSecurity = new HashMap<>();
private final Map<String, SecurityDefinition> subResourceMethodSecurity = new HashMap<>();
}

private CacheEntry appClassCacheEntry(Class<?> appClass) {
return applicationClassCache.computeIfAbsent(appClass, c -> {
SecurityDefinition appClassSecurity = securityForClass(c, null);
CacheEntry entry = new CacheEntry();
entry.appClassSecurity = appClassSecurity;
return entry;
});
try {
applicationClassCacheLock.lock();
return applicationClassCache.computeIfAbsent(appClass, c -> {
SecurityDefinition appClassSecurity = securityForClass(c, null);
CacheEntry entry = new CacheEntry();
entry.appClassSecurity = appClassSecurity;
return entry;
});
} finally {
applicationClassCacheLock.unlock();
}
}

private SecurityDefinition appClassSecurity(Class<?> appClass) {
Expand Down