File tree Expand file tree Collapse file tree 3 files changed +23
-0
lines changed
spring-boot-security-oauth2-client/src/main/java/org/springframework/boot/security/oauth2/client/autoconfigure/servlet
spring-boot-security-oauth2-resource-server/src/main/java/org/springframework/boot/security/oauth2/server/resource/autoconfigure/servlet
spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/servlet Expand file tree Collapse file tree 3 files changed +23
-0
lines changed Original file line number Diff line number Diff line change 2929import org .springframework .context .annotation .Configuration ;
3030import org .springframework .security .config .annotation .web .builders .HttpSecurity ;
3131import org .springframework .security .config .annotation .web .configuration .EnableWebSecurity ;
32+ import org .springframework .security .config .web .PathPatternRequestMatcherBuilderFactoryBean ;
3233import org .springframework .security .oauth2 .client .OAuth2AuthorizedClientService ;
3334import org .springframework .security .oauth2 .client .web .AuthenticatedPrincipalOAuth2AuthorizedClientRepository ;
3435import org .springframework .security .oauth2 .client .web .OAuth2AuthorizedClientRepository ;
5152@ ConditionalOnWebApplication (type = ConditionalOnWebApplication .Type .SERVLET )
5253public class OAuth2ClientWebSecurityAutoConfiguration {
5354
55+ @ Bean
56+ @ ConditionalOnMissingBean (name = "workAroundSecurityDependencyCyclePathPatternRequestMatcherBuilder" )
57+ PathPatternRequestMatcherBuilderFactoryBean workAroundSecurityDependencyCyclePathPatternRequestMatcherBuilder () {
58+ return new PathPatternRequestMatcherBuilderFactoryBean ();
59+ }
60+
5461 @ Bean
5562 @ ConditionalOnMissingBean
5663 OAuth2AuthorizedClientRepository authorizedClientRepository (OAuth2AuthorizedClientService authorizedClientService ) {
Original file line number Diff line number Diff line change 1919import org .springframework .boot .autoconfigure .AutoConfiguration ;
2020import org .springframework .boot .autoconfigure .EnableAutoConfiguration ;
2121import org .springframework .boot .autoconfigure .condition .ConditionalOnClass ;
22+ import org .springframework .boot .autoconfigure .condition .ConditionalOnMissingBean ;
2223import org .springframework .boot .autoconfigure .condition .ConditionalOnWebApplication ;
2324import org .springframework .boot .context .properties .EnableConfigurationProperties ;
2425import org .springframework .boot .security .autoconfigure .actuate .servlet .ManagementWebSecurityAutoConfiguration ;
2526import org .springframework .boot .security .autoconfigure .servlet .SecurityAutoConfiguration ;
2627import org .springframework .boot .security .autoconfigure .servlet .UserDetailsServiceAutoConfiguration ;
2728import org .springframework .boot .security .oauth2 .server .resource .autoconfigure .OAuth2ResourceServerProperties ;
29+ import org .springframework .context .annotation .Bean ;
2830import org .springframework .context .annotation .Import ;
31+ import org .springframework .security .config .web .PathPatternRequestMatcherBuilderFactoryBean ;
2932import org .springframework .security .oauth2 .server .resource .authentication .BearerTokenAuthenticationToken ;
3033
3134/**
4346 Oauth2ResourceServerConfiguration .OpaqueTokenConfiguration .class })
4447public class OAuth2ResourceServerAutoConfiguration {
4548
49+ @ Bean
50+ @ ConditionalOnMissingBean (name = "workAroundSecurityDependencyCyclePathPatternRequestMatcherBuilder" )
51+ PathPatternRequestMatcherBuilderFactoryBean workAroundSecurityDependencyCyclePathPatternRequestMatcherBuilder () {
52+ return new PathPatternRequestMatcherBuilderFactoryBean ();
53+ }
54+
4655}
Original file line number Diff line number Diff line change 2828import org .springframework .security .config .BeanIds ;
2929import org .springframework .security .config .annotation .web .builders .HttpSecurity ;
3030import org .springframework .security .config .annotation .web .configuration .EnableWebSecurity ;
31+ import org .springframework .security .config .web .PathPatternRequestMatcherBuilderFactoryBean ;
3132import org .springframework .security .web .SecurityFilterChain ;
3233
3334import static org .springframework .security .config .Customizer .withDefaults ;
4142@ ConditionalOnWebApplication (type = Type .SERVLET )
4243class SpringBootWebSecurityConfiguration {
4344
45+ @ Bean
46+ @ ConditionalOnMissingBean (name = "workAroundSecurityDependencyCyclePathPatternRequestMatcherBuilder" )
47+ PathPatternRequestMatcherBuilderFactoryBean workAroundSecurityDependencyCyclePathPatternRequestMatcherBuilder () {
48+ return new PathPatternRequestMatcherBuilderFactoryBean ();
49+ }
50+
4451 /**
4552 * The default configuration for web security. It relies on Spring Security's
4653 * content-negotiation strategy to determine what sort of authentication to use. If
You can’t perform that action at this time.
0 commit comments