diff --git a/core/src/main/java/org/springframework/security/ui/AbstractProcessingFilter.java b/core/src/main/java/org/springframework/security/ui/AbstractProcessingFilter.java index eb7e62195e..9c511521de 100644 --- a/core/src/main/java/org/springframework/security/ui/AbstractProcessingFilter.java +++ b/core/src/main/java/org/springframework/security/ui/AbstractProcessingFilter.java @@ -265,7 +265,7 @@ public abstract class AbstractProcessingFilter extends SpringSecurityFilter impl chain.doFilter(request, response); } - public static String obtainFullRequestUrl(HttpServletRequest request) { + public static String obtainFullSavedRequestUrl(HttpServletRequest request) { HttpSession session = request.getSession(false); if (session == null) { @@ -418,7 +418,7 @@ public abstract class AbstractProcessingFilter extends SpringSecurityFilter impl protected String determineTargetUrl(HttpServletRequest request) { // Don't attempt to obtain the url from the saved request if // alwaysUsedefaultTargetUrl is set - String targetUrl = alwaysUseDefaultTargetUrl ? null : obtainFullRequestUrl(request); + String targetUrl = alwaysUseDefaultTargetUrl ? null : obtainFullSavedRequestUrl(request); if (targetUrl == null) { targetUrl = getDefaultTargetUrl(); diff --git a/core/src/test/java/org/springframework/security/ui/ExceptionTranslationFilterTests.java b/core/src/test/java/org/springframework/security/ui/ExceptionTranslationFilterTests.java index acc0d51704..8f3279f5a2 100644 --- a/core/src/test/java/org/springframework/security/ui/ExceptionTranslationFilterTests.java +++ b/core/src/test/java/org/springframework/security/ui/ExceptionTranslationFilterTests.java @@ -91,7 +91,7 @@ public class ExceptionTranslationFilterTests extends TestCase { filter.doFilter(request, response, chain); assertEquals("/mycontext/login.jsp", response.getRedirectedUrl()); assertEquals("http://www.example.com/mycontext/secure/page.html", AbstractProcessingFilter - .obtainFullRequestUrl(request)); + .obtainFullSavedRequestUrl(request)); } public void testAccessDeniedWhenNonAnonymous() throws Exception { @@ -185,7 +185,7 @@ public class ExceptionTranslationFilterTests extends TestCase { filter.doFilter(request, response, chain); assertEquals("/mycontext/login.jsp", response.getRedirectedUrl()); assertEquals("http://www.example.com/mycontext/secure/page.html", AbstractProcessingFilter - .obtainFullRequestUrl(request)); + .obtainFullSavedRequestUrl(request)); } public void testRedirectedToLoginFormAndSessionShowsOriginalTargetWithExoticPortWhenAuthenticationException() @@ -217,7 +217,7 @@ public class ExceptionTranslationFilterTests extends TestCase { filter.doFilter(request, response, chain); assertEquals("/mycontext/login.jsp", response.getRedirectedUrl()); assertEquals("http://www.example.com:8080/mycontext/secure/page.html", AbstractProcessingFilter - .obtainFullRequestUrl(request)); + .obtainFullSavedRequestUrl(request)); } public void testStartupDetectsMissingAuthenticationEntryPoint() throws Exception {