From aa7eec382d53c85c4e5a2d8c6ec351aba85b6136 Mon Sep 17 00:00:00 2001 From: ulrich <undisclosed> Date: Thu, 05 Apr 2018 18:33:20 +0000 Subject: [PATCH] file content bei collectFiles hinzugenommen --- src/de/uhilger/wbx/web/ViewServlet.java | 74 ++++++++++++++++++++++++++++++++----- 1 files changed, 64 insertions(+), 10 deletions(-) diff --git a/src/de/uhilger/wbx/web/ViewServlet.java b/src/de/uhilger/wbx/web/ViewServlet.java index 4b3119c..f4b7126 100644 --- a/src/de/uhilger/wbx/web/ViewServlet.java +++ b/src/de/uhilger/wbx/web/ViewServlet.java @@ -18,11 +18,17 @@ 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.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; 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,24 +39,46 @@ * * 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"; - protected void seiteAusgeben(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { + private String getTitle() { + String title = null; + try { + Object object = ((Context) new InitialContext().lookup("java:comp/env")).lookup("webBoxViewTitle"); + if(object != null) { + title = object.toString(); + logger.finer("WebBox View Titel: " + title); + } + } catch (NamingException ex) { + logger.log(Level.SEVERE, null, ex); + } + return title; + } + + private void seiteAusgeben(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { ServletOutputStream out = response.getOutputStream(); - printHeader(out); + printHeader(out, request); super.doGet(request, response); printFooter(out); } - private void printHeader(ServletOutputStream out) throws IOException { + private void printHeader(ServletOutputStream out, HttpServletRequest request) 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"); + String title = getTitle(); + if(title != null) { + out.print("<title>"); + out.print(title); + out.print(" "); + out.print(request.getRequestURI()); + out.print("</title>\r\n"); + } out.print("</head><body class=\"p-3\">\r\n"); } @@ -60,8 +88,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(); @@ -79,7 +134,7 @@ return result; } - private String getUserName(HttpServletRequest hr) { + protected String getUserName(HttpServletRequest hr) { String userName = null; Object p = hr.getUserPrincipal(); if (p instanceof Principal) { @@ -87,8 +142,7 @@ } return userName; } - */ - + /** * Returns a short description of the servlet. * -- Gitblit v1.9.3