From 94a2d9eb867cb7b74c41e8eff9157c518e18408f Mon Sep 17 00:00:00 2001 From: ulrich <not disclosed> Date: Thu, 28 Dec 2017 11:06:35 +0000 Subject: [PATCH] Erste Version des MarkdownServlets fertig zum Test --- src/de/uhilger/wbx/web/ViewServlet.java | 40 +++++----------------------------------- 1 files changed, 5 insertions(+), 35 deletions(-) diff --git a/src/de/uhilger/wbx/web/ViewServlet.java b/src/de/uhilger/wbx/web/ViewServlet.java index 20106a3..4b3119c 100644 --- a/src/de/uhilger/wbx/web/ViewServlet.java +++ b/src/de/uhilger/wbx/web/ViewServlet.java @@ -18,14 +18,11 @@ package de.uhilger.wbx.web; import java.io.IOException; -import java.security.Principal; -import java.util.logging.Level; import java.util.logging.Logger; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.catalina.servlets.DefaultServlet; /** * Das ViewServlet fügt dem DefaultServlet von Tomcat @@ -36,41 +33,12 @@ * * TODO: Stylesheets dynamisch einbinden */ -public class ViewServlet extends DefaultServlet { +public class ViewServlet extends WbxServlet { private static final Logger logger = Logger.getLogger(ViewServlet.class.getName()); - private static final String HOME_CTX = "/home"; + //private static final String HOME_CTX = "/home"; - /** - * Handles the HTTP <code>GET</code> method. - * - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ - @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - String contextPath = request.getContextPath(); - if(HOME_CTX.equals(contextPath)) { - String userName = getUserName(request); - if (userName != null) { - String urlUser = getUrlUser(request, userName); - if(userName.equals(urlUser)) { - seiteAusgeben(request, response); - } else { - logger.fine("Wrong user."); - } - } else { - logger.fine("Missing login."); - } - } else { - seiteAusgeben(request, response); - } - } - - private void seiteAusgeben(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { + protected void seiteAusgeben(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { ServletOutputStream out = response.getOutputStream(); printHeader(out); super.doGet(request, response); @@ -92,6 +60,7 @@ out.print("</body></html>"); } + /* private String getUrlUser(HttpServletRequest request, String userName) throws IOException { String result = ""; String requestUrlStr = request.getRequestURL().toString(); @@ -118,6 +87,7 @@ } return userName; } + */ /** * Returns a short description of the servlet. -- Gitblit v1.9.3