Skip to content

Commit 7666a02

Browse files
committed
Make default management security back off with Authorization server
Fixes gh-46841
1 parent f4fd212 commit 7666a02

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

module/spring-boot-security-oauth2-authorization-server/src/main/java/org/springframework/boot/security/oauth2/server/authorization/autoconfigure/servlet/OAuth2AuthorizationServerAutoConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2222
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
2323
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
24+
import org.springframework.boot.security.autoconfigure.actuate.servlet.ManagementWebSecurityAutoConfiguration;
2425
import org.springframework.boot.security.autoconfigure.servlet.SecurityAutoConfiguration;
2526
import org.springframework.boot.security.autoconfigure.servlet.UserDetailsServiceAutoConfiguration;
2627
import org.springframework.context.annotation.Import;
@@ -42,7 +43,7 @@
4243
* @since 4.0.0
4344
* @see OAuth2AuthorizationServerJwtAutoConfiguration
4445
*/
45-
@AutoConfiguration(before = SecurityAutoConfiguration.class,
46+
@AutoConfiguration(before = { SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class },
4647
beforeName = "org.springframework.boot.security.oauth2.server.resource.autoconfigure.servlet.OAuth2ResourceServerAutoConfiguration")
4748
@ConditionalOnClass(OAuth2Authorization.class)
4849
@ConditionalOnWebApplication(type = Type.SERVLET)

module/spring-boot-security-oauth2-authorization-server/src/test/java/org/springframework/boot/security/oauth2/server/authorization/autoconfigure/servlet/OAuth2AuthorizationServerAutoConfigurationTests.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.junit.jupiter.api.Test;
2020

2121
import org.springframework.boot.autoconfigure.AutoConfigurations;
22+
import org.springframework.boot.security.autoconfigure.actuate.servlet.ManagementWebSecurityAutoConfiguration;
2223
import org.springframework.boot.security.autoconfigure.servlet.SecurityAutoConfiguration;
2324
import org.springframework.boot.security.autoconfigure.servlet.UserDetailsServiceAutoConfiguration;
2425
import org.springframework.boot.test.context.FilteredClassLoader;
@@ -165,6 +166,19 @@ void authorizationServerSettingsBacksOffWhenAuthorizationServerSettingsBeanPrese
165166
});
166167
}
167168

169+
@Test
170+
void causesManagementWebSecurityAutoConfigurationToBackOff() {
171+
this.contextRunner
172+
.withPropertyValues(CLIENT_PREFIX + ".foo.registration.client-id=abcd",
173+
CLIENT_PREFIX + ".foo.registration.client-secret=secret",
174+
CLIENT_PREFIX + ".foo.registration.client-authentication-methods=client_secret_basic",
175+
CLIENT_PREFIX + ".foo.registration.authorization-grant-types=client_credentials",
176+
CLIENT_PREFIX + ".foo.registration.scopes=test")
177+
.withConfiguration(AutoConfigurations.of(ManagementWebSecurityAutoConfiguration.class))
178+
.run((context) -> assertThat(context).doesNotHaveBean(ManagementWebSecurityAutoConfiguration.class)
179+
.doesNotHaveBean("managementSecurityFilterChain"));
180+
}
181+
168182
@Configuration
169183
static class TestRegisteredClientRepositoryConfiguration {
170184

0 commit comments

Comments
 (0)