Cwikius-Spring/spring-security
1
0
Fork 0
mirror of synced 2026-08-29 05:28:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '7.1.x'

Browse Source
This commit is contained in:
Josh Cummings
2026-08-11 19:41:02 -06:00
parent 88aedba0bf 852e81640b
commit 09a3280442
9 changed files with 6 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/springframework/security/access/expression/AbstractSecurityExpressionHandler.java
+1 -3
View File
@@ -78,9 +78,7 @@ public abstract class AbstractSecurityExpressionHandler<T>
public final EvaluationContext createEvaluationContext(@Nullable Authentication authentication, T invocation) {
SecurityExpressionOperations root = createSecurityExpressionRoot(authentication, invocation);
StandardEvaluationContext ctx = createEvaluationContextInternal(authentication, invocation);
if (this.beanResolver != null) {
ctx.setBeanResolver(this.beanResolver);
}
ctx.setBeanResolver(this.beanResolver);
ctx.setRootObject(root);
return ctx;
}
core/src/main/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandler.java
+1 -3
View File
@@ -23,7 +23,6 @@ import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.function.Supplier;
import java.util.stream.Stream;
@@ -89,13 +88,12 @@ public class DefaultMethodSecurityExpressionHandler extends AbstractSecurityExpr
}
@Override
@SuppressWarnings("NullAway") // FIXME: Dataflow analysis limitation
public EvaluationContext createEvaluationContext(Supplier<? extends @Nullable Authentication> authentication,
MethodInvocation mi) {
MethodSecurityExpressionOperations root = createSecurityExpressionRoot(authentication, mi);
MethodSecurityEvaluationContext ctx = new MethodSecurityEvaluationContext(root, mi,
getParameterNameDiscoverer());
Optional.ofNullable(getBeanResolver()).ifPresent(ctx::setBeanResolver);
ctx.setBeanResolver(getBeanResolver());
return ctx;
}