From 0483b3e0421b1fdf55ac5d147d999c6c89986206 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Fri, 1 May 2020 10:50:14 -0500 Subject: [PATCH] Polish RequestRejectedHandler Issue gh-5007 --- .../org/springframework/security/web/FilterChainProxy.java | 2 +- .../security/web/firewall/DefaultRequestRejectedHandler.java | 4 ++-- .../web/firewall/HttpStatusRequestRejectedHandler.java | 4 ++-- .../security/web/firewall/RequestRejectedHandler.java | 4 ++-- ...ndlerTest.java => DefaultRequestRejectedHandlerTests.java} | 4 ++-- ...erTest.java => HttpStatusRequestRejectedHandlerTests.java} | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) rename web/src/test/java/org/springframework/security/web/firewall/{DefaultRequestRejectedHandlerTest.java => DefaultRequestRejectedHandlerTests.java} (93%) rename web/src/test/java/org/springframework/security/web/firewall/{HttpStatusRequestRejectedHandlerTest.java => HttpStatusRequestRejectedHandlerTests.java} (94%) diff --git a/web/src/main/java/org/springframework/security/web/FilterChainProxy.java b/web/src/main/java/org/springframework/security/web/FilterChainProxy.java index 37019e3204..a27c4dd324 100644 --- a/web/src/main/java/org/springframework/security/web/FilterChainProxy.java +++ b/web/src/main/java/org/springframework/security/web/FilterChainProxy.java @@ -183,7 +183,7 @@ public class FilterChainProxy extends GenericFilterBean { request.setAttribute(FILTER_APPLIED, Boolean.TRUE); doFilterInternal(request, response, chain); } catch (RequestRejectedException e) { - requestRejectedHandler.handle((HttpServletRequest) request, (HttpServletResponse) response, e); + this.requestRejectedHandler.handle((HttpServletRequest) request, (HttpServletResponse) response, e); } finally { SecurityContextHolder.clearContext(); diff --git a/web/src/main/java/org/springframework/security/web/firewall/DefaultRequestRejectedHandler.java b/web/src/main/java/org/springframework/security/web/firewall/DefaultRequestRejectedHandler.java index ef63e9f7d0..5816a700a6 100644 --- a/web/src/main/java/org/springframework/security/web/firewall/DefaultRequestRejectedHandler.java +++ b/web/src/main/java/org/springframework/security/web/firewall/DefaultRequestRejectedHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2020 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. @@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletResponse; * Default implementation of {@link RequestRejectedHandler} that simply rethrows the exception. * * @author Leonard Brünings - * @since 5.2 + * @since 5.4 */ public class DefaultRequestRejectedHandler implements RequestRejectedHandler { @Override diff --git a/web/src/main/java/org/springframework/security/web/firewall/HttpStatusRequestRejectedHandler.java b/web/src/main/java/org/springframework/security/web/firewall/HttpStatusRequestRejectedHandler.java index 06c6ba5eaf..8c6aea5994 100644 --- a/web/src/main/java/org/springframework/security/web/firewall/HttpStatusRequestRejectedHandler.java +++ b/web/src/main/java/org/springframework/security/web/firewall/HttpStatusRequestRejectedHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2020 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. @@ -27,7 +27,7 @@ import org.apache.commons.logging.LogFactory; * A simple implementation of {@link RequestRejectedHandler} that sends an error with configurable status code. * * @author Leonard Brünings - * @since 5.2 + * @since 5.4 */ public class HttpStatusRequestRejectedHandler implements RequestRejectedHandler { private static final Log logger = LogFactory.getLog(HttpStatusRequestRejectedHandler.class); diff --git a/web/src/main/java/org/springframework/security/web/firewall/RequestRejectedHandler.java b/web/src/main/java/org/springframework/security/web/firewall/RequestRejectedHandler.java index f26afa5398..5369319b04 100644 --- a/web/src/main/java/org/springframework/security/web/firewall/RequestRejectedHandler.java +++ b/web/src/main/java/org/springframework/security/web/firewall/RequestRejectedHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2020 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. @@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletResponse; * RequestRejectedException. * * @author Leonard Brünings - * @since 5.2 + * @since 5.4 */ public interface RequestRejectedHandler { // ~ Methods diff --git a/web/src/test/java/org/springframework/security/web/firewall/DefaultRequestRejectedHandlerTest.java b/web/src/test/java/org/springframework/security/web/firewall/DefaultRequestRejectedHandlerTests.java similarity index 93% rename from web/src/test/java/org/springframework/security/web/firewall/DefaultRequestRejectedHandlerTest.java rename to web/src/test/java/org/springframework/security/web/firewall/DefaultRequestRejectedHandlerTests.java index ce245637d9..ccdb519e09 100644 --- a/web/src/test/java/org/springframework/security/web/firewall/DefaultRequestRejectedHandlerTest.java +++ b/web/src/test/java/org/springframework/security/web/firewall/DefaultRequestRejectedHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2020 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. @@ -25,7 +25,7 @@ import org.hamcrest.CoreMatchers; import org.junit.Assert; import org.junit.Test; -public class DefaultRequestRejectedHandlerTest { +public class DefaultRequestRejectedHandlerTests { @Test public void defaultRequestRejectedHandlerRethrowsTheException() throws Exception { diff --git a/web/src/test/java/org/springframework/security/web/firewall/HttpStatusRequestRejectedHandlerTest.java b/web/src/test/java/org/springframework/security/web/firewall/HttpStatusRequestRejectedHandlerTests.java similarity index 94% rename from web/src/test/java/org/springframework/security/web/firewall/HttpStatusRequestRejectedHandlerTest.java rename to web/src/test/java/org/springframework/security/web/firewall/HttpStatusRequestRejectedHandlerTests.java index be6f9454ec..b44f8c034e 100644 --- a/web/src/test/java/org/springframework/security/web/firewall/HttpStatusRequestRejectedHandlerTest.java +++ b/web/src/test/java/org/springframework/security/web/firewall/HttpStatusRequestRejectedHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2020 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. @@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletResponse; import org.junit.Test; -public class HttpStatusRequestRejectedHandlerTest { +public class HttpStatusRequestRejectedHandlerTests { @Test public void httpStatusRequestRejectedHandlerUsesStatus400byDefault() throws Exception {