Change filter execution time and adapt redirect URI

[#155800120] https://www.pivotaltracker.com/story/show/155800120
cloudfoundry · Mar 12, 2018 · 7995f4b · 7995f4b
1 parent 3ab2a55
commit 7995f4b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...ain/java/org/cloudfoundry/identity/uaa/authentication/ReAuthenticationRequiredFilter.java b/...ain/java/org/cloudfoundry/identity/uaa/authentication/ReAuthenticationRequiredFilter.java
@@ -30,7 +30,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
         }
         if (reAuthenticationRequired) {
             request.getSession().invalidate();
-            sendRedirect("/", requestParams, request, response);
+            sendRedirect(request.getRequestURL().toString(), requestParams, request, response);
         } else {
             filterChain.doFilter(request, response);
         }

diff --git a/server/src/main/resources/spring/login-ui.xml b/server/src/main/resources/spring/login-ui.xml
@@ -309,7 +309,7 @@
         <security:custom-filter after="FIRST" ref="httpsHeaderFilter"/>
         <security:custom-filter before="CHANNEL_FILTER" ref="idpMetadataGeneratorFilter"/>
         <security:custom-filter after="CHANNEL_FILTER" ref="samlFilter"/>
-        <security:custom-filter ref="reAuthenticationRequiredFilter" before="SECURITY_CONTEXT_FILTER" />
+        <security:custom-filter ref="reAuthenticationRequiredFilter" after="SECURITY_CONTEXT_FILTER" />
         <form-login login-page="/login"
                     username-parameter="username"
                     password-parameter="password"