Mercurial > dive4elements > river
diff flys-client/src/main/java/de/intevation/flys/client/server/GGInAFilter.java @ 3851:a4c9296f6efa
Use the Context PATH servlet variable when using URLs in the GGInAFilter
flys-client/trunk@5591 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Bjoern Ricks <bjoern.ricks@intevation.de> |
|---|---|
| date | Mon, 24 Sep 2012 13:04:53 +0000 |
| parents | 71ba3cf3ec5e |
| children | 17fe00c09b7c |
line wrap: on
line diff
--- a/flys-client/src/main/java/de/intevation/flys/client/server/GGInAFilter.java Mon Sep 24 11:53:29 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/GGInAFilter.java Mon Sep 24 13:04:53 2012 +0000 @@ -34,6 +34,10 @@ private String authmethod; private ServletContext sc; + public static final String LOGIN_JSP = "/login.jsp"; + public static final String LOGIN_SERVLET = "/flys/login"; + public static final String FLYS_CSS = "/FLYS.css"; + /** * Initialize. @@ -46,6 +50,7 @@ { String deactivate = config.getInitParameter("deactivate"); this.sc = config.getServletContext(); + logger.debug("GGInAFilter context " + this.sc.getContextPath()); this.authmethod = sc.getInitParameter("authentication"); if (deactivate != null && deactivate.equalsIgnoreCase("true")) { this.deactivate = true; @@ -81,8 +86,10 @@ // Allow access to login pages // TODO Maybe replace with Filter <url-pattern> - if (requesturi.equals("/login.jsp") || requesturi.equals("/flys/login") - || requesturi.equals("/FLYS.css")) { + String path = this.sc.getContextPath(); + if (requesturi.equals(path + "/login.jsp") || + requesturi.equals(path + "/flys/login") + || requesturi.equals(path + "/FLYS.css")) { logger.debug("Request for login " + requesturi); chain.doFilter(req, resp); return; @@ -127,7 +134,8 @@ private void redirect(ServletResponse resp) throws IOException { logger.debug("Redirect to login"); - ((HttpServletResponse) resp).sendRedirect("/login.jsp"); + ((HttpServletResponse) resp).sendRedirect(this.sc.getContextPath() + + "/login.jsp"); }