From 9d378103b0ed13191004a2fd00bef55380f52720 Mon Sep 17 00:00:00 2001 From: Marcus Da Coregio Date: Mon, 25 Apr 2022 09:38:58 -0300 Subject: [PATCH] Fix setServletContext not being called for AuthorizationManagerWebInvocationPrivilegeEvaluator Issue gh-10908 --- .../security/config/annotation/web/builders/WebSecurity.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java b/config/src/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java index 09926afc80..02f50146aa 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java @@ -344,7 +344,10 @@ public final class WebSecurity extends AbstractConfiguredSecurityBuilder authorizationManager = ((AuthorizationFilter) filter) .getAuthorizationManager(); - privilegeEvaluators.add(new AuthorizationManagerWebInvocationPrivilegeEvaluator(authorizationManager)); + AuthorizationManagerWebInvocationPrivilegeEvaluator evaluator = new AuthorizationManagerWebInvocationPrivilegeEvaluator( + authorizationManager); + evaluator.setServletContext(this.servletContext); + privilegeEvaluators.add(evaluator); } } return new RequestMatcherEntry<>(securityFilterChain::matches, privilegeEvaluators);