forked from spring-projects/spring-security
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Introduce AuthorizationManagerWebInvocationPrivilegeEvaluator
Closes spring-projectsgh-10590
- Loading branch information
1 parent
81a9302
commit eda3468
Showing
2 changed files
with
125 additions
and
0 deletions.
There are no files selected for viewing
57 changes: 57 additions & 0 deletions
57
...ingframework/security/web/access/AuthorizationManagerWebInvocationPrivilegeEvaluator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
/* | ||
* Copyright 2002-2021 the original author or authors. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* https://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.springframework.security.web.access; | ||
|
||
import jakarta.servlet.http.HttpServletRequest; | ||
|
||
import org.springframework.security.authorization.AuthorizationDecision; | ||
import org.springframework.security.authorization.AuthorizationManager; | ||
import org.springframework.security.core.Authentication; | ||
import org.springframework.security.web.FilterInvocation; | ||
import org.springframework.util.Assert; | ||
|
||
/** | ||
* An implementation of {@link WebInvocationPrivilegeEvaluator} which delegates the checks | ||
* to an instance of {@link AuthorizationManager} | ||
* | ||
* @author Marcus Da Coregio | ||
* @since 5.7 | ||
*/ | ||
public final class AuthorizationManagerWebInvocationPrivilegeEvaluator implements WebInvocationPrivilegeEvaluator { | ||
|
||
private final AuthorizationManager<HttpServletRequest> authorizationManager; | ||
|
||
public AuthorizationManagerWebInvocationPrivilegeEvaluator( | ||
AuthorizationManager<HttpServletRequest> authorizationManager) { | ||
Assert.notNull(authorizationManager, "authorizationManager cannot be null"); | ||
this.authorizationManager = authorizationManager; | ||
} | ||
|
||
@Override | ||
public boolean isAllowed(String uri, Authentication authentication) { | ||
return isAllowed(null, uri, null, authentication); | ||
} | ||
|
||
@Override | ||
public boolean isAllowed(String contextPath, String uri, String method, Authentication authentication) { | ||
FilterInvocation filterInvocation = new FilterInvocation(contextPath, uri, method); | ||
AuthorizationDecision decision = this.authorizationManager.check(() -> authentication, | ||
filterInvocation.getHttpRequest()); | ||
return decision != null && decision.isGranted(); | ||
} | ||
|
||
} |
68 changes: 68 additions & 0 deletions
68
...amework/security/web/access/AuthorizationManagerWebInvocationPrivilegeEvaluatorTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
/* | ||
* Copyright 2002-2021 the original author or authors. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* https://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.springframework.security.web.access; | ||
|
||
import jakarta.servlet.http.HttpServletRequest; | ||
|
||
import org.junit.jupiter.api.Test; | ||
import org.junit.jupiter.api.extension.ExtendWith; | ||
import org.mockito.InjectMocks; | ||
import org.mockito.Mock; | ||
import org.mockito.junit.jupiter.MockitoExtension; | ||
|
||
import org.springframework.security.authentication.TestAuthentication; | ||
import org.springframework.security.authorization.AuthorizationDecision; | ||
import org.springframework.security.authorization.AuthorizationManager; | ||
|
||
import static org.assertj.core.api.Assertions.assertThat; | ||
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; | ||
import static org.mockito.ArgumentMatchers.any; | ||
import static org.mockito.BDDMockito.given; | ||
import static org.mockito.Mockito.verify; | ||
|
||
@ExtendWith(MockitoExtension.class) | ||
class AuthorizationManagerWebInvocationPrivilegeEvaluatorTests { | ||
|
||
@InjectMocks | ||
private AuthorizationManagerWebInvocationPrivilegeEvaluator privilegeEvaluator; | ||
|
||
@Mock | ||
private AuthorizationManager<HttpServletRequest> authorizationManager; | ||
|
||
@Test | ||
void constructorWhenAuthorizationManagerNullThenIllegalArgument() { | ||
assertThatIllegalArgumentException() | ||
.isThrownBy(() -> new AuthorizationManagerWebInvocationPrivilegeEvaluator(null)) | ||
.withMessage("authorizationManager cannot be null"); | ||
} | ||
|
||
@Test | ||
void isAllowedWhenAuthorizationManagerAllowsThenAllowedTrue() { | ||
given(this.authorizationManager.check(any(), any())).willReturn(new AuthorizationDecision(true)); | ||
boolean allowed = this.privilegeEvaluator.isAllowed("/test", TestAuthentication.authenticatedUser()); | ||
assertThat(allowed).isTrue(); | ||
verify(this.authorizationManager).check(any(), any()); | ||
} | ||
|
||
@Test | ||
void isAllowedWhenAuthorizationManagerDeniesAllowedFalse() { | ||
given(this.authorizationManager.check(any(), any())).willReturn(new AuthorizationDecision(false)); | ||
boolean allowed = this.privilegeEvaluator.isAllowed("/test", TestAuthentication.authenticatedUser()); | ||
assertThat(allowed).isFalse(); | ||
} | ||
|
||
} |