root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #24604 from izeye 

* pr/24604:
  Polish

Closes gh-24604
This commit is contained in:
Stephane Nicoll 2020-12-23 16:09:00 +01:00
parent e3d7ab0e3b 5e3f618f9d
commit ccdf5a9386
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc
View File

@ -2439,10 +2439,10 @@ To configure Spring Security to require a secure channel for all (or some) reque
[source,java,indent=0,subs="verbatim,quotes,attributes"] [source,java,indent=0,subs="verbatim,quotes,attributes"]
---- ----
@Bean @Bean
public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
// Customize the application security // Customize the application security
http.requiresChannel().anyRequest().requiresSecure(); http.requiresChannel().anyRequest().requiresSecure();
return http.build(); return http.build();
} }
---- ----

22
spring-boot-project/spring-boot-docs/src/docs/asciidoc/production-ready-features.adoc
View File

@ -359,12 +359,12 @@ A typical Spring Security configuration might look something like the following
[source,java,indent=0] [source,java,indent=0]
---- ----
@Bean @Bean
public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
http.requestMatcher(EndpointRequest.toAnyEndpoint()).authorizeRequests((requests) -> http.requestMatcher(EndpointRequest.toAnyEndpoint()).authorizeRequests((requests) ->
requests.anyRequest().hasRole("ENDPOINT_ADMIN")); requests.anyRequest().hasRole("ENDPOINT_ADMIN"));
http.httpBasic(); http.httpBasic();
return http.build(); return http.build();
} }
---- ----
@ -388,12 +388,12 @@ Additionally, if Spring Security is present, you would need to add custom securi
[source,java,indent=0] [source,java,indent=0]
---- ----
@Bean @Bean
public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
http.requestMatcher(EndpointRequest.toAnyEndpoint()).authorizeRequests((requests) -> http.requestMatcher(EndpointRequest.toAnyEndpoint()).authorizeRequests((requests) ->
requests.anyRequest().permitAll()); requests.anyRequest().permitAll());
return http.build(); return http.build();
} }
---- ----
NOTE: In both the examples above, the configuration applies only to the actuator endpoints. NOTE: In both the examples above, the configuration applies only to the actuator endpoints.

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ProfilesTests.java
View File

@ -360,7 +360,7 @@ class ProfilesTests {
} }
@Test @Test
void simpleRecursiveReferenceInProfileGroupThrowsException() { void simpleRecursiveReferenceInProfileGroupIgnoresDuplicates() {
MockEnvironment environment = new MockEnvironment(); MockEnvironment environment = new MockEnvironment();
environment.setProperty("spring.profiles.active", "a,b,c"); environment.setProperty("spring.profiles.active", "a,b,c");
environment.setProperty("spring.profiles.group.a", "a,e,f"); environment.setProperty("spring.profiles.group.a", "a,e,f");

4
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/src/test/java/smoketest/actuator/customsecurity/CorsSampleActuatorApplicationTests.java
View File

@ -66,9 +66,9 @@ class CorsSampleActuatorApplicationTests {
@Test @Test
void preflightRequestToEndpointShouldReturnOk() throws Exception { void preflightRequestToEndpointShouldReturnOk() throws Exception {
RequestEntity<?> healthRequest = RequestEntity.options(new URI("/actuator/env")) RequestEntity<?> envRequest = RequestEntity.options(new URI("/actuator/env"))
.header("Origin", "http://localhost:8080").header("Access-Control-Request-Method", "GET").build(); .header("Origin", "http://localhost:8080").header("Access-Control-Request-Method", "GET").build();
ResponseEntity<?> exchange = this.testRestTemplate.exchange(healthRequest, Map.class); ResponseEntity<?> exchange = this.testRestTemplate.exchange(envRequest, Map.class);
assertThat(exchange.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(exchange.getStatusCode()).isEqualTo(HttpStatus.OK);
} }

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

@ -66,9 +66,9 @@ class CorsSampleActuatorApplicationTests {
@Test @Test
void preflightRequestToEndpointShouldReturnOk() throws Exception { void preflightRequestToEndpointShouldReturnOk() throws Exception {
RequestEntity<?> healthRequest = RequestEntity.options(new URI("/actuator/env")) RequestEntity<?> envRequest = RequestEntity.options(new URI("/actuator/env"))
.header("Origin", "http://localhost:8080").header("Access-Control-Request-Method", "GET").build(); .header("Origin", "http://localhost:8080").header("Access-Control-Request-Method", "GET").build();
ResponseEntity<?> exchange = this.testRestTemplate.exchange(healthRequest, Map.class); ResponseEntity<?> exchange = this.testRestTemplate.exchange(envRequest, Map.class);
assertThat(exchange.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(exchange.getStatusCode()).isEqualTo(HttpStatus.OK);
} }