From 35827a56037a583eabea82708a801b7fc3f6d355 Mon Sep 17 00:00:00 2001 From: ulrich <not disclosed> Date: Sun, 04 Mar 2018 13:25:08 +0000 Subject: [PATCH] Umgestellt auf Thumbnailator --- src/de/uhilger/wbx/web/ViewServlet.java | 119 ++++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 73 insertions(+), 46 deletions(-) diff --git a/src/de/uhilger/wbx/web/ViewServlet.java b/src/de/uhilger/wbx/web/ViewServlet.java index aa0d1f1..76e1a04 100644 --- a/src/de/uhilger/wbx/web/ViewServlet.java +++ b/src/de/uhilger/wbx/web/ViewServlet.java @@ -1,8 +1,25 @@ +/* + WebBox - Dein Server. + Copyright (C) 2017 Ulrich Hilger, http://uhilger.de + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + */ package de.uhilger.wbx.web; import java.io.IOException; -import java.io.OutputStream; import java.security.Principal; +import java.util.logging.Level; import java.util.logging.Logger; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; @@ -11,12 +28,42 @@ import org.apache.catalina.servlets.DefaultServlet; /** - * + * Das ViewServlet fügt dem DefaultServlet von Tomcat + * Methoden hinzu, mit denen HTML-Inhalte wie sie z.B. mit + * TinyMCE erzeugt werden zu ganzen HTML-Seiten + * mit head und body tags sowie Stylesheet-Verweisen + * ergänzt werden + * + * TODO: Stylesheets dynamisch einbinden */ public class ViewServlet extends DefaultServlet { private static final Logger logger = Logger.getLogger(ViewServlet.class.getName()); + private static final String HOME_CTX = "/home"; + + private void seiteAusgeben(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { + ServletOutputStream out = response.getOutputStream(); + printHeader(out); + super.doGet(request, response); + printFooter(out); + } + + private void printHeader(ServletOutputStream out) throws IOException { + out.print("<!DOCTYPE html><html><head>\r\n"); + out.print("<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"/>\r\n"); + out.print("<link rel=\"stylesheet\" type=\"text/css\" href=\"/jslib/bootstrap/css/bootstrap.min.css\">\r\n"); + out.print("<link rel=\"stylesheet\" type=\"text/css\" href=\"/jslib/lightbox/lightbox.css\">\r\n"); + out.print("<link rel=\"stylesheet\" type=\"text/css\" href=\"stile.css\">\r\n"); + out.print("</head><body class=\"p-3\">\r\n"); + } + + private void printFooter(ServletOutputStream out) throws IOException { + out.print("<script src=\"/jslib/jquery/jquery.min.js\"></script>\r\n"); + out.print("<script src=\"/jslib/lightbox/lightbox.min.js\"></script>\r\n"); + out.print("</body></html>"); + } + /** * Handles the HTTP <code>GET</code> method. * @@ -26,64 +73,44 @@ * @throws IOException if an I/O error occurs */ @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - /* - ServletOutputStream out = response.getOutputStream(); - out.print("<!DOCTYPE html><html><head><title>Testausgabe</title></head><body>"); - super.doGet(request, response); - out.print("</body></html>"); - */ - + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + String contextPath = request.getContextPath(); + if(HOME_CTX.equals(contextPath)) { String userName = getUserName(request); - String requestURLStr = request.getRequestURL().toString(); - String contextPath = request.getContextPath(); - - ServletOutputStream out = response.getOutputStream(); - out.print("<!DOCTYPE html><html><head><title>Testausgabe</title></head><body>"); - out.print(getHtml("userName", userName)); - out.print(getHtml("contextPath", contextPath)); - out.print(getHtml("requestURL", requestURLStr)); - out.print(getHtml("urlUser", getUrlUser(out, requestURLStr, contextPath, userName))); - out.print("</body></html>"); + 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 String getUrlUser(ServletOutputStream out, String requestUrlStr, String contextPath, String userName) throws IOException { - String result = "urlUser nicht ermittelbar"; + protected String getUrlUser(HttpServletRequest request, String userName) { + String result = ""; + String requestUrlStr = request.getRequestURL().toString(); + String contextPath = request.getContextPath(); if(contextPath != null && requestUrlStr != null && userName != null) { int start = requestUrlStr.indexOf(contextPath); - out.print("<p>start: " + start + "</p>"); - out.print("<p>userName.length: " + userName.length() + "</p>"); - out.print("<p>contextPath.length(): " + contextPath.length() + "</p>"); - out.print("<p>requestUrlStr.length(): " + requestUrlStr.length() + "</p>"); start += contextPath.length(); start++; - out.print("<p>start: " + start + "</p>"); int end = start + userName.length(); try { result = requestUrlStr.substring(start, end); } catch(Exception ex) { - result = ex.getMessage(); + logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex); } } return result; } - private String getHtml(String label, String theVal) { - StringBuffer buf = new StringBuffer(); - buf.append("<p>"); - buf.append(label); - buf.append(": "); - if(theVal == null) { - buf.append("null"); - } else { - buf.append(theVal); - } - buf.append("</p>"); - return buf.toString(); - } - - private String getUserName(HttpServletRequest hr) { + protected String getUserName(HttpServletRequest hr) { String userName = null; Object p = hr.getUserPrincipal(); if (p instanceof Principal) { @@ -91,7 +118,7 @@ } return userName; } - + /** * Returns a short description of the servlet. * @@ -100,6 +127,6 @@ @Override public String getServletInfo() { return "Short description"; - }// </editor-fold> + } } -- Gitblit v1.9.3