Skip to content

Commit e36e267

Browse files
committed
Merge pull request #42679 from quaff
* pr/42679: Remove deprecated method call on AuthorityAuthorizationManager Closes gh-42679
2 parents 13eb390 + 62d78d2 commit e36e267

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/reactive/AbstractWebFluxEndpointHandlerMapping.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
import org.springframework.http.MediaType;
5858
import org.springframework.http.ResponseEntity;
5959
import org.springframework.security.authorization.AuthorityAuthorizationManager;
60+
import org.springframework.security.authorization.AuthorizationResult;
6061
import org.springframework.security.core.Authentication;
6162
import org.springframework.security.core.context.ReactiveSecurityContextHolder;
6263
import org.springframework.util.AntPathMatcher;
@@ -523,9 +524,9 @@ public Principal getPrincipal() {
523524
@Override
524525
public boolean isUserInRole(String role) {
525526
String authority = (!role.startsWith(ROLE_PREFIX)) ? ROLE_PREFIX + role : role;
526-
return AuthorityAuthorizationManager.hasAuthority(authority)
527-
.check(this::getAuthentication, null)
528-
.isGranted();
527+
AuthorizationResult result = AuthorityAuthorizationManager.hasAuthority(authority)
528+
.authorize(this::getAuthentication, null);
529+
return result != null && result.isGranted();
529530
}
530531

531532
}

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthorizationAuditListenerTests.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.springframework.context.ApplicationEventPublisher;
2626
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
2727
import org.springframework.security.authorization.AuthorizationDecision;
28+
import org.springframework.security.authorization.AuthorizationResult;
2829
import org.springframework.security.authorization.event.AuthorizationDeniedEvent;
2930
import org.springframework.security.authorization.event.AuthorizationEvent;
3031

@@ -48,7 +49,7 @@ void init() {
4849

4950
@Test
5051
void authorizationDeniedEvent() {
51-
AuthorizationDecision decision = new AuthorizationDecision(false);
52+
AuthorizationResult decision = new AuthorizationDecision(false);
5253
UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken("spring",
5354
"password");
5455
authentication.setDetails("details");
@@ -62,7 +63,7 @@ void authorizationDeniedEvent() {
6263

6364
@Test
6465
void authorizationDeniedEventWhenAuthenticationIsNotAvailable() {
65-
AuthorizationDecision decision = new AuthorizationDecision(false);
66+
AuthorizationResult decision = new AuthorizationDecision(false);
6667
UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken("spring",
6768
"password");
6869
authentication.setDetails("details");
@@ -77,7 +78,7 @@ void authorizationDeniedEventWhenAuthenticationIsNotAvailable() {
7778

7879
@Test
7980
void authorizationDeniedEventWhenAuthenticationDoesNotHaveDetails() {
80-
AuthorizationDecision decision = new AuthorizationDecision(false);
81+
AuthorizationResult decision = new AuthorizationDecision(false);
8182
UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken("spring",
8283
"password");
8384
AuthorizationDeniedEvent<?> authorizationEvent = new AuthorizationDeniedEvent<>(() -> authentication, "",

0 commit comments

Comments
 (0)