bmarwell commented on code in PR #2917: URL: https://github.com/apache/shiro/pull/2917#discussion_r4340871867
########## core/src/main/java/org/apache/shiro/authz/aop/AuthorizationAnnotations.java: ########## @@ -0,0 +1,108 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.shiro.authz.aop; + +import lombok.experimental.UtilityClass; +import org.apache.shiro.aop.AnnotationResolver; +import org.apache.shiro.authz.annotation.RequiresAuthentication; +import org.apache.shiro.authz.annotation.RequiresGuest; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.apache.shiro.authz.annotation.RequiresRoles; +import org.apache.shiro.authz.annotation.RequiresUser; +import org.apache.shiro.lang.util.ClassUtils; + +import java.lang.annotation.Annotation; +import java.util.Collection; +import java.util.List; +import java.util.function.Function; +import java.util.function.Supplier; +import java.util.stream.Stream; + +/** + * The single registry of authorization annotations Shiro understands, with their handlers and method interceptors, + * shared by every integration (Spring, Guice, CDI, JAX-RS, AspectJ). + * <p> + * The five Shiro annotations are always available. The JSR-250 annotations ({@code @RolesAllowed}, + * {@code @PermitAll}, {@code @DenyAll}) are registered only when {@code jakarta.annotation} is on the class path. + * + * @since 3.0.2 + */ +@UtilityClass +@SuppressWarnings("checkstyle:HideUtilityClassConstructor") Review Comment: So you just want to avoid writing a private constructor? ########## core/pom.xml: ########## @@ -112,6 +112,10 @@ <groupId>org.apache.shiro</groupId> <artifactId>shiro-lang</artifactId> </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> Review Comment: -1, I want to get rid of it, really ########## 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: We should look closer into this part, malicious libraries might be able to inject code here? Needs a closer look. -- 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]
