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 pull request #50256 from htjworld

Browse Source 
Closes gh-50256

* gh-50256:
  Include security error body in WebFlux Cloud Foundry endpoint responses
This commit is contained in:
Andy Wilkinson
2026-09-09 13:52:50 +01:00
parent 4307353d6a 0959b436de
commit 95994a5386
2 changed files with 8 additions and 4 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/CloudFoundryWebFluxEndpointHandlerMapping.java
+2 -2
View File
@@ -109,7 +109,7 @@ class CloudFoundryWebFluxEndpointHandlerMapping extends AbstractWebFluxEndpointH
return CloudFoundryWebFluxEndpointHandlerMapping.this.securityInterceptor.preHandle(exchange, "")
.map((securityResponse) -> {
if (!securityResponse.getStatus().equals(HttpStatus.OK)) {
return new ResponseEntity<>(securityResponse.getStatus());
return new ResponseEntity<>(securityResponse.getMessage(), securityResponse.getStatus());
}
AccessLevel accessLevel = exchange.getAttribute(AccessLevel.REQUEST_ATTRIBUTE);
String requestUri = UriComponentsBuilder.fromUri(request.getURI()).replaceQuery(null).toUriString();
@@ -164,7 +164,7 @@ class CloudFoundryWebFluxEndpointHandlerMapping extends AbstractWebFluxEndpointH
private Mono<ResponseEntity<Object>> flatMapResponse(ServerWebExchange exchange,
@Nullable Map<String, String> body, SecurityResponse securityResponse) {
if (!securityResponse.getStatus().equals(HttpStatus.OK)) {
return Mono.just(new ResponseEntity<>(securityResponse.getStatus()));
return Mono.just(new ResponseEntity<>(securityResponse.getMessage(), securityResponse.getStatus()));
}
return this.delegate.handle(exchange, body);
}
module/spring-boot-cloudfoundry/src/test/java/org/springframework/boot/cloudfoundry/autoconfigure/actuate/endpoint/reactive/CloudFoundryWebFluxEndpointIntegrationTests.java
+6 -2
View File
@@ -100,7 +100,9 @@ class CloudFoundryWebFluxEndpointIntegrationTests {
.header("Authorization", "bearer " + mockAccessToken())
.exchange()
.expectStatus()
.isEqualTo(HttpStatus.FORBIDDEN)));
.isEqualTo(HttpStatus.FORBIDDEN)
.expectBody(String.class)
.isEqualTo("{\"security_error\":\"Access denied\"}")));
}
@Test
@@ -179,7 +181,9 @@ class CloudFoundryWebFluxEndpointIntegrationTests {
.header("Authorization", "bearer " + mockAccessToken())
.exchange()
.expectStatus()
.isUnauthorized()));
.isUnauthorized()
.expectBody(String.class)
.isEqualTo("{\"security_error\":\"invalid-token\"}")));
}
@Test