From 79304d6fd99dc940d93a2d9a2d827005430c5b04 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Sat, 22 Oct 2022 06:20:11 -0400 Subject: [PATCH] Add @Configuration with @EnableWebSecurity Closes gh-935 --- .../java/sample/userinfo/EnableUserInfoSecurityConfig.java | 2 +- .../sample/userinfo/jwt/JwtUserInfoMapperSecurityConfig.java | 2 +- .../web/configurers/OAuth2AuthorizationCodeGrantTests.java | 5 +++++ .../configurers/OAuth2AuthorizationServerMetadataTests.java | 2 +- .../web/configurers/OAuth2ClientCredentialsGrantTests.java | 3 +++ .../web/configurers/OAuth2TokenIntrospectionTests.java | 2 ++ .../web/configurers/OAuth2TokenRevocationTests.java | 2 ++ .../web/configurers/OidcClientRegistrationTests.java | 2 ++ .../web/configurers/OidcProviderConfigurationTests.java | 4 ++-- .../config/annotation/web/configurers/OidcUserInfoTests.java | 4 ++++ .../src/main/java/sample/config/DefaultSecurityConfig.java | 2 ++ .../src/main/java/sample/config/DefaultSecurityConfig.java | 2 ++ .../src/main/java/sample/config/DefaultSecurityConfig.java | 2 ++ .../src/main/java/sample/config/SecurityConfig.java | 2 ++ .../src/main/java/sample/config/ResourceServerConfig.java | 2 ++ 15 files changed, 33 insertions(+), 5 deletions(-) diff --git a/docs/src/docs/asciidoc/examples/src/main/java/sample/userinfo/EnableUserInfoSecurityConfig.java b/docs/src/docs/asciidoc/examples/src/main/java/sample/userinfo/EnableUserInfoSecurityConfig.java index 0b30c602..d13425b1 100644 --- a/docs/src/docs/asciidoc/examples/src/main/java/sample/userinfo/EnableUserInfoSecurityConfig.java +++ b/docs/src/docs/asciidoc/examples/src/main/java/sample/userinfo/EnableUserInfoSecurityConfig.java @@ -50,7 +50,7 @@ import org.springframework.security.provisioning.InMemoryUserDetailsManager; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint; -@Configuration +@Configuration(proxyBeanMethods = false) public class EnableUserInfoSecurityConfig { @Bean // <1> diff --git a/docs/src/docs/asciidoc/examples/src/main/java/sample/userinfo/jwt/JwtUserInfoMapperSecurityConfig.java b/docs/src/docs/asciidoc/examples/src/main/java/sample/userinfo/jwt/JwtUserInfoMapperSecurityConfig.java index b0e1fecf..c214f624 100644 --- a/docs/src/docs/asciidoc/examples/src/main/java/sample/userinfo/jwt/JwtUserInfoMapperSecurityConfig.java +++ b/docs/src/docs/asciidoc/examples/src/main/java/sample/userinfo/jwt/JwtUserInfoMapperSecurityConfig.java @@ -57,7 +57,7 @@ import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint; import org.springframework.security.web.util.matcher.RequestMatcher; -@Configuration +@Configuration(proxyBeanMethods = false) public class JwtUserInfoMapperSecurityConfig { @Bean // <1> diff --git a/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2AuthorizationCodeGrantTests.java b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2AuthorizationCodeGrantTests.java index 20bc6fa6..bd2a5e18 100644 --- a/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2AuthorizationCodeGrantTests.java +++ b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2AuthorizationCodeGrantTests.java @@ -45,6 +45,7 @@ import org.mockito.ArgumentCaptor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; @@ -834,6 +835,7 @@ public class OAuth2AuthorizationCodeGrantTests { } @EnableWebSecurity + @Configuration(proxyBeanMethods = false) static class AuthorizationServerConfigurationWithSecurityContextRepository extends AuthorizationServerConfiguration { // @formatter:off @Bean @@ -893,6 +895,7 @@ public class OAuth2AuthorizationCodeGrantTests { } @EnableWebSecurity + @Configuration(proxyBeanMethods = false) static class AuthorizationServerConfigurationCustomConsentPage extends AuthorizationServerConfiguration { // @formatter:off @Bean @@ -917,6 +920,7 @@ public class OAuth2AuthorizationCodeGrantTests { } @EnableWebSecurity + @Configuration(proxyBeanMethods = false) static class AuthorizationServerConfigurationCustomConsentRequest extends AuthorizationServerConfiguration { @Autowired private RegisteredClientRepository registeredClientRepository; @@ -1011,6 +1015,7 @@ public class OAuth2AuthorizationCodeGrantTests { } @EnableWebSecurity + @Configuration(proxyBeanMethods = false) static class AuthorizationServerConfigurationCustomAuthorizationEndpoint extends AuthorizationServerConfiguration { // @formatter:off @Bean diff --git a/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2AuthorizationServerMetadataTests.java b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2AuthorizationServerMetadataTests.java index fc23fdf6..f5d217ee 100644 --- a/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2AuthorizationServerMetadataTests.java +++ b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2AuthorizationServerMetadataTests.java @@ -159,8 +159,8 @@ public class OAuth2AuthorizationServerMetadataTests { } } - @Configuration @EnableWebSecurity + @Configuration(proxyBeanMethods = false) static class AuthorizationServerConfigurationWithMetadataCustomizer extends AuthorizationServerConfiguration { // @formatter:off diff --git a/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2ClientCredentialsGrantTests.java b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2ClientCredentialsGrantTests.java index fb5f4612..10ce58b8 100644 --- a/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2ClientCredentialsGrantTests.java +++ b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2ClientCredentialsGrantTests.java @@ -41,6 +41,7 @@ import org.mockito.ArgumentCaptor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.http.HttpHeaders; import org.springframework.jdbc.core.JdbcOperations; @@ -397,6 +398,7 @@ public class OAuth2ClientCredentialsGrantTests { } @EnableWebSecurity + @Configuration(proxyBeanMethods = false) static class AuthorizationServerConfigurationCustomTokenEndpoint extends AuthorizationServerConfiguration { // @formatter:off @Bean @@ -427,6 +429,7 @@ public class OAuth2ClientCredentialsGrantTests { } @EnableWebSecurity + @Configuration(proxyBeanMethods = false) static class AuthorizationServerConfigurationCustomClientAuthentication extends AuthorizationServerConfiguration { // @formatter:off @Bean diff --git a/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2TokenIntrospectionTests.java b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2TokenIntrospectionTests.java index 2257460e..312ecd5c 100644 --- a/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2TokenIntrospectionTests.java +++ b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2TokenIntrospectionTests.java @@ -36,6 +36,7 @@ import org.mockito.ArgumentCaptor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; @@ -500,6 +501,7 @@ public class OAuth2TokenIntrospectionTests { } @EnableWebSecurity + @Configuration(proxyBeanMethods = false) static class AuthorizationServerConfigurationCustomTokenIntrospectionEndpoint extends AuthorizationServerConfiguration { // @formatter:off diff --git a/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2TokenRevocationTests.java b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2TokenRevocationTests.java index 4c0e240c..df68b9b2 100644 --- a/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2TokenRevocationTests.java +++ b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2TokenRevocationTests.java @@ -33,6 +33,7 @@ import org.mockito.ArgumentCaptor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.http.HttpHeaders; import org.springframework.jdbc.core.JdbcOperations; @@ -320,6 +321,7 @@ public class OAuth2TokenRevocationTests { } @EnableWebSecurity + @Configuration(proxyBeanMethods = false) static class AuthorizationServerConfigurationCustomTokenRevocationEndpoint extends AuthorizationServerConfiguration { // @formatter:off diff --git a/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcClientRegistrationTests.java b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcClientRegistrationTests.java index 6571a186..e2873adb 100644 --- a/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcClientRegistrationTests.java +++ b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcClientRegistrationTests.java @@ -33,6 +33,7 @@ import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -353,6 +354,7 @@ public class OidcClientRegistrationTests { } @EnableWebSecurity + @Configuration(proxyBeanMethods = false) static class AuthorizationServerConfiguration { // @formatter:off diff --git a/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcProviderConfigurationTests.java b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcProviderConfigurationTests.java index 8ef8e83b..627e2fea 100644 --- a/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcProviderConfigurationTests.java +++ b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcProviderConfigurationTests.java @@ -215,8 +215,8 @@ public class OidcProviderConfigurationTests { } - @Configuration @EnableWebSecurity + @Configuration(proxyBeanMethods = false) static class AuthorizationServerConfigurationWithProviderConfigurationCustomizer extends AuthorizationServerConfiguration { // @formatter:off @@ -252,8 +252,8 @@ public class OidcProviderConfigurationTests { } - @Configuration @EnableWebSecurity + @Configuration(proxyBeanMethods = false) static class AuthorizationServerConfigurationWithClientRegistrationEnabled extends AuthorizationServerConfiguration { // @formatter:off diff --git a/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcUserInfoTests.java b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcUserInfoTests.java index 52351bd9..e3874c68 100644 --- a/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcUserInfoTests.java +++ b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcUserInfoTests.java @@ -33,6 +33,7 @@ import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpHeaders; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; @@ -260,6 +261,7 @@ public class OidcUserInfoTests { } @EnableWebSecurity + @Configuration(proxyBeanMethods = false) static class CustomUserInfoConfiguration extends AuthorizationServerConfiguration { @Bean @@ -299,6 +301,7 @@ public class OidcUserInfoTests { } @EnableWebSecurity + @Configuration(proxyBeanMethods = false) static class AuthorizationServerConfigurationWithSecurityContextRepository extends AuthorizationServerConfiguration { @Bean @@ -327,6 +330,7 @@ public class OidcUserInfoTests { } @EnableWebSecurity + @Configuration(proxyBeanMethods = false) static class AuthorizationServerConfiguration { @Bean diff --git a/samples/custom-consent-authorizationserver/src/main/java/sample/config/DefaultSecurityConfig.java b/samples/custom-consent-authorizationserver/src/main/java/sample/config/DefaultSecurityConfig.java index c9a83b4a..7266901a 100644 --- a/samples/custom-consent-authorizationserver/src/main/java/sample/config/DefaultSecurityConfig.java +++ b/samples/custom-consent-authorizationserver/src/main/java/sample/config/DefaultSecurityConfig.java @@ -16,6 +16,7 @@ package sample.config; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.core.userdetails.User; @@ -30,6 +31,7 @@ import static org.springframework.security.config.Customizer.withDefaults; * @author Joe Grandja */ @EnableWebSecurity +@Configuration(proxyBeanMethods = false) public class DefaultSecurityConfig { // @formatter:off diff --git a/samples/default-authorizationserver/src/main/java/sample/config/DefaultSecurityConfig.java b/samples/default-authorizationserver/src/main/java/sample/config/DefaultSecurityConfig.java index debf345c..36c5f7f6 100644 --- a/samples/default-authorizationserver/src/main/java/sample/config/DefaultSecurityConfig.java +++ b/samples/default-authorizationserver/src/main/java/sample/config/DefaultSecurityConfig.java @@ -16,6 +16,7 @@ package sample.config; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.core.userdetails.User; @@ -31,6 +32,7 @@ import static org.springframework.security.config.Customizer.withDefaults; * @since 0.1.0 */ @EnableWebSecurity +@Configuration(proxyBeanMethods = false) public class DefaultSecurityConfig { // @formatter:off diff --git a/samples/federated-identity-authorizationserver/src/main/java/sample/config/DefaultSecurityConfig.java b/samples/federated-identity-authorizationserver/src/main/java/sample/config/DefaultSecurityConfig.java index 8ea0051c..99706e81 100644 --- a/samples/federated-identity-authorizationserver/src/main/java/sample/config/DefaultSecurityConfig.java +++ b/samples/federated-identity-authorizationserver/src/main/java/sample/config/DefaultSecurityConfig.java @@ -19,6 +19,7 @@ import sample.security.FederatedIdentityConfigurer; import sample.security.UserRepositoryOAuth2UserHandler; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; @@ -33,6 +34,7 @@ import org.springframework.security.web.SecurityFilterChain; * @since 0.2.3 */ @EnableWebSecurity +@Configuration(proxyBeanMethods = false) public class DefaultSecurityConfig { // @formatter:off diff --git a/samples/messages-client/src/main/java/sample/config/SecurityConfig.java b/samples/messages-client/src/main/java/sample/config/SecurityConfig.java index 184d8233..6532782f 100644 --- a/samples/messages-client/src/main/java/sample/config/SecurityConfig.java +++ b/samples/messages-client/src/main/java/sample/config/SecurityConfig.java @@ -16,6 +16,7 @@ package sample.config; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer; @@ -28,6 +29,7 @@ import static org.springframework.security.config.Customizer.withDefaults; * @since 0.0.1 */ @EnableWebSecurity +@Configuration(proxyBeanMethods = false) public class SecurityConfig { @Bean diff --git a/samples/messages-resource/src/main/java/sample/config/ResourceServerConfig.java b/samples/messages-resource/src/main/java/sample/config/ResourceServerConfig.java index f2dbaf43..9dd1a438 100644 --- a/samples/messages-resource/src/main/java/sample/config/ResourceServerConfig.java +++ b/samples/messages-resource/src/main/java/sample/config/ResourceServerConfig.java @@ -16,6 +16,7 @@ package sample.config; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.web.SecurityFilterChain; @@ -25,6 +26,7 @@ import org.springframework.security.web.SecurityFilterChain; * @since 0.0.1 */ @EnableWebSecurity +@Configuration(proxyBeanMethods = false) public class ResourceServerConfig { // @formatter:off