From 7c6ecaa8adb365a6c670cb86bb68be94136dc6a0 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 12 Aug 2013 13:31:30 +0200 Subject: Bugfixes: @ConfigurationTool - AuthenticationFilter: handle of non authenticated requests after restart - Legacy Import: update legacy Configuration import process @MOA-ID - Change Legacy Configuration import --- .../configuration/filter/AuthenticationFilter.java | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/filter') diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/filter/AuthenticationFilter.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/filter/AuthenticationFilter.java index d90e6f9b1..7dac458ca 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/filter/AuthenticationFilter.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/filter/AuthenticationFilter.java @@ -148,6 +148,10 @@ public class AuthenticationFilter implements Filter{ } else { //check login Daten + + //loginPageForward = true; + + if (MiscUtil.isNotEmpty(getAuthenticatedPage())) { log.debug("Unable to find authentication data. Authenticated page is given so there is no need to save original request url. " + (loginPageForward ? "Forwarding" : "Redirecting") + " to login page \"" + loginPage + "\"."); @@ -166,9 +170,11 @@ public class AuthenticationFilter implements Filter{ if (loginPageForward) { RequestDispatcher dispatcher = req.getRequestDispatcher(loginPage); dispatcher.forward(httpServletRequest, httpServletResponse); + return; } else { httpServletResponse.sendRedirect(httpServletResponse.encodeRedirectURL(loginPage)); + return; } @@ -179,13 +185,13 @@ public class AuthenticationFilter implements Filter{ } catch (Exception e) { - String redirectURL = "./index.action"; - HttpServletResponse httpResp = (HttpServletResponse) resp; - redirectURL = httpResp.encodeRedirectURL(redirectURL); - resp.setContentType("text/html"); - ((HttpServletResponse) resp).setStatus(302); - httpResp.addHeader("Location", redirectURL); - log.warn("A Filter Error occurs -> Redirect to Login-Form"); +// String redirectURL = "./index.action"; +// HttpServletResponse httpResp = (HttpServletResponse) resp; +// redirectURL = httpResp.encodeRedirectURL(redirectURL); +// resp.setContentType("text/html"); +// ((HttpServletResponse) resp).setStatus(302); +// httpResp.addHeader("Location", redirectURL); +// log.warn("A Filter Error occurs -> Redirect to Login-Form"); } } -- cgit v1.2.3