Skip to content

Commit d8043dc

Browse files
ngocnhan-tran1996jzheaux
ngocnhan-tran1996
authored and
jzheaux
committed
Remove PrePostTemplateDefaults
Closes gh-17296 Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
1 parent 21036c9 commit d8043dc

14 files changed

+22
-270
lines changed

‎config/src/main/java/org/springframework/security/config/annotation/method/configuration/PrePostMethodSecurityConfiguration.java‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2024 the original author or authors.
2+
* Copyright 2002-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -46,7 +46,6 @@
4646
import org.springframework.security.authorization.method.PostFilterAuthorizationMethodInterceptor;
4747
import org.springframework.security.authorization.method.PreAuthorizeAuthorizationManager;
4848
import org.springframework.security.authorization.method.PreFilterAuthorizationMethodInterceptor;
49-
import org.springframework.security.authorization.method.PrePostTemplateDefaults;
5049
import org.springframework.security.config.ObjectPostProcessor;
5150
import org.springframework.security.config.core.GrantedAuthorityDefaults;
5251
import org.springframework.security.core.annotation.AnnotationTemplateExpressionDefaults;
@@ -130,14 +129,6 @@ void setTemplateDefaults(AnnotationTemplateExpressionDefaults templateDefaults)
130129
this.postFilterMethodInterceptor.setTemplateDefaults(templateDefaults);
131130
}
132131

133-
@Autowired(required = false)
134-
void setTemplateDefaults(PrePostTemplateDefaults templateDefaults) {
135-
this.preFilterMethodInterceptor.setTemplateDefaults(templateDefaults);
136-
this.preAuthorizeAuthorizationManager.setTemplateDefaults(templateDefaults);
137-
this.postAuthorizeAuthorizationManager.setTemplateDefaults(templateDefaults);
138-
this.postFilterMethodInterceptor.setTemplateDefaults(templateDefaults);
139-
}
140-
141132
@Autowired(required = false)
142133
void setExpressionHandler(MethodSecurityExpressionHandler expressionHandler) {
143134
this.preFilterMethodInterceptor.setExpressionHandler(expressionHandler);

‎config/src/main/java/org/springframework/security/config/annotation/method/configuration/ReactiveAuthorizationManagerMethodSecurityConfiguration.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import org.springframework.security.authorization.method.PostFilterAuthorizationReactiveMethodInterceptor;
4343
import org.springframework.security.authorization.method.PreAuthorizeReactiveAuthorizationManager;
4444
import org.springframework.security.authorization.method.PreFilterAuthorizationReactiveMethodInterceptor;
45-
import org.springframework.security.authorization.method.PrePostTemplateDefaults;
4645
import org.springframework.security.config.ObjectPostProcessor;
4746
import org.springframework.security.config.core.GrantedAuthorityDefaults;
4847
import org.springframework.security.core.annotation.AnnotationTemplateExpressionDefaults;
@@ -112,14 +111,6 @@ public void setApplicationContext(ApplicationContext context) throws BeansExcept
112111
this.postAuthorizeAuthorizationManager.setApplicationContext(context);
113112
}
114113

