Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/6.3.x'

Browse Source
This commit is contained in:
Josh Cummings
2024-09-04 14:48:23 -06:00
parent c53ee19a83 5c20505b0e
commit c0a10b90ba
2 changed files with 55 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
config/src/test/java/org/springframework/security/config/annotation/method/configuration/PrePostMethodSecurityConfigurationTests.java
View File

@@ -1009,6 +1009,15 @@ public class PrePostMethodSecurityConfigurationTests {
verify(expressionHandler, times(4)).createEvaluationContext(any(Supplier.class), any());
}
// gh-15721
@Test
@WithMockUser(roles = "uid")
public void methodWhenMetaAnnotationPropertiesHasClassProperties() {
this.spring.register(MetaAnnotationPlaceholderConfig.class).autowire();
MetaAnnotationService service = this.spring.getContext().getBean(MetaAnnotationService.class);
assertThat(service.getIdPath("uid")).isEqualTo("uid");
}
private static Consumer<ConfigurableWebApplicationContext> disallowBeanOverriding() {
return (context) -> ((AnnotationConfigWebApplicationContext) context).setAllowBeanDefinitionOverriding(false);
}
@@ -1403,6 +1412,27 @@ public class PrePostMethodSecurityConfigurationTests {
return list;
}
@RestrictedAccess(entityClass = EntityClass.class)
String getIdPath(String id) {
return id;
}
}
@Retention(RetentionPolicy.RUNTIME)
@PreAuthorize("hasRole({idPath})")
@interface RestrictedAccess {
String idPath() default "#id";
Class<?> entityClass();
String[] recipes() default {};
}
static class EntityClass {
}
@Retention(RetentionPolicy.RUNTIME)