Skip to content

Commit 30973c9

Browse files
wilkinsonawilkinsona
committed
Create spring-boot-security-oauth2-resource-server module
1 parent 912a8a8 commit 30973c9

File tree

42 files changed

+117
-90
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+117
-90
lines changed

‎settings.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ include "spring-boot-project:spring-boot-reactor-netty"
102102
include "spring-boot-project:spring-boot-rsocket"
103103
include "spring-boot-project:spring-boot-security"
104104
include "spring-boot-project:spring-boot-security-oauth2-client"
105+
include "spring-boot-project:spring-boot-security-oauth2-resource-server"
105106
include "spring-boot-project:spring-boot-sendgrid"
106107
include "spring-boot-project:spring-boot-test"
107108
include "spring-boot-project:spring-boot-test-autoconfigure"

‎spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ dependencies {
4949
optional(project(":spring-boot-project:spring-boot-r2dbc"))
5050
optional(project(":spring-boot-project:spring-boot-reactor-netty"))
5151
optional(project(":spring-boot-project:spring-boot-security-oauth2-client"))
52+
optional(project(":spring-boot-project:spring-boot-security-oauth2-resource-server"))
5253
optional(project(":spring-boot-project:spring-boot-tomcat"))
5354
optional(project(":spring-boot-project:spring-boot-undertow"))
5455
optional(project(":spring-boot-project:spring-boot-validation"))

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/reactive/ReactiveManagementWebSecurityAutoConfiguration.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2929
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3030
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
31-
import org.springframework.boot.autoconfigure.security.oauth2.resource.reactive.ReactiveOAuth2ResourceServerAutoConfiguration;
3231
import org.springframework.boot.security.autoconfigure.reactive.ReactiveSecurityAutoConfiguration;
3332
import org.springframework.boot.security.autoconfigure.reactive.ReactiveUserDetailsServiceAutoConfiguration;
3433
import org.springframework.context.annotation.Bean;
@@ -56,9 +55,10 @@
5655
*/
5756
@AutoConfiguration(before = ReactiveSecurityAutoConfiguration.class,
5857
after = { HealthEndpointAutoConfiguration.class, InfoEndpointAutoConfiguration.class,
59-
WebEndpointAutoConfiguration.class, ReactiveOAuth2ResourceServerAutoConfiguration.class,
60-
ReactiveUserDetailsServiceAutoConfiguration.class },
61-
afterName = "org.springframework.boot.security.oauth2.client.autoconfigure.reactive.ReactiveOAuth2ClientAutoConfiguration")
58+
WebEndpointAutoConfiguration.class, ReactiveUserDetailsServiceAutoConfiguration.class },
59+
afterName = {
60+
"org.springframework.boot.security.oauth2.client.autoconfigure.reactive.ReactiveOAuth2ClientAutoConfiguration",
61+
"org.springframework.boot.security.oauth2.server.resource.autoconfigure.reactive.ReactiveOAuth2ResourceServerAutoConfiguration" })
6262
@ConditionalOnClass({ EnableWebFluxSecurity.class, WebFilterChainProxy.class })
6363
@ConditionalOnMissingBean({ SecurityWebFilterChain.class, WebFilterChainProxy.class })
6464
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfiguration.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,13 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.security.servlet;
1818

