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

Merge branch '2.1.x'

This commit is contained in:
Stephane Nicoll 2019-01-25 10:45:26 +01:00
parent babe98f064 9e0b1c297d
commit a6815bb2c9
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthWebEndpointResponseMapper.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2018 the original author or authors. * Copyright 2012-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -88,10 +88,7 @@ public class HealthWebEndpointResponseMapper {
*/ */
public WebEndpointResponse<Health> map(Health health, SecurityContext securityContext, public WebEndpointResponse<Health> map(Health health, SecurityContext securityContext,
ShowDetails showDetails) { ShowDetails showDetails) {
if (showDetails == ShowDetails.NEVER if (!canSeeDetails(securityContext, showDetails)) {
|| (showDetails == ShowDetails.WHEN_AUTHORIZED
&& (securityContext.getPrincipal() == null
|| !isUserInRole(securityContext)))) {
health = Health.status(health.getStatus()).build(); health = Health.status(health.getStatus()).build();
} }
return createWebEndpointResponse(health); return createWebEndpointResponse(health);