Fix setServletContext not being called for AuthorizationManagerWebInv…

…ocationPrivilegeEvaluator Issue gh-10908
spring-projects · May 12, 2022 · 15b3744 · 15b3744
1 parent 20b94c4
commit 15b3744
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/...rc/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java b/...rc/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java
@@ -344,7 +344,10 @@ private RequestMatcherEntry<List<WebInvocationPrivilegeEvaluator>> getRequestMat
 			if (filter instanceof AuthorizationFilter) {
 				AuthorizationManager<HttpServletRequest> 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);