Fix setServletContext not being called for AuthorizationManagerWebInvocationPrivilegeEvaluator

marcusdacoregio · marcusdacoregio · commit 15b3744dcfe3 · 2022-05-12T10:12:31.000-03:00
Issue gh-10908
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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,10 @@ private RequestMatcherEntry<List<WebInvocationPrivilegeEvaluator>> getRequestMat`
`344`	`344`	`if (filter instanceof AuthorizationFilter) {`
`345`	`345`	`AuthorizationManager<HttpServletRequest> authorizationManager = ((AuthorizationFilter) filter)`
`346`	`346`	`.getAuthorizationManager();`
`347`		`- privilegeEvaluators.add(new AuthorizationManagerWebInvocationPrivilegeEvaluator(authorizationManager));`
	`347`	`+ AuthorizationManagerWebInvocationPrivilegeEvaluator evaluator = new AuthorizationManagerWebInvocationPrivilegeEvaluator(`
	`348`	`+ authorizationManager);`
	`349`	`+ evaluator.setServletContext(this.servletContext);`
	`350`	`+ privilegeEvaluators.add(evaluator);`
`348`	`351`	`}`
`349`	`352`	`}`
`350`	`353`	`return new RequestMatcherEntry<>(securityFilterChain::matches, privilegeEvaluators);`