diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthWebEndpointResponseMapper.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthWebEndpointResponseMapper.java index 646d20be27..c26f6263ac 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthWebEndpointResponseMapper.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthWebEndpointResponseMapper.java @@ -100,11 +100,8 @@ public class HealthWebEndpointResponseMapper { } private boolean canSeeDetails(SecurityContext securityContext, ShowDetails showDetails) { - if (showDetails == ShowDetails.NEVER || (showDetails == ShowDetails.WHEN_AUTHORIZED - && (securityContext.getPrincipal() == null || !isUserInRole(securityContext)))) { - return false; - } - return true; + return showDetails != ShowDetails.NEVER && (showDetails != ShowDetails.WHEN_AUTHORIZED + || (securityContext.getPrincipal() != null && isUserInRole(securityContext))); } private boolean isUserInRole(SecurityContext securityContext) {