瀏覽代碼

Polish multiple RequestRejectedHandlers support

Issue gh-10603
Josh Cummings 3 年之前
父節點
當前提交
feff747669

+ 1 - 1
config/src/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

+ 1 - 1
web/src/main/java/org/springframework/security/web/firewall/CompositeRequestRejectedHandler.java

@@ -50,7 +50,7 @@ public final class CompositeRequestRejectedHandler implements RequestRejectedHan
 	@Override
 	public void handle(HttpServletRequest request, HttpServletResponse response,
 			RequestRejectedException requestRejectedException) throws IOException, ServletException {
-		for (RequestRejectedHandler requestRejectedhandler : requestRejectedhandlers) {
+		for (RequestRejectedHandler requestRejectedhandler : this.requestRejectedhandlers) {
 			requestRejectedhandler.handle(request, response, requestRejectedException);
 		}
 	}

+ 4 - 4
web/src/test/java/org/springframework/security/web/firewall/CompositeRequestRejectedHandlerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,9 +29,9 @@ public class CompositeRequestRejectedHandlerTests {
 	@Test
 	void compositeRequestRejectedHandlerRethrowsTheException() {
 		RequestRejectedException requestRejectedException = new RequestRejectedException("rejected");
-		DefaultRequestRejectedHandler sut = new DefaultRequestRejectedHandler();
-		CompositeRequestRejectedHandler crrh = new CompositeRequestRejectedHandler(sut);
-		assertThatExceptionOfType(RequestRejectedException.class).isThrownBy(() -> crrh
+		CompositeRequestRejectedHandler handler = new CompositeRequestRejectedHandler(
+				new DefaultRequestRejectedHandler());
+		assertThatExceptionOfType(RequestRejectedException.class).isThrownBy(() -> handler
 				.handle(mock(HttpServletRequest.class), mock(HttpServletResponse.class), requestRejectedException))
 				.withMessage("rejected");
 	}