diff --git a/jeeutil/src/main/java/de/muehlencord/shared/jeeutil/AuthenticationFilter.java b/jeeutil/src/main/java/de/muehlencord/shared/jeeutil/AuthenticationFilter.java deleted file mode 100644 index 6d544b2..0000000 --- a/jeeutil/src/main/java/de/muehlencord/shared/jeeutil/AuthenticationFilter.java +++ /dev/null @@ -1,104 +0,0 @@ -package de.muehlencord.shared.jeeutil; - -import java.io.BufferedReader; -import java.io.FileReader; -import java.io.IOException; -import java.io.PrintStream; -import java.io.PrintWriter; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - - -/** - * - * @author Jörn Mühlencord (joern@muehlencord.de - */ -public class AuthenticationFilter implements Filter { - - private final static Logger LOGGER = LoggerFactory.getLogger(AuthenticationFilter.class); - private final static String USER = AuthenticationFilter.class.getName() + "_user"; - private String loginPage; - private String errorPage; - private FilterConfig filterConfig; - - @Override - public void init(FilterConfig filterConfig) throws ServletException { - this.filterConfig = filterConfig; - if (filterConfig != null) { - errorPage = filterConfig.getInitParameter("error_page"); - loginPage = filterConfig.getInitParameter("login_page"); - } - } - - @Override - public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { - - if ((loginPage == null) || (errorPage == null)) { - returnError(response, "AuthenticationFilter not properly configured! Contact Administrator."); - } - - User currentUser = null; - HttpSession session = ((HttpServletRequest) request).getSession(); - - if (session != null) { - if (session.getAttribute(USER) != null) { - currentUser = (User) session.getAttribute(USER); - LOGGER.debug("found " + currentUser); - } else { - LOGGER.debug("No active session found - going to force login"); - filterConfig.getServletContext().getRequestDispatcher(loginPage).forward(request, response); - } - } else { - - if (currentUser == null) { - LOGGER.debug("No logged in user found - going to force login"); - filterConfig.getServletContext().getRequestDispatcher(loginPage).forward(request, response); - } else { - LOGGER.debug("User is authenticated, continue filter chain"); - // user is authenticated, continue with filter chain - chain.doFilter(request, response); - } - } - } - - @Override - public void destroy() { - this.filterConfig = null; - } - - private void returnError(ServletResponse response, String errorMsg) { - response.setContentType("text/html"); - try ( - ServletOutputStream servletOutputStream = response.getOutputStream(); - PrintStream ps = new PrintStream(servletOutputStream); - PrintWriter pw = new PrintWriter(ps)) { - - pw.print(""); - pw.print("Error"); - pw.print(""); - pw.print("

"); - pw.print(errorMsg); - pw.print("

"); - pw.print(""); - - } catch (Exception ex) { - LOGGER.error(errorMsg, ex); - } - } - - static String readFirstLineFromFile(String path) throws IOException { - try (BufferedReader br = new BufferedReader(new FileReader(path))) { - return br.readLine(); - } - } -} diff --git a/jeeutil/src/main/java/de/muehlencord/shared/jeeutil/Authenticator.java b/jeeutil/src/main/java/de/muehlencord/shared/jeeutil/Authenticator.java deleted file mode 100644 index 56317d4..0000000 --- a/jeeutil/src/main/java/de/muehlencord/shared/jeeutil/Authenticator.java +++ /dev/null @@ -1,15 +0,0 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package de.muehlencord.shared.jeeutil; - -/** - * - * @author jomu - */ -public interface Authenticator { - - public User getUser (); - -} diff --git a/jeeutil/src/main/java/de/muehlencord/shared/jeeutil/User.java b/jeeutil/src/main/java/de/muehlencord/shared/jeeutil/User.java deleted file mode 100644 index 8834a85..0000000 --- a/jeeutil/src/main/java/de/muehlencord/shared/jeeutil/User.java +++ /dev/null @@ -1,13 +0,0 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package de.muehlencord.shared.jeeutil; - -/** - * - * @author jomu - */ -public class User { - -}