Merge branch '5.8.x' into 6.0.x
This commit is contained in:
commit
c6c091b12e
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright 2002-2021 the original author or authors.
|
* Copyright 2002-2023 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
@ -17,6 +17,7 @@
|
||||||
package org.springframework.security.authorization.method;
|
package org.springframework.security.authorization.method;
|
||||||
|
|
||||||
import java.lang.annotation.Annotation;
|
import java.lang.annotation.Annotation;
|
||||||
|
import java.lang.reflect.Executable;
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
|
|
||||||
import org.springframework.core.annotation.AnnotationConfigurationException;
|
import org.springframework.core.annotation.AnnotationConfigurationException;
|
||||||
|
@ -96,6 +97,10 @@ final class AuthorizationAnnotationUtils {
|
||||||
Class<A> annotationType) {
|
Class<A> annotationType) {
|
||||||
boolean alreadyFound = false;
|
boolean alreadyFound = false;
|
||||||
for (MergedAnnotation<Annotation> mergedAnnotation : mergedAnnotations) {
|
for (MergedAnnotation<Annotation> mergedAnnotation : mergedAnnotations) {
|
||||||
|
if (isSynthetic(mergedAnnotation.getSource())) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (mergedAnnotation.getType() == annotationType) {
|
if (mergedAnnotation.getType() == annotationType) {
|
||||||
if (alreadyFound) {
|
if (alreadyFound) {
|
||||||
return true;
|
return true;
|
||||||
|
@ -106,6 +111,14 @@ final class AuthorizationAnnotationUtils {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static boolean isSynthetic(Object object) {
|
||||||
|
if (object instanceof Executable) {
|
||||||
|
return ((Executable) object).isSynthetic();
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
private AuthorizationAnnotationUtils() {
|
private AuthorizationAnnotationUtils() {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,58 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2002-2023 the original author or authors.
|
||||||
|
*
|
||||||
|
* Licensed 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
|
||||||
|
*
|
||||||
|
* https://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.springframework.security.authorization.method;
|
||||||
|
|
||||||
|
import java.lang.reflect.Method;
|
||||||
|
import java.lang.reflect.Proxy;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
import org.springframework.security.access.prepost.PreAuthorize;
|
||||||
|
|
||||||
|
import static org.assertj.core.api.Assertions.assertThatNoException;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Tests for {@link AuthorizationAnnotationUtils}
|
||||||
|
*/
|
||||||
|
class AuthorizationAnnotationUtilsTests {
|
||||||
|
|
||||||
|
@Test // gh-13132
|
||||||
|
void annotationsOnSyntheticMethodsShouldNotTriggerAnnotationConfigurationException() throws NoSuchMethodException {
|
||||||
|
StringRepository proxy = (StringRepository) Proxy.newProxyInstance(
|
||||||
|
Thread.currentThread().getContextClassLoader(), new Class[] { StringRepository.class },
|
||||||
|
(p, m, args) -> null);
|
||||||
|
Method method = proxy.getClass().getDeclaredMethod("findAll");
|
||||||
|
assertThatNoException()
|
||||||
|
.isThrownBy(() -> AuthorizationAnnotationUtils.findUniqueAnnotation(method, PreAuthorize.class));
|
||||||
|
}
|
||||||
|
|
||||||
|
private interface BaseRepository<T> {
|
||||||
|
|
||||||
|
Iterable<T> findAll();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private interface StringRepository extends BaseRepository<String> {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@PreAuthorize("hasRole('someRole')")
|
||||||
|
List<String> findAll();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Loading…
Reference in New Issue