From e034aaaafed79cfcc3fbd4c50c06ffc34b250b9d Mon Sep 17 00:00:00 2001 From: ulrich <undisclosed> Date: Mon, 20 Mar 2017 16:08:09 +0000 Subject: [PATCH] log-Einstellungen geaendert --- src/java/de/uhilger/filecms/api/Api.java | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 103 insertions(+), 0 deletions(-) diff --git a/src/java/de/uhilger/filecms/api/Api.java b/src/java/de/uhilger/filecms/api/Api.java index fc588bc..3da69f3 100644 --- a/src/java/de/uhilger/filecms/api/Api.java +++ b/src/java/de/uhilger/filecms/api/Api.java @@ -20,8 +20,13 @@ package de.uhilger.filecms.api; +import de.uhilger.filecms.data.FileRef; +import de.uhilger.filecms.web.Initialiser; import de.uhilger.transit.web.RequestKontext; import de.uhilger.transit.web.WebKontext; +import java.io.File; +import java.security.Principal; +import java.util.logging.Logger; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; @@ -30,6 +35,19 @@ */ public abstract class Api implements WebKontext, RequestKontext { + private static final Logger logger = Logger.getLogger(Api.class.getName()); + + public static final String WBX_DATA_PATH = "daten/"; + public static final String PUB_DIR_PATH = "www/"; + public static final String HOME_DIR_PATH = "home/"; + public static final String PUB_DIR_NAME = "Oeffentlich"; + //public static final String HOME_DIR_NAME = "Persoenlicher Ordner"; + public static final String HOME_DIR_NAME = "Persoenlich"; + public static final String WBX_ADMIN_ROLE = "wbxAdmin"; + + public static final String WBX_BASE = "$basis"; + public static final String WBX_DATA = "$daten"; + /** Zeiger zum Servlet-Kontext dieser Anwendung */ private ServletContext ctx; @@ -37,6 +55,91 @@ private HttpServletRequest request; + /** + * Einen relativen Pfad in einen absoluten Pfad der WebBox + * aufloesen. + * + * Nur die absoluten Pfade zu PUB_DIR_NAME, HOME_DIR_NAME + * sowie WBX_BASE und WBX_DATA werden ausgegeben. Letztere + * beiden nur fuer Nutzer mit der Rolle WBX_ADMIN_ROLE. + * + * D.h., es werden nur Pfade aufgeloest, die sich innerhalb + * des Ordners der WeBox befinden. + * + * @param relPath + * @return + */ + protected File getTargetDir(String relPath) { + logger.fine(relPath); + File targetDir; + String targetPath = null; + if(relPath.startsWith(PUB_DIR_NAME)) { + targetPath = PUB_DIR_PATH + getUserName() + relPath.substring(PUB_DIR_NAME.length()); + targetDir = new File(getBase().getAbsolutePath(), targetPath); + } else if(relPath.startsWith(HOME_DIR_NAME)) { + targetPath = HOME_DIR_PATH + getUserName() + relPath.substring(HOME_DIR_NAME.length()); + targetDir = new File(getBase().getAbsolutePath(), targetPath); + } else if(getRequest().isUserInRole(WBX_ADMIN_ROLE)) { + logger.fine("in admin role"); + if(relPath.startsWith(WBX_BASE)) { + logger.fine("is base"); + targetPath = getCatalinaBase(); + targetDir = new File(targetPath, relPath.substring(WBX_BASE.length())); + } else if(relPath.startsWith(WBX_DATA)) { + targetPath = getWbxDataDir(); + logger.fine("is data, combine " + targetPath + ' ' + relPath.substring(WBX_DATA.length())); + targetDir = new File(targetPath, relPath.substring(WBX_DATA.length())); + } else { + targetDir = getDefaultDir(relPath); + } + } else { + // kann eigentlich nicht sein.. + targetDir = getDefaultDir(relPath); + } + logger.fine("returning targetDir " + targetDir.getAbsolutePath()); + //File targetDir = new File(getBase().getAbsolutePath(), targetPath); + return targetDir; + } + + protected File getDefaultDir(String relPath) { + String targetPath = PUB_DIR_PATH + getUserName() + relPath.substring(PUB_DIR_NAME.length()); + return new File(getBase().getAbsolutePath(), targetPath); + } + + protected FileRef getBase() { + FileRef base = null; + Object o = getServletContext().getAttribute(Initialiser.FILE_BASE); + if(o instanceof String) { + String baseStr = (String) o; + logger.fine(baseStr); + File file = new File(baseStr); + base = new FileRef(file.getAbsolutePath(), file.isDirectory()); + } + return base; + } + + protected String getUserName() { + String userName = null; + Object p = getRequest().getUserPrincipal(); + if(p instanceof Principal) { + userName = ((Principal) p).getName(); + } + return userName; + } + + protected String getCatalinaBase() { + String path = getServletContext().getRealPath("/"); + logger.fine("getRealPath: " + path); // file-cms in webapps + File file = new File(path); + file = file.getParentFile().getParentFile(); + return file.getAbsolutePath(); + } + + protected String getWbxDataDir() { + String wbxBase = getBase().getAbsolutePath(); + File file = new File(wbxBase); + return file.getAbsolutePath(); + } /* ------------- Implementierung WebKontext ------------- */ @Override -- Gitblit v1.9.3