X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fwamblee%2Fphotos%2Fsecurity%2FAuthenticationFilter.java;h=621121e789787b249057c1b802519b712c7606e9;hb=acb0842f2c1a3fd90615c0d9766819b4133cb3fe;hp=04442f26c5548800ac59800ee969d8b768143dc4;hpb=8845e7fe6141ccc98fd070ee4e653941f6e60508;p=photos diff --git a/src/main/java/org/wamblee/photos/security/AuthenticationFilter.java b/src/main/java/org/wamblee/photos/security/AuthenticationFilter.java index 04442f2..621121e 100644 --- a/src/main/java/org/wamblee/photos/security/AuthenticationFilter.java +++ b/src/main/java/org/wamblee/photos/security/AuthenticationFilter.java @@ -43,19 +43,19 @@ public class AuthenticationFilter implements Filter { loginPage = aFilterConfig.getInitParameter(LOGINPAGE); if (loginPage == null) { throw new ServletException("No login page defined! Must specify '" + - LOGINPAGE + "' filter init parameter."); + LOGINPAGE + "' filter init parameter."); } role = aFilterConfig.getInitParameter(REQUIRED_ROLE); if (role == null) { throw new ServletException("No role name defined! Must specify '" + - REQUIRED_ROLE + "' filter init parameter."); + REQUIRED_ROLE + "' filter init parameter."); } resources = aFilterConfig.getInitParameter(RESOURCES); } @Override - public void doFilter(ServletRequest aRequest, ServletResponse aResponse, - FilterChain aChain) throws IOException, ServletException { + public void doFilter(ServletRequest aRequest, ServletResponse aResponse, FilterChain aChain) + throws IOException, ServletException { HttpServletRequest request = (HttpServletRequest) aRequest; String fullPath = request.getRequestURI(); @@ -65,14 +65,11 @@ public class AuthenticationFilter implements Filter { relpath = fullPath.substring(contextPath.length()); } - if (request.isUserInRole(role) || - (resources != null && relpath != null && relpath - .startsWith(resources))) { + if (request.isUserInRole(role) || (resources != null && relpath != null && relpath.startsWith(resources))) { aChain.doFilter(aRequest, aResponse); } else { request.getSession().invalidate(); - request.getRequestDispatcher(loginPage) - .forward(aRequest, aResponse); + request.getRequestDispatcher(loginPage).forward(aRequest, aResponse); } } @@ -80,5 +77,4 @@ public class AuthenticationFilter implements Filter { public void destroy() { // Empty. } - }