Consolidate ExpressionAuthorizationDecision

Issue gh-11493
spring-projects · Jul 13, 2022 · db25a37 · db25a37
1 parent 281814a
commit db25a37
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 57 deletions.
diff --git a/...ringframework/security/authorization/method/ExpressionAttributeAuthorizationDecision.java b/...ringframework/security/authorization/method/ExpressionAttributeAuthorizationDecision.java
@@ -23,7 +23,11 @@
  *
  * @author Marcus Da Coregio
  * @since 5.6
+ * @deprecated Use
+ * {@link org.springframework.security.authorization.ExpressionAuthorizationDecision}
+ * instead
  */
+@Deprecated
 public class ExpressionAttributeAuthorizationDecision extends AuthorizationDecision {
 
 	private final ExpressionAttribute expressionAttribute;

diff --git a/.../org/springframework/security/authorization/method/PostAuthorizeAuthorizationManager.java b/.../org/springframework/security/authorization/method/PostAuthorizeAuthorizationManager.java
@@ -31,6 +31,7 @@
 import org.springframework.security.access.prepost.PostAuthorize;
 import org.springframework.security.authorization.AuthorizationDecision;
 import org.springframework.security.authorization.AuthorizationManager;
+import org.springframework.security.authorization.ExpressionAuthorizationDecision;
 import org.springframework.security.core.Authentication;
 import org.springframework.util.Assert;
 
@@ -76,7 +77,7 @@ public AuthorizationDecision check(Supplier<Authentication> authentication, Meth
 				mi.getMethodInvocation());
 		this.expressionHandler.setReturnObject(mi.getResult(), ctx);
 		boolean granted = ExpressionUtils.evaluateAsBoolean(attribute.getExpression(), ctx);
-		return new ExpressionAttributeAuthorizationDecision(granted, attribute);
+		return new ExpressionAuthorizationDecision(granted, attribute.getExpression());
 	}
 
 	private final class PostAuthorizeExpressionAttributeRegistry

diff --git a/...a/org/springframework/security/authorization/method/PreAuthorizeAuthorizationManager.java b/...a/org/springframework/security/authorization/method/PreAuthorizeAuthorizationManager.java
@@ -31,6 +31,7 @@
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.authorization.AuthorizationDecision;
 import org.springframework.security.authorization.AuthorizationManager;
+import org.springframework.security.authorization.ExpressionAuthorizationDecision;
 import org.springframework.security.core.Authentication;
 import org.springframework.util.Assert;
 
@@ -74,7 +75,7 @@ public AuthorizationDecision check(Supplier<Authentication> authentication, Meth
 		}
 		EvaluationContext ctx = this.expressionHandler.createEvaluationContext(authentication, mi);
 		boolean granted = ExpressionUtils.evaluateAsBoolean(attribute.getExpression(), ctx);
-		return new ExpressionAttributeAuthorizationDecision(granted, attribute);
+		return new ExpressionAuthorizationDecision(granted, attribute.getExpression());
 	}
 
 	private final class PreAuthorizeExpressionAttributeRegistry

diff --git a/...a/org/springframework/security/web/access/expression/ExpressionAuthorizationDecision.java b/...a/org/springframework/security/web/access/expression/ExpressionAuthorizationDecision.java
diff --git a/...org/springframework/security/web/access/expression/WebExpressionAuthorizationManager.java b/...org/springframework/security/web/access/expression/WebExpressionAuthorizationManager.java
@@ -24,6 +24,7 @@
 import org.springframework.security.access.expression.SecurityExpressionHandler;
 import org.springframework.security.authorization.AuthorizationDecision;
 import org.springframework.security.authorization.AuthorizationManager;
+import org.springframework.security.authorization.ExpressionAuthorizationDecision;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.access.intercept.RequestAuthorizationContext;
 import org.springframework.util.Assert;