From 2ef1bbe443b09bbc8f5ceac7c90f4514746d8892 Mon Sep 17 00:00:00 2001 From: ulrich <not disclosed> Date: Thu, 28 Dec 2017 18:18:28 +0000 Subject: [PATCH] Filter fuer Markdown funbktioniert. Aber drei verschiedene Markdown-Libraries geben allesamt keine vollstaendige HTML-Seite aus. Hier muss noch herausgefunden werden, woran das liegen kann. Vielleicht ein Encoding-Problem. Oder ein unvollstaendiger Stream... --- src/de/uhilger/wbx/web/ViewServlet.java | 73 ++++++++++++++++++------------------ 1 files changed, 37 insertions(+), 36 deletions(-) diff --git a/src/de/uhilger/wbx/web/ViewServlet.java b/src/de/uhilger/wbx/web/ViewServlet.java index 891a98f..76e1a04 100644 --- a/src/de/uhilger/wbx/web/ViewServlet.java +++ b/src/de/uhilger/wbx/web/ViewServlet.java @@ -18,11 +18,14 @@ 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 @@ -33,40 +36,12 @@ * * TODO: Stylesheets dynamisch einbinden */ -public class ViewServlet extends WbxServlet { +public class ViewServlet extends DefaultServlet { 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 { ServletOutputStream out = response.getOutputStream(); printHeader(out); @@ -89,8 +64,35 @@ out.print("</body></html>"); } - /* - private String getUrlUser(HttpServletRequest request, String userName) throws IOException { + /** + * 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); + } + } + + protected String getUrlUser(HttpServletRequest request, String userName) { String result = ""; String requestUrlStr = request.getRequestURL().toString(); String contextPath = request.getContextPath(); @@ -108,7 +110,7 @@ return result; } - private String getUserName(HttpServletRequest hr) { + protected String getUserName(HttpServletRequest hr) { String userName = null; Object p = hr.getUserPrincipal(); if (p instanceof Principal) { @@ -116,8 +118,7 @@ } return userName; } - */ - + /** * Returns a short description of the servlet. * -- Gitblit v1.9.3