lprimak commented on code in PR #2917:
URL: https://github.com/apache/shiro/pull/2917#discussion_r4341423807
##########
support/jaxrs/src/main/java/org/apache/shiro/web/jaxrs/ShiroAnnotationFilterFeature.java:
##########
@@ -32,50 +29,33 @@
import jakarta.ws.rs.core.FeatureContext;
import java.lang.annotation.Annotation;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import jakarta.annotation.security.DenyAll;
-import jakarta.annotation.security.PermitAll;
-import jakarta.annotation.security.RolesAllowed;
import static
org.apache.shiro.web.jaxrs.SubjectPrincipalRequestFilter.SHIRO_WEB_JAXRS_DISABLE_PRINCIPAL_PARAM;
/**
* Wraps {@link AuthorizationFilter filters} around JAX-RS resources that are
annotated with Shiro annotations.
+ * Annotations are resolved on the resource method, the resource class, their
supertypes and interfaces, and as
+ * meta-annotations, see {@link
AnnotationHierarchy#findAnnotation(java.lang.reflect.Method, Class, Class)}.
*
* @since 1.4
*/
public class ShiroAnnotationFilterFeature implements DynamicFeature {
- private static final List<Class<? extends Annotation>> SHIRO_ANNOTATIONS =
List.of(
- RequiresPermissions.class,
- RequiresRoles.class,
- RequiresAuthentication.class,
- RequiresUser.class,
- RequiresGuest.class);
-
- private static final List<Class<? extends Annotation>> JSR_250_ANNOTATIONS
= List.of(
- RolesAllowed.class, PermitAll.class, DenyAll.class);
-
@Override
public void configure(ResourceInfo resourceInfo, FeatureContext context) {
List<Annotation> authzSpecs = new ArrayList<>();
- var annotations = SHIRO_ANNOTATIONS;
+ Collection<Class<? extends Annotation>> annotations =
AuthorizationAnnotations.shiroTypes();
if
(Boolean.TRUE.equals(context.getConfiguration().getProperty(SHIRO_WEB_JAXRS_DISABLE_PRINCIPAL_PARAM)))
{
- annotations = Stream.concat(SHIRO_ANNOTATIONS.stream(),
JSR_250_ANNOTATIONS.stream())
- .collect(Collectors.toList());
+ annotations = AuthorizationAnnotations.allTypes();
}
for (Class<? extends Annotation> annotationClass : annotations) {
- // XXX What is the performance of getAnnotation vs getAnnotations?
- Annotation methodAuthzSpec =
resourceInfo.getResourceMethod().getAnnotation(annotationClass);
- Annotation classAuthzSpec =
resourceInfo.getResourceClass().getAnnotation(annotationClass);
-
- if (methodAuthzSpec != null) {
- authzSpecs.add(methodAuthzSpec);
- } else if (classAuthzSpec != null) {
- authzSpecs.add(classAuthzSpec);
+ Annotation authzSpec =
AnnotationHierarchy.findAnnotation(resourceInfo.getResourceMethod(),
+ resourceInfo.getResourceClass(), annotationClass);
+ if (authzSpec != null) {
+ authzSpecs.add(authzSpec);
}
Review Comment:
This was already looked at.
This path only reads annotation metadata via reflection. It never
instantiates or invokes anything an annotation refers to. Enforcement handlers
come from the fixed registry in AuthorizationAnnotations (the Shiro annotations
plus JSR-250 when present). Any other annotation type is ignored by the feature
and rejected by AnnotationAuthorizationFilter. All of this already has tests.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
