浏览代码

Add Support SingleResultAuthorizationManager

Closes gh-16590

Signed-off-by: Max Batischev <mblancer@mail.ru>
Max Batischev 6 月之前
父节点
当前提交
58a665e5aa

+ 4 - 8
config/src/main/java/org/springframework/security/config/annotation/web/configurers/AuthorizeHttpRequestsConfigurer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -33,6 +33,7 @@ import org.springframework.security.authorization.AuthorizationDecision;
 import org.springframework.security.authorization.AuthorizationEventPublisher;
 import org.springframework.security.authorization.AuthorizationManager;
 import org.springframework.security.authorization.AuthorizationManagers;
+import org.springframework.security.authorization.SingleResultAuthorizationManager;
 import org.springframework.security.authorization.SpringAuthorizationEventPublisher;
 import org.springframework.security.config.ObjectPostProcessor;
 import org.springframework.security.config.annotation.web.AbstractRequestMatcherRegistry;
@@ -57,11 +58,6 @@ import org.springframework.util.function.SingletonSupplier;
 public final class AuthorizeHttpRequestsConfigurer<H extends HttpSecurityBuilder<H>>
 		extends AbstractHttpConfigurer<AuthorizeHttpRequestsConfigurer<H>, H> {
 
-	static final AuthorizationDecision AUTHORIZATION_DECISION = new AuthorizationDecision(true);
-
-	static final AuthorizationManager<RequestAuthorizationContext> PERMIT_ALL_AUTHORIZATION_MANAGER = (a,
-			o) -> AUTHORIZATION_DECISION;
-
 	private final AuthorizationManagerRequestMatcherRegistry registry;
 
 	private final AuthorizationEventPublisher publisher;
@@ -289,7 +285,7 @@ public final class AuthorizeHttpRequestsConfigurer<H extends HttpSecurityBuilder
 		 * customizations
 		 */
 		public AuthorizationManagerRequestMatcherRegistry permitAll() {
-			return access(PERMIT_ALL_AUTHORIZATION_MANAGER);
+			return access(SingleResultAuthorizationManager.permitAll());
 		}
 
 		/**
@@ -298,7 +294,7 @@ public final class AuthorizeHttpRequestsConfigurer<H extends HttpSecurityBuilder
 		 * customizations
 		 */
 		public AuthorizationManagerRequestMatcherRegistry denyAll() {
-			return access((a, o) -> new AuthorizationDecision(false));
+			return access(SingleResultAuthorizationManager.denyAll());
 		}
 
 		/**

+ 3 - 2
config/src/main/java/org/springframework/security/config/annotation/web/configurers/PermitAllSupport.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -19,6 +19,7 @@ package org.springframework.security.config.annotation.web.configurers;
 import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.security.access.SecurityConfig;
+import org.springframework.security.authorization.SingleResultAuthorizationManager;
 import org.springframework.security.config.annotation.web.HttpSecurityBuilder;
 import org.springframework.security.config.annotation.web.configurers.AbstractConfigAttributeRequestMatcherRegistry.UrlMapping;
 import org.springframework.security.web.util.matcher.RequestMatcher;
@@ -63,7 +64,7 @@ final class PermitAllSupport {
 								SecurityConfig.createList(ExpressionUrlAuthorizationConfigurer.permitAll)));
 				}
 				else {
-					httpConfigurer.addFirst(matcher, AuthorizeHttpRequestsConfigurer.PERMIT_ALL_AUTHORIZATION_MANAGER);
+					httpConfigurer.addFirst(matcher, SingleResultAuthorizationManager.permitAll());
 				}
 			}
 		}

+ 69 - 0
core/src/main/java/org/springframework/security/authorization/SingleResultAuthorizationManager.java

@@ -0,0 +1,69 @@
+/*
+ * Copyright 2002-2025 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.authorization;
+
+import java.util.function.Supplier;
+
+import org.springframework.security.core.Authentication;
+import org.springframework.util.Assert;
+
+/**
+ * An {@link AuthorizationManager} which creates permit-all and deny-all
+ * {@link AuthorizationManager} instances.
+ *
+ * @author Max Batischev
+ * @since 6.5
+ */
+public final class SingleResultAuthorizationManager<C> implements AuthorizationManager<C> {
+
+	private static final SingleResultAuthorizationManager<?> DENY_MANAGER = new SingleResultAuthorizationManager<>(
+			new AuthorizationDecision(false));
+
+	private static final SingleResultAuthorizationManager<?> PERMIT_MANAGER = new SingleResultAuthorizationManager<>(
+			new AuthorizationDecision(true));
+
+	private final AuthorizationResult result;
+
+	public SingleResultAuthorizationManager(AuthorizationResult result) {
+		Assert.notNull(result, "result cannot be null");
+		this.result = result;
+	}
+
+	@Override
+	public AuthorizationDecision check(Supplier<Authentication> authentication, C object) {
+		if (!(this.result instanceof AuthorizationDecision)) {
+			throw new IllegalArgumentException("result should be AuthorizationDecision");
+		}
+		return (AuthorizationDecision) this.result;
+	}
+
+	@Override
+	public AuthorizationResult authorize(Supplier<Authentication> authentication, C object) {
+		return this.result;
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <C> SingleResultAuthorizationManager<C> denyAll() {
+		return (SingleResultAuthorizationManager<C>) DENY_MANAGER;
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <C> SingleResultAuthorizationManager<C> permitAll() {
+		return (SingleResultAuthorizationManager<C>) PERMIT_MANAGER;
+	}
+
+}

+ 4 - 3
core/src/main/java/org/springframework/security/authorization/method/Jsr250AuthorizationManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -34,6 +34,7 @@ import org.springframework.security.authorization.AuthoritiesAuthorizationManage
 import org.springframework.security.authorization.AuthorizationDecision;
 import org.springframework.security.authorization.AuthorizationManager;
 import org.springframework.security.authorization.AuthorizationResult;
+import org.springframework.security.authorization.SingleResultAuthorizationManager;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.annotation.SecurityAnnotationScanner;
 import org.springframework.security.core.annotation.SecurityAnnotationScanners;
@@ -106,10 +107,10 @@ public final class Jsr250AuthorizationManager implements AuthorizationManager<Me
 		AuthorizationManager<MethodInvocation> resolveManager(Method method, Class<?> targetClass) {
 			Annotation annotation = findJsr250Annotation(method, targetClass);
 			if (annotation instanceof DenyAll) {
-				return (a, o) -> new AuthorizationDecision(false);
+				return SingleResultAuthorizationManager.denyAll();
 			}
 			if (annotation instanceof PermitAll) {
-				return (a, o) -> new AuthorizationDecision(true);
+				return SingleResultAuthorizationManager.permitAll();
 			}
 			if (annotation instanceof RolesAllowed rolesAllowed) {
 				return (AuthorizationManagerCheckAdapter<MethodInvocation>) (a,

+ 3 - 7
core/src/test/java/org/springframework/security/authorization/AuthorizationManagerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -33,12 +33,10 @@ public class AuthorizationManagerTests {
 
 	@Test
 	public void verifyWhenCheckReturnedGrantedDecisionThenPasses() {
-		AuthorizationManager<Object> manager = (a, o) -> new AuthorizationDecision(true);
-
 		Authentication authentication = new TestingAuthenticationToken("user", "password", "ROLE_1", "ROLE_2");
 		Object object = new Object();
 
-		manager.verify(() -> authentication, object);
+		SingleResultAuthorizationManager.permitAll().verify(() -> authentication, object);
 	}
 
 	@Test
@@ -53,13 +51,11 @@ public class AuthorizationManagerTests {
 
 	@Test
 	public void verifyWhenCheckReturnedDeniedDecisionThenAccessDeniedException() {
-		AuthorizationManager<Object> manager = (a, o) -> new AuthorizationDecision(false);
-
 		Authentication authentication = new TestingAuthenticationToken("user", "password", "ROLE_1", "ROLE_2");
 		Object object = new Object();
 
 		assertThatExceptionOfType(AccessDeniedException.class)
-			.isThrownBy(() -> manager.verify(() -> authentication, object))
+			.isThrownBy(() -> SingleResultAuthorizationManager.denyAll().verify(() -> authentication, object))
 			.withMessage("Access Denied");
 	}
 

+ 6 - 6
core/src/test/java/org/springframework/security/authorization/AuthorizationManagersTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -29,8 +29,8 @@ class AuthorizationManagersTests {
 
 	@Test
 	void checkAnyOfWhenOneGrantedThenGrantedDecision() {
-		AuthorizationManager<?> composed = AuthorizationManagers.anyOf((a, o) -> new AuthorizationDecision(false),
-				(a, o) -> new AuthorizationDecision(true));
+		AuthorizationManager<?> composed = AuthorizationManagers.anyOf(SingleResultAuthorizationManager.permitAll(),
+				SingleResultAuthorizationManager.permitAll());
 		AuthorizationDecision decision = composed.check(null, null);
 		assertThat(decision).isNotNull();
 		assertThat(decision.isGranted()).isTrue();
@@ -118,8 +118,8 @@ class AuthorizationManagersTests {
 
 	@Test
 	void checkAllOfWhenAllGrantedThenGrantedDecision() {
-		AuthorizationManager<?> composed = AuthorizationManagers.allOf((a, o) -> new AuthorizationDecision(true),
-				(a, o) -> new AuthorizationDecision(true));
+		AuthorizationManager<?> composed = AuthorizationManagers.allOf(SingleResultAuthorizationManager.permitAll(),
+				SingleResultAuthorizationManager.permitAll());
 		AuthorizationDecision decision = composed.check(null, null);
 		assertThat(decision).isNotNull();
 		assertThat(decision.isGranted()).isTrue();
@@ -158,7 +158,7 @@ class AuthorizationManagersTests {
 	void checkAllOfWithAllAbstainDefaultDecisionWhenOneDeniedThenDeniedDecision() {
 		AuthorizationDecision allAbstainDefaultDecision = new AuthorizationDecision(true);
 		AuthorizationManager<?> composed = AuthorizationManagers.allOf(allAbstainDefaultDecision,
-				(a, o) -> new AuthorizationDecision(true), (a, o) -> new AuthorizationDecision(false));
+				SingleResultAuthorizationManager.permitAll(), SingleResultAuthorizationManager.denyAll());
 		AuthorizationDecision decision = composed.check(null, null);
 		assertThat(decision).isNotNull();
 		assertThat(decision.isGranted()).isFalse();

+ 77 - 0
core/src/test/java/org/springframework/security/authorization/SingleResultAuthorizationManagerTests.java

@@ -0,0 +1,77 @@
+/*
+ * Copyright 2002-2025 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.authorization;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+
+/**
+ * Tests for {@link SingleResultAuthorizationManager}.
+ *
+ * @author Max Batischev
+ */
+public class SingleResultAuthorizationManagerTests {
+
+	private SingleResultAuthorizationManager<?> manager;
+
+	@Test
+	void authorizeWhenManagerWithGrantedAuthorizationResultIsCreatedThenAuthorizes() {
+		this.manager = new SingleResultAuthorizationManager<>(new AuthorizationDecision(true));
+
+		AuthorizationResult result = this.manager.authorize(null, null);
+
+		assertThat(result.isGranted()).isTrue();
+	}
+
+	@Test
+	void checkWhenManagerWithGrantedDecisionIsCreatedThenAuthorizes() {
+		this.manager = new SingleResultAuthorizationManager<>(new AuthorizationDecision(true));
+
+		AuthorizationResult result = this.manager.check(null, null);
+
+		assertThat(result.isGranted()).isTrue();
+	}
+
+	@Test
+	void checkWhenManagerWithGrantedCustomAuthorizationResultIsCreatedThenFails() {
+		this.manager = new SingleResultAuthorizationManager<>((AuthorizationResult) () -> true);
+
+		assertThatIllegalArgumentException().isThrownBy(() -> this.manager.check(null, null));
+	}
+
+	@Test
+	void authorizeWhenPermitManagerUsesThenAuthorize() {
+		AuthorizationResult result = SingleResultAuthorizationManager.permitAll().authorize(null, null);
+
+		assertThat(result.isGranted()).isTrue();
+	}
+
+	@Test
+	void authorizeWhenDenyManagerUsesThenDeny() {
+		AuthorizationResult result = SingleResultAuthorizationManager.denyAll().authorize(null, null);
+
+		assertThat(result.isGranted()).isFalse();
+	}
+
+	@Test
+	void constructWhenNullResultIsPresentThenFails() {
+		assertThatIllegalArgumentException().isThrownBy(() -> new SingleResultAuthorizationManager<>(null));
+	}
+
+}

+ 4 - 3
messaging/src/main/java/org/springframework/security/messaging/access/intercept/MessageMatcherDelegatingAuthorizationManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -31,6 +31,7 @@ import org.springframework.security.authorization.AuthenticatedAuthorizationMana
 import org.springframework.security.authorization.AuthorityAuthorizationManager;
 import org.springframework.security.authorization.AuthorizationDecision;
 import org.springframework.security.authorization.AuthorizationManager;
+import org.springframework.security.authorization.SingleResultAuthorizationManager;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.messaging.util.matcher.MessageMatcher;
 import org.springframework.security.messaging.util.matcher.SimpDestinationMessageMatcher;
@@ -319,7 +320,7 @@ public final class MessageMatcherDelegatingAuthorizationManager implements Autho
 			 * @return the {@link Builder} for further customization
 			 */
 			public Builder permitAll() {
-				return access((authentication, context) -> new AuthorizationDecision(true));
+				return access(SingleResultAuthorizationManager.permitAll());
 			}
 
 			/**
@@ -327,7 +328,7 @@ public final class MessageMatcherDelegatingAuthorizationManager implements Autho
 			 * @return the {@link Builder} for further customization
 			 */
 			public Builder denyAll() {
-				return access((authorization, context) -> new AuthorizationDecision(false));
+				return access(SingleResultAuthorizationManager.denyAll());
 			}
 
 			/**

+ 4 - 3
web/src/main/java/org/springframework/security/web/access/intercept/RequestMatcherDelegatingAuthorizationManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -30,6 +30,7 @@ import org.springframework.security.authorization.AuthenticatedAuthorizationMana
 import org.springframework.security.authorization.AuthorityAuthorizationManager;
 import org.springframework.security.authorization.AuthorizationDecision;
 import org.springframework.security.authorization.AuthorizationManager;
+import org.springframework.security.authorization.SingleResultAuthorizationManager;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.util.UrlUtils;
 import org.springframework.security.web.util.matcher.AnyRequestMatcher;
@@ -201,7 +202,7 @@ public final class RequestMatcherDelegatingAuthorizationManager implements Autho
 			 * @return the {@link Builder} for further customizations
 			 */
 			public Builder permitAll() {
-				return access((a, o) -> new AuthorizationDecision(true));
+				return access(SingleResultAuthorizationManager.permitAll());
 			}
 
 			/**
@@ -209,7 +210,7 @@ public final class RequestMatcherDelegatingAuthorizationManager implements Autho
 			 * @return the {@link Builder} for further customizations
 			 */
 			public Builder denyAll() {
-				return access((a, o) -> new AuthorizationDecision(false));
+				return access(SingleResultAuthorizationManager.denyAll());
 			}
 
 			/**

+ 7 - 6
web/src/test/java/org/springframework/security/web/access/intercept/RequestMatcherDelegatingAuthorizationManagerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -26,6 +26,7 @@ import org.springframework.security.authentication.TestingAuthenticationToken;
 import org.springframework.security.authorization.AuthenticatedAuthorizationManager;
 import org.springframework.security.authorization.AuthorityAuthorizationManager;
 import org.springframework.security.authorization.AuthorizationDecision;
+import org.springframework.security.authorization.SingleResultAuthorizationManager;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.servlet.util.matcher.MvcRequestMatcher;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
@@ -55,7 +56,7 @@ public class RequestMatcherDelegatingAuthorizationManagerTests {
 	public void addWhenMatcherNullThenException() {
 		assertThatIllegalArgumentException()
 			.isThrownBy(() -> RequestMatcherDelegatingAuthorizationManager.builder()
-				.add(null, (a, o) -> new AuthorizationDecision(true))
+				.add(null, SingleResultAuthorizationManager.permitAll())
 				.build())
 			.withMessage("matcher cannot be null");
 	}
@@ -72,8 +73,8 @@ public class RequestMatcherDelegatingAuthorizationManagerTests {
 	@Test
 	public void checkWhenMultipleMappingsConfiguredThenDelegatesMatchingManager() {
 		RequestMatcherDelegatingAuthorizationManager manager = RequestMatcherDelegatingAuthorizationManager.builder()
-			.add(new MvcRequestMatcher(null, "/grant"), (a, o) -> new AuthorizationDecision(true))
-			.add(new MvcRequestMatcher(null, "/deny"), (a, o) -> new AuthorizationDecision(false))
+			.add(new MvcRequestMatcher(null, "/grant"), SingleResultAuthorizationManager.permitAll())
+			.add(new MvcRequestMatcher(null, "/deny"), SingleResultAuthorizationManager.denyAll())
 			.build();
 
 		Supplier<Authentication> authentication = () -> new TestingAuthenticationToken("user", "password", "ROLE_USER");
@@ -97,11 +98,11 @@ public class RequestMatcherDelegatingAuthorizationManagerTests {
 		RequestMatcherDelegatingAuthorizationManager manager = RequestMatcherDelegatingAuthorizationManager.builder()
 			.mappings((m) -> {
 				m.add(new RequestMatcherEntry<>(new MvcRequestMatcher(null, "/grant"),
-						(a, o) -> new AuthorizationDecision(true)));
+						SingleResultAuthorizationManager.permitAll()));
 				m.add(new RequestMatcherEntry<>(AnyRequestMatcher.INSTANCE,
 						AuthorityAuthorizationManager.hasRole("ADMIN")));
 				m.add(new RequestMatcherEntry<>(new MvcRequestMatcher(null, "/afterAny"),
-						(a, o) -> new AuthorizationDecision(true)));
+						SingleResultAuthorizationManager.permitAll()));
 			})
 			.build();