Skip to content

Commit 9928d74

Browse files
committed
Revert fix to enable cors for actuator endpoints
The fix causes a Jersey application to fail in the absence of a `CorsFilter` or `CorsConfigurationSource` bean. See gh-11987
1 parent 940d40c commit 9928d74

File tree

4 files changed

+1
-88
lines changed

4 files changed

+1
-88
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ protected void configure(HttpSecurity http) throws Exception {
4444
requests.requestMatchers(EndpointRequest.to(HealthEndpoint.class, InfoEndpoint.class)).permitAll();
4545
requests.anyRequest().authenticated();
4646
});
47-
http.cors();
4847
http.formLogin(Customizer.withDefaults());
4948
http.httpBasic(Customizer.withDefaults());
5049
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.springframework.boot.autoconfigure.security.oauth2.resource.servlet.OAuth2ResourceServerAutoConfiguration;
3131
import org.springframework.boot.autoconfigure.security.saml2.Saml2RelyingPartyAutoConfiguration;
3232
import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
33-
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
3433
import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
3534
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
3635
import org.springframework.context.annotation.Configuration;
@@ -57,7 +56,7 @@ class ManagementWebSecurityAutoConfigurationTests {
5756
private WebApplicationContextRunner contextRunner = new WebApplicationContextRunner().withConfiguration(
5857
AutoConfigurations.of(HealthContributorAutoConfiguration.class, HealthEndpointAutoConfiguration.class,
5958
InfoEndpointAutoConfiguration.class, EnvironmentEndpointAutoConfiguration.class,
60-
EndpointAutoConfiguration.class, WebMvcAutoConfiguration.class, WebEndpointAutoConfiguration.class,
59+
EndpointAutoConfiguration.class, WebEndpointAutoConfiguration.class,
6160
SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class));
6261

6362
@Test

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/CorsSampleActuatorApplicationTests.java

Lines changed: 0 additions & 83 deletions
This file was deleted.

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/resources/application-cors.properties

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)