19-
import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointAutoConfiguration;
2019
import org.springframework.boot.actuate.autoconfigure.health.HealthEndpointAutoConfiguration;
2120
import org.springframework.boot.actuate.autoconfigure.info.InfoEndpointAutoConfiguration;
2221
import org.springframework.boot.actuate.endpoint.web.WebServerNamespace;
2322
import org.springframework.boot.actuate.health.HealthEndpoint;
2423
import org.springframework.boot.autoconfigure.AutoConfiguration;
2524
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2625
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
27-
import org.springframework.boot.autoconfigure.security.oauth2.resource.servlet.OAuth2ResourceServerAutoConfiguration;
2826
import org.springframework.boot.security.autoconfigure.ConditionalOnDefaultWebSecurity;
2927
import org.springframework.boot.security.autoconfigure.SecurityProperties;
3028
import org.springframework.boot.security.autoconfigure.servlet.SecurityAutoConfiguration;
@@ -50,10 +48,10 @@
5048
* @since 2.1.0
5149
*/
5250
@AutoConfiguration(before = SecurityAutoConfiguration.class,
53-
after = { HealthEndpointAutoConfiguration.class, InfoEndpointAutoConfiguration.class,
54-
WebEndpointAutoConfiguration.class, OAuth2ResourceServerAutoConfiguration.class },
51+
after = { HealthEndpointAutoConfiguration.class, InfoEndpointAutoConfiguration.class },
5552
afterName = { "org.springframework.boot.security.autoconfigure.saml2.Saml2RelyingPartyAutoConfiguration",
56-
"org.springframework.boot.security.oauth2.client.autoconfigure.servlet.OAuth2ClientAutoConfiguration" })
53+
"org.springframework.boot.security.oauth2.client.autoconfigure.servlet.OAuth2ClientAutoConfiguration",
54+
"org.springframework.boot.security.oauth2.server.resource.autoconfigure.servlet.OAuth2ResourceServerAutoConfiguration" })
5755
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
5856
@ConditionalOnDefaultWebSecurity
5957
public class ManagementWebSecurityAutoConfiguration {

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/reactive/ReactiveManagementWebSecurityAutoConfigurationTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
import org.springframework.boot.actuate.autoconfigure.health.HealthEndpointAutoConfiguration;
3232
import org.springframework.boot.actuate.autoconfigure.info.InfoEndpointAutoConfiguration;
3333
import org.springframework.boot.autoconfigure.AutoConfigurations;
34-
import org.springframework.boot.autoconfigure.security.oauth2.resource.reactive.ReactiveOAuth2ResourceServerAutoConfiguration;
3534
import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration;
3635
import org.springframework.boot.security.autoconfigure.reactive.ReactiveSecurityAutoConfiguration;
36+
import org.springframework.boot.security.oauth2.server.resource.autoconfigure.reactive.ReactiveOAuth2ResourceServerAutoConfiguration;
3737
import org.springframework.boot.test.context.assertj.AssertableReactiveWebApplicationContext;
3838
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
3939
import org.springframework.context.ApplicationContext;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfigurationTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
import org.springframework.boot.actuate.autoconfigure.health.HealthEndpointAutoConfiguration;
3030
import org.springframework.boot.actuate.autoconfigure.info.InfoEndpointAutoConfiguration;
3131
import org.springframework.boot.autoconfigure.AutoConfigurations;
32-
import org.springframework.boot.autoconfigure.security.oauth2.resource.servlet.OAuth2ResourceServerAutoConfiguration;
3332
import org.springframework.boot.security.autoconfigure.SecurityProperties;
3433
import org.springframework.boot.security.autoconfigure.saml2.Saml2RelyingPartyAutoConfiguration;
3534
import org.springframework.boot.security.autoconfigure.servlet.SecurityAutoConfiguration;
35+
import org.springframework.boot.security.oauth2.server.resource.autoconfigure.servlet.OAuth2ResourceServerAutoConfiguration;
3636
import org.springframework.boot.test.context.FilteredClassLoader;
3737
import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
3838
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;

‎spring-boot-project/spring-boot-autoconfigure-all/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ dependencies {
5656
optional(project(":spring-boot-project:spring-boot-reactor-netty"))
5757
optional(project(":spring-boot-project:spring-boot-rsocket"))
5858
optional(project(":spring-boot-project:spring-boot-security"))
59+
optional(project(":spring-boot-project:spring-boot-security-oauth2-resource-server"))
5960
optional(project(":spring-boot-project:spring-boot-tomcat"))
6061
optional(project(":spring-boot-project:spring-boot-tx"))
6162
optional(project(":spring-boot-project:spring-boot-validation"))

‎spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/server/servlet/OAuth2AuthorizationServerAutoConfiguration.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2121
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2222
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
23-
import org.springframework.boot.autoconfigure.security.oauth2.resource.servlet.OAuth2ResourceServerAutoConfiguration;
2423
import org.springframework.boot.security.autoconfigure.servlet.UserDetailsServiceAutoConfiguration;
2524
import org.springframework.context.annotation.Import;
2625
import org.springframework.security.oauth2.server.authorization.OAuth2Authorization;
@@ -41,8 +40,7 @@
4140
* @since 3.1.0
4241
* @see OAuth2AuthorizationServerJwtAutoConfiguration
4342
*/
44-
@AutoConfiguration(before = OAuth2ResourceServerAutoConfiguration.class, beforeName = {
45-
"org.springframework.boot.security.autoconfigure.servlet.SecurityAutoConfiguration",
43+
@AutoConfiguration(beforeName = { "org.springframework.boot.security.autoconfigure.servlet.SecurityAutoConfiguration",
4644
"org.springframework.boot.autoconfigure.security.oauth2.resource.servlet.OAuth2ResourceServerAutoConfiguration" })
4745
@ConditionalOnClass(OAuth2Authorization.class)
4846
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)

‎spring-boot-project/spring-boot-autoconfigure-all/src/main/resources/META-INF/additional-spring-configuration-metadata.json‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -454,14 +454,6 @@
454454
"level": "error"
455455
}
456456
},
457-
{
458-
"name": "spring.security.oauth2.resourceserver.jwt.jws-algorithm",
459-
"type": "java.lang.String",
460-
"deprecation": {
461-
"replacement": "spring.security.oauth2.resourceserver.jwt.jws-algorithms",
462-
"level": "error"
463-
}
464-
},
465457
{
466458
"name": "spring.session.redis.cleanup-cron",
467459
"defaultValue": "0 * * * * *"

‎spring-boot-project/spring-boot-autoconfigure-all/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ org.springframework.boot.autoconfigure.http.client.HttpClientAutoConfiguration
1515
org.springframework.boot.autoconfigure.http.codec.CodecsAutoConfiguration
1616
org.springframework.boot.autoconfigure.netty.NettyAutoConfiguration
1717
org.springframework.boot.autoconfigure.reactor.ReactorAutoConfiguration
18-
org.springframework.boot.autoconfigure.security.oauth2.resource.servlet.OAuth2ResourceServerAutoConfiguration
19-
org.springframework.boot.autoconfigure.security.oauth2.resource.reactive.ReactiveOAuth2ResourceServerAutoConfiguration
2018
org.springframework.boot.autoconfigure.security.oauth2.server.servlet.OAuth2AuthorizationServerAutoConfiguration
2119
org.springframework.boot.autoconfigure.security.oauth2.server.servlet.OAuth2AuthorizationServerJwtAutoConfiguration
2220
org.springframework.boot.autoconfigure.session.SessionAutoConfiguration

0 commit comments

Comments
 (0)