Skip to content

Commit 1ec040e

Browse files
eleftheriasrwinch
authored andcommitted
Disable bean proxying in configuration classes
Fixes gh-6967
1 parent 371a3b9 commit 1ec040e

20 files changed

+234
-34
lines changed

config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
* @since 3.2
5858
*
5959
*/
60-
@Configuration
60+
@Configuration(proxyBeanMethods = false)
6161
@Import(ObjectPostProcessorConfiguration.class)
6262
public class AuthenticationConfiguration {
6363

config/src/main/java/org/springframework/security/config/annotation/configuration/ObjectPostProcessorConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2013 the original author or authors.
2+
* Copyright 2002-2019 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.
@@ -33,7 +33,7 @@
3333
* @author Rob Winch
3434
* @since 3.2
3535
*/
36-
@Configuration
36+
@Configuration(proxyBeanMethods = false)
3737
public class ObjectPostProcessorConfiguration {
3838

3939
@Bean

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
* @since 3.2
8080
* @see EnableGlobalMethodSecurity
8181
*/
82-
@Configuration
82+
@Configuration(proxyBeanMethods = false)
8383
public class GlobalMethodSecurityConfiguration
8484
implements ImportAware, SmartInitializingSingleton, BeanFactoryAware {
8585
private static final Log logger = LogFactory

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2016 the original author or authors.
2+
* Copyright 2002-2019 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.
@@ -19,7 +19,7 @@
1919
import org.springframework.context.annotation.Configuration;
2020
import org.springframework.security.access.annotation.Jsr250MethodSecurityMetadataSource;
2121

22-
@Configuration
22+
@Configuration(proxyBeanMethods = false)
2323
class Jsr250MetadataSourceConfiguration {
2424

2525
@Bean

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
* @author Tadaya Tsuyukubo
3939
* @since 5.0
4040
*/
41-
@Configuration
41+
@Configuration(proxyBeanMethods = false)
4242
class ReactiveMethodSecurityConfiguration implements ImportAware {
4343
private int advisorOrder;
4444

config/src/main/java/org/springframework/security/config/annotation/web/configuration/OAuth2ClientConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public String[] selectImports(AnnotationMetadata importingClassMetadata) {
5858
}
5959
}
6060

61-
@Configuration
61+
@Configuration(proxyBeanMethods = false)
6262
static class OAuth2ClientWebMvcSecurityConfiguration implements WebMvcConfigurer {
6363
private ClientRegistrationRepository clientRegistrationRepository;
6464
private OAuth2AuthorizedClientRepository authorizedClientRepository;

config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
* @author Keesun Baik
6464
* @since 3.2
6565
*/
66-
@Configuration
66+
@Configuration(proxyBeanMethods = false)
6767
public class WebSecurityConfiguration implements ImportAware, BeanClassLoaderAware {
6868
private WebSecurity webSecurity;
6969

config/src/main/java/org/springframework/security/config/annotation/web/reactive/ReactiveOAuth2ClientImportSelector.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2018 the original author or authors.
2+
* Copyright 2002-2019 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.
@@ -52,7 +52,7 @@ public String[] selectImports(AnnotationMetadata importingClassMetadata) {
5252
new String[] {};
5353
}
5454

55-
@Configuration
55+
@Configuration(proxyBeanMethods = false)
5656
static class OAuth2ClientWebFluxSecurityConfiguration implements WebFluxConfigurer {
5757
private ReactiveClientRegistrationRepository clientRegistrationRepository;
5858

config/src/main/java/org/springframework/security/config/annotation/web/reactive/ServerHttpSecurityConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
* @author Dan Zheng
4343
* @since 5.0
4444
*/
45-
@Configuration
45+
@Configuration(proxyBeanMethods = false)
4646
class ServerHttpSecurityConfiguration {
4747
private static final String BEAN_NAME_PREFIX = "org.springframework.security.config.annotation.web.reactive.HttpSecurityConfiguration.";
4848
private static final String HTTPSECURITY_BEAN_NAME = BEAN_NAME_PREFIX + "httpSecurity";

config/src/main/java/org/springframework/security/config/annotation/web/reactive/WebFluxSecurityConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
* @author Rob Winch
3939
* @since 5.0
4040
*/
41-
@Configuration
41+
@Configuration(proxyBeanMethods = false)
4242
class WebFluxSecurityConfiguration {
4343
public static final int WEB_FILTER_CHAIN_FILTER_ORDER = 0 - 100;
4444

0 commit comments

Comments
 (0)