115-
@Autowired(required = false)
116-
void setTemplateDefaults(PrePostTemplateDefaults templateDefaults) {
117-
this.preFilterMethodInterceptor.setTemplateDefaults(templateDefaults);
118-
this.preAuthorizeAuthorizationManager.setTemplateDefaults(templateDefaults);
119-
this.postAuthorizeAuthorizationManager.setTemplateDefaults(templateDefaults);
120-
this.postFilterMethodInterceptor.setTemplateDefaults(templateDefaults);
121-
}
122-
123114
@Autowired(required = false)
124115
void setTemplateDefaults(AnnotationTemplateExpressionDefaults templateDefaults) {
125116
this.preFilterMethodInterceptor.setTemplateDefaults(templateDefaults);

‎config/src/test/java/org/springframework/security/config/annotation/method/configuration/PrePostMethodSecurityConfigurationTests.java‎

Lines changed: 8 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@
103103
import org.springframework.security.authorization.method.AuthorizeReturnObject;
104104
import org.springframework.security.authorization.method.MethodAuthorizationDeniedHandler;
105105
import org.springframework.security.authorization.method.MethodInvocationResult;
106-
import org.springframework.security.authorization.method.PrePostTemplateDefaults;
107106
import org.springframework.security.config.annotation.SecurityContextChangedListenerConfig;
108107
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
109108
import org.springframework.security.config.core.GrantedAuthorityDefaults;
@@ -665,7 +664,7 @@ public void allAnnotationsWhenAdviceAfterAllOffsetThenReturnsFilteredList() {
665664
}
666665

667666
@ParameterizedTest
668-
@ValueSource(classes = { LegacyMetaAnnotationPlaceholderConfig.class, MetaAnnotationPlaceholderConfig.class })
667+
@ValueSource(classes = { MetaAnnotationPlaceholderConfig.class })
669668
@WithMockUser
670669
public void methodeWhenParameterizedPreAuthorizeMetaAnnotationThenPasses(Class<?> config) {
671670
this.spring.register(config).autowire();
@@ -674,7 +673,7 @@ public void methodeWhenParameterizedPreAuthorizeMetaAnnotationThenPasses(Class<?
674673
}
675674

676675
@ParameterizedTest
677-
@ValueSource(classes = { LegacyMetaAnnotationPlaceholderConfig.class, MetaAnnotationPlaceholderConfig.class })
676+
@ValueSource(classes = { MetaAnnotationPlaceholderConfig.class })
678677
@WithMockUser
679678
public void methodRoleWhenPreAuthorizeMetaAnnotationHardcodedParameterThenPasses(Class<?> config) {
680679
this.spring.register(config).autowire();
@@ -683,7 +682,7 @@ public void methodRoleWhenPreAuthorizeMetaAnnotationHardcodedParameterThenPasses
683682
}
684683

685684
@ParameterizedTest
686-
@ValueSource(classes = { LegacyMetaAnnotationPlaceholderConfig.class, MetaAnnotationPlaceholderConfig.class })
685+
@ValueSource(classes = { MetaAnnotationPlaceholderConfig.class })
687686
public void methodWhenParameterizedAnnotationThenFails(Class<?> config) {
688687
this.spring.register(config).autowire();
689688
MetaAnnotationService service = this.spring.getContext().getBean(MetaAnnotationService.class);
@@ -692,7 +691,7 @@ public void methodWhenParameterizedAnnotationThenFails(Class<?> config) {
692691
}
693692

694693
@ParameterizedTest
695-
@ValueSource(classes = { LegacyMetaAnnotationPlaceholderConfig.class, MetaAnnotationPlaceholderConfig.class })
694+
@ValueSource(classes = { MetaAnnotationPlaceholderConfig.class })
696695
@WithMockUser(authorities = "SCOPE_message:read")
697696
public void methodWhenMultiplePlaceholdersHasAuthorityThenPasses(Class<?> config) {
698697
this.spring.register(config).autowire();
@@ -701,7 +700,7 @@ public void methodWhenMultiplePlaceholdersHasAuthorityThenPasses(Class<?> config
701700
}
702701

703702
@ParameterizedTest
704-
@ValueSource(classes = { LegacyMetaAnnotationPlaceholderConfig.class, MetaAnnotationPlaceholderConfig.class })
703+
@ValueSource(classes = { MetaAnnotationPlaceholderConfig.class })
705704
@WithMockUser(roles = "ADMIN")
706705
public void methodWhenMultiplePlaceholdersHasRoleThenPasses(Class<?> config) {
707706
this.spring.register(config).autowire();
@@ -710,7 +709,7 @@ public void methodWhenMultiplePlaceholdersHasRoleThenPasses(Class<?> config) {
710709
}
711710

712711
@ParameterizedTest
713-
@ValueSource(classes = { LegacyMetaAnnotationPlaceholderConfig.class, MetaAnnotationPlaceholderConfig.class })
712+
@ValueSource(classes = { MetaAnnotationPlaceholderConfig.class })
714713
@WithMockUser
715714
public void methodWhenPostAuthorizeMetaAnnotationThenAuthorizes(Class<?> config) {
716715
this.spring.register(config).autowire();
@@ -721,7 +720,7 @@ public void methodWhenPostAuthorizeMetaAnnotationThenAuthorizes(Class<?> config)
721720
}
722721

723722
@ParameterizedTest
724-
@ValueSource(classes = { LegacyMetaAnnotationPlaceholderConfig.class, MetaAnnotationPlaceholderConfig.class })
723+
@ValueSource(classes = { MetaAnnotationPlaceholderConfig.class })
725724
@WithMockUser
726725
public void methodWhenPreFilterMetaAnnotationThenFilters(Class<?> config) {
727726
this.spring.register(config).autowire();
@@ -731,7 +730,7 @@ public void methodWhenPreFilterMetaAnnotationThenFilters(Class<?> config) {
731730
}
732731

733732
@ParameterizedTest
734-
@ValueSource(classes = { LegacyMetaAnnotationPlaceholderConfig.class, MetaAnnotationPlaceholderConfig.class })
733+
@ValueSource(classes = { MetaAnnotationPlaceholderConfig.class })
735734
@WithMockUser
736735
public void methodWhenPostFilterMetaAnnotationThenFilters(Class<?> config) {
737736
this.spring.register(config).autowire();
@@ -993,18 +992,6 @@ void preAuthorizeWhenDeniedAndHandlerWithCustomAnnotationInClassThenHandlerCanUs
993992
assertThat(result).isEqualTo("classmask");
994993
}
995994

996-
@Test
997-
@WithMockUser
998-
void postAuthorizeWhenNullDeniedMetaAnnotationThanWorks() {
999-
this.spring
1000-
.register(MethodSecurityServiceEnabledConfig.class, LegacyMetaAnnotationPlaceholderConfig.class,
1001-
MethodSecurityService.NullPostProcessor.class)
1002-
.autowire();
1003-
MethodSecurityService service = this.spring.getContext().getBean(MethodSecurityService.class);
1004-
String result = service.postAuthorizeDeniedWithNullDenied();
1005-
assertThat(result).isNull();
1006-
}
1007-
1008995
@Test
1009996
@WithMockUser
1010997
void postAuthorizeWhenDeniedAndHandlerWithCustomAnnotationThenHandlerCanUseMaskFromOtherAnnotation() {
@@ -1687,22 +1674,6 @@ Authz authz() {
16871674

16881675
}
16891676

1690-
@Configuration
1691-
@EnableMethodSecurity
1692-
static class LegacyMetaAnnotationPlaceholderConfig {
1693-
1694-
@Bean
1695-
PrePostTemplateDefaults methodSecurityDefaults() {
1696-
return new PrePostTemplateDefaults();
1697-
}
1698-
1699-
@Bean
1700-
MetaAnnotationService metaAnnotationService() {
1701-
return new MetaAnnotationService();
1702-
}
1703-
1704-
}
1705-
17061677
@Configuration
17071678
@EnableMethodSecurity
17081679
static class MetaAnnotationPlaceholderConfig {

‎config/src/test/java/org/springframework/security/config/annotation/method/configuration/PrePostReactiveMethodSecurityConfigurationTests.java‎

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
import org.springframework.security.authorization.method.AuthorizationAdvisorProxyFactory;
5959
import org.springframework.security.authorization.method.AuthorizationAdvisorProxyFactory.TargetVisitor;
6060
import org.springframework.security.authorization.method.AuthorizeReturnObject;
61-
import org.springframework.security.authorization.method.PrePostTemplateDefaults;
6261
import org.springframework.security.config.test.SpringTestContext;
6362
import org.springframework.security.config.test.SpringTestContextExtension;
6463
import org.springframework.security.core.Authentication;
@@ -269,7 +268,7 @@ public void preAuthorizeWhenCustomMethodSecurityExpressionHandlerThenUses() {
269268
}
270269

271270
@ParameterizedTest
272-
@ValueSource(classes = { LegacyMetaAnnotationPlaceholderConfig.class, MetaAnnotationPlaceholderConfig.class })
271+
@ValueSource(classes = { MetaAnnotationPlaceholderConfig.class })
273272
@WithMockUser
274273
public void methodeWhenParameterizedPreAuthorizeMetaAnnotationThenPasses(Class<?> config) {
275274
this.spring.register(config).autowire();
@@ -278,7 +277,7 @@ public void methodeWhenParameterizedPreAuthorizeMetaAnnotationThenPasses(Class<?
278277
}
279278

280279
@ParameterizedTest
281-
@ValueSource(classes = { LegacyMetaAnnotationPlaceholderConfig.class, MetaAnnotationPlaceholderConfig.class })
280+
@ValueSource(classes = { MetaAnnotationPlaceholderConfig.class })
282281
@WithMockUser
283282
public void methodRoleWhenPreAuthorizeMetaAnnotationHardcodedParameterThenPasses(Class<?> config) {
284283
this.spring.register(config).autowire();
@@ -287,7 +286,7 @@ public void methodRoleWhenPreAuthorizeMetaAnnotationHardcodedParameterThenPasses
287286
}
288287

289288
@ParameterizedTest
290-
@ValueSource(classes = { LegacyMetaAnnotationPlaceholderConfig.class, MetaAnnotationPlaceholderConfig.class })
289+
@ValueSource(classes = { MetaAnnotationPlaceholderConfig.class })
291290
public void methodWhenParameterizedAnnotationThenFails(Class<?> config) {
292291
this.spring.register(config).autowire();
293292
MetaAnnotationService service = this.spring.getContext().getBean(MetaAnnotationService.class);
@@ -296,7 +295,7 @@ public void methodWhenParameterizedAnnotationThenFails(Class<?> config) {
296295
}
297296

298297
@ParameterizedTest
299-
@ValueSource(classes = { LegacyMetaAnnotationPlaceholderConfig.class, MetaAnnotationPlaceholderConfig.class })
298+
@ValueSource(classes = { MetaAnnotationPlaceholderConfig.class })
300299
@WithMockUser(authorities = "SCOPE_message:read")
301300
public void methodWhenMultiplePlaceholdersHasAuthorityThenPasses(Class<?> config) {
302301
this.spring.register(config).autowire();
@@ -305,7 +304,7 @@ public void methodWhenMultiplePlaceholdersHasAuthorityThenPasses(Class<?> config
305304
}
306305

307306
@ParameterizedTest
308-
@ValueSource(classes = { LegacyMetaAnnotationPlaceholderConfig.class, MetaAnnotationPlaceholderConfig.class })
307+
@ValueSource(classes = { MetaAnnotationPlaceholderConfig.class })
309308
@WithMockUser(roles = "ADMIN")
310309
public void methodWhenMultiplePlaceholdersHasRoleThenPasses(Class<?> config) {
311310
this.spring.register(config).autowire();
@@ -314,7 +313,7 @@ public void methodWhenMultiplePlaceholdersHasRoleThenPasses(Class<?> config) {
314313
}
315314

316315
@ParameterizedTest
317-
@ValueSource(classes = { LegacyMetaAnnotationPlaceholderConfig.class, MetaAnnotationPlaceholderConfig.class })
316+
@ValueSource(classes = { MetaAnnotationPlaceholderConfig.class })
318317
@WithMockUser
319318
public void methodWhenPostAuthorizeMetaAnnotationThenAuthorizes(Class<?> config) {
320319
this.spring.register(config).autowire();
@@ -325,7 +324,7 @@ public void methodWhenPostAuthorizeMetaAnnotationThenAuthorizes(Class<?> config)
325324
}
326325

327326
@ParameterizedTest
328-
@ValueSource(classes = { LegacyMetaAnnotationPlaceholderConfig.class, MetaAnnotationPlaceholderConfig.class })
327+
@ValueSource(classes = { MetaAnnotationPlaceholderConfig.class })
329328
@WithMockUser
330329
public void methodWhenPreFilterMetaAnnotationThenFilters(Class<?> config) {
331330
this.spring.register(config).autowire();
@@ -335,7 +334,7 @@ public void methodWhenPreFilterMetaAnnotationThenFilters(Class<?> config) {
335334
}
336335

337336
@ParameterizedTest
338-
@ValueSource(classes = { LegacyMetaAnnotationPlaceholderConfig.class, MetaAnnotationPlaceholderConfig.class })
337+
@ValueSource(classes = { MetaAnnotationPlaceholderConfig.class })
339338
@WithMockUser
340339
public void methodWhenPostFilterMetaAnnotationThenFilters(Class<?> config) {
341340
this.spring.register(config).autowire();
@@ -564,22 +563,6 @@ static DefaultMethodSecurityExpressionHandler methodSecurityExpressionHandler(
564563

565564
}
566565

567-
@Configuration
568-
@EnableReactiveMethodSecurity
569-
static class LegacyMetaAnnotationPlaceholderConfig {
570-
571-
@Bean
572-
PrePostTemplateDefaults methodSecurityDefaults() {
573-
return new PrePostTemplateDefaults();
574-
}
575-
576-
@Bean
577-
MetaAnnotationService metaAnnotationService() {
578-
return new MetaAnnotationService();
579-
}
580-
581-
}
582-
583566
@Configuration
584567
@EnableReactiveMethodSecurity
585568
static class MetaAnnotationPlaceholderConfig {

‎core/src/main/java/org/springframework/security/authorization/method/AbstractExpressionAttributeRegistry.java‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2024 the original author or authors.
2+
* Copyright 2002-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -77,13 +77,6 @@ void setExpressionHandler(MethodSecurityExpressionHandler expressionHandler) {
7777
this.expressionHandler = expressionHandler;
7878
}
7979

80-
@Deprecated
81-
void setTemplateDefaults(PrePostTemplateDefaults defaults) {
82-
AnnotationTemplateExpressionDefaults adapter = new AnnotationTemplateExpressionDefaults();
83-
adapter.setIgnoreUnknown(defaults.isIgnoreUnknown());
84-
setTemplateDefaults(adapter);
85-
}
86-
8780
abstract void setTemplateDefaults(AnnotationTemplateExpressionDefaults adapter);
8881

8982
/**

‎core/src/main/java/org/springframework/security/authorization/method/PostAuthorizeAuthorizationManager.java‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -51,21 +51,6 @@ public void setExpressionHandler(MethodSecurityExpressionHandler expressionHandl
5151
this.registry.setExpressionHandler(expressionHandler);
5252
}
5353

54-
/**
55-
* Configure pre/post-authorization template resolution
56-
* <p>
57-
* By default, this value is <code>null</code>, which indicates that templates should
58-
* not be resolved.
59-
* @param defaults - whether to resolve pre/post-authorization templates parameters
60-
* @since 6.3
61-
* @deprecated Please use
62-
* {@link #setTemplateDefaults(AnnotationTemplateExpressionDefaults)} instead
63-
*/
64-
@Deprecated
65-
public void setTemplateDefaults(PrePostTemplateDefaults defaults) {
66-
this.registry.setTemplateDefaults(defaults);
67-
}
68-
6954
/**
7055
* Configure pre/post-authorization template resolution
7156
* <p>

‎core/src/main/java/org/springframework/security/authorization/method/PostAuthorizeReactiveAuthorizationManager.java‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,21 +52,6 @@ public PostAuthorizeReactiveAuthorizationManager(MethodSecurityExpressionHandler
5252
this.registry.setExpressionHandler(expressionHandler);
5353
}
5454

55-
/**
56-
* Configure pre/post-authorization template resolution
57-
* <p>
58-
* By default, this value is <code>null</code>, which indicates that templates should
59-
* not be resolved.
60-
* @param defaults - whether to resolve pre/post-authorization templates parameters
61-
* @since 6.3
62-
* @deprecated please use
63-
* {@link #setTemplateDefaults(AnnotationTemplateExpressionDefaults)}
64-
*/
65-
@Deprecated
66-
public void setTemplateDefaults(PrePostTemplateDefaults defaults) {
67-
this.registry.setTemplateDefaults(defaults);
68-
}
69-
7055
/**
7156
* Configure pre/post-authorization template resolution
7257
* <p>

‎core/src/main/java/org/springframework/security/authorization/method/PostFilterAuthorizationMethodInterceptor.java‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2024 the original author or authors.
2+
* Copyright 2002-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -67,20 +67,6 @@ public void setExpressionHandler(MethodSecurityExpressionHandler expressionHandl
6767
this.registry.setExpressionHandler(expressionHandler);
6868
}
6969

70-
/**
71-
* Configure pre/post-authorization template resolution
72-
* <p>
73-
* By default, this value is <code>null</code>, which indicates that templates should
74-
* not be resolved.
75-
* @param defaults - whether to resolve pre/post-authorization templates parameters
76-
* @since 6.3
77-
* @deprecated Please use {@link AnnotationTemplateExpressionDefaults} instead
78-
*/
79-
@Deprecated
80-
public void setTemplateDefaults(PrePostTemplateDefaults defaults) {
81-
this.registry.setTemplateDefaults(defaults);
82-
}
83-
8470
/**
8571
* Configure pre/post-authorization template resolution
8672
* <p>

‎core/src/main/java/org/springframework/security/authorization/method/PostFilterAuthorizationReactiveMethodInterceptor.java‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2022 the original author or authors.
2+
* Copyright 2002-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -67,21 +67,6 @@ public PostFilterAuthorizationReactiveMethodInterceptor(MethodSecurityExpression
6767
this.registry.setExpressionHandler(expressionHandler);
6868
}
6969

70-
/**
71-
* Configure pre/post-authorization template resolution
72-
* <p>
73-
* By default, this value is <code>null</code>, which indicates that templates should
74-
* not be resolved.
75-
* @param defaults - whether to resolve pre/post-authorization templates parameters
76-
* @since 6.3
77-
* @deprecated please use
78-
* {@link #setTemplateDefaults(AnnotationTemplateExpressionDefaults)}
79-
*/
80-
@Deprecated
81-
public void setTemplateDefaults(PrePostTemplateDefaults defaults) {
82-
this.registry.setTemplateDefaults(defaults);
83-
}
84-
8570
/**
8671
* Configure pre/post-authorization template resolution
8772
* <p>

0 commit comments

Comments
 (0)