spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.1.x'

Browse Source 
Closes gh-51615
This commit is contained in:
Andy Wilkinson
2026-09-08 09:16:20 +01:00
parent 27933b0b3c c1900d0bc9
commit ca1cec34cb
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-cloudfoundry/src/main/java/org/springframework/boot/cloudfoundry/autoconfigure/actuate/endpoint/reactive/SecurityInterceptor.java
+6 -3
View File
@@ -59,10 +59,13 @@ class SecurityInterceptor {
}
Mono<SecurityResponse> preHandle(ServerWebExchange exchange, String id) {
ServerHttpRequest request = exchange.getRequest();
if (CorsUtils.isPreFlightRequest(request)) {
if (CorsUtils.isPreFlightRequest(exchange.getRequest())) {
return SUCCESS;
}
return doPreHandle(exchange, id).doOnError(this::logError).onErrorResume(this::getErrorResponse);
}
private Mono<SecurityResponse> doPreHandle(ServerWebExchange exchange, String id) {
if (!StringUtils.hasText(this.applicationId)) {
return Mono.error(new CloudFoundryAuthorizationException(Reason.SERVICE_UNAVAILABLE,
"Application id is not available"));
@@ -71,7 +74,7 @@ class SecurityInterceptor {
return Mono.error(new CloudFoundryAuthorizationException(Reason.SERVICE_UNAVAILABLE,
"Cloud controller URL is not available"));
}
return check(exchange, id).then(SUCCESS).doOnError(this::logError).onErrorResume(this::getErrorResponse);
return check(exchange, id).then(SUCCESS);
}
private void logError(Throwable ex) {
module/spring-boot-cloudfoundry/src/test/java/org/springframework/boot/cloudfoundry/autoconfigure/actuate/endpoint/reactive/SecurityInterceptorTests.java
+10 -7
View File
@@ -28,7 +28,6 @@ import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
import org.springframework.boot.cloudfoundry.autoconfigure.actuate.endpoint.AccessLevel;
import org.springframework.boot.cloudfoundry.autoconfigure.actuate.endpoint.CloudFoundryAuthorizationException;
import org.springframework.boot.cloudfoundry.autoconfigure.actuate.endpoint.CloudFoundryAuthorizationException.Reason;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
@@ -100,9 +99,11 @@ class SecurityInterceptorTests {
.header(HttpHeaders.AUTHORIZATION, "bearer " + mockAccessToken())
.build());
StepVerifier.create(this.interceptor.preHandle(request, "/a"))
.consumeErrorWith((ex) -> assertThat(((CloudFoundryAuthorizationException) ex).getReason())
.isEqualTo(Reason.SERVICE_UNAVAILABLE))
.verify();
.consumeNextWith(
(response) -> assertThat(response.getStatus()).isEqualTo(Reason.SERVICE_UNAVAILABLE.getStatus())
.isEqualTo(Reason.SERVICE_UNAVAILABLE.getStatus()))
.expectComplete()
.verify(Duration.ofSeconds(30));
}
@Test
@@ -111,9 +112,11 @@ class SecurityInterceptorTests {
MockServerWebExchange request = MockServerWebExchange
.from(MockServerHttpRequest.get("/a").header(HttpHeaders.AUTHORIZATION, mockAccessToken()).build());
StepVerifier.create(this.interceptor.preHandle(request, "/a"))
.consumeErrorWith((ex) -> assertThat(((CloudFoundryAuthorizationException) ex).getReason())
.isEqualTo(Reason.SERVICE_UNAVAILABLE))
.verify();
.consumeNextWith(
(response) -> assertThat(response.getStatus()).isEqualTo(Reason.SERVICE_UNAVAILABLE.getStatus())
.isEqualTo(Reason.SERVICE_UNAVAILABLE.getStatus()))
.expectComplete()
.verify(Duration.ofSeconds(30));
}
@Test