From 6e1a290ebaddb441ff2a4fe911f1cdfc62070519 Mon Sep 17 00:00:00 2001 From: ulrich <undisclosed> Date: Wed, 29 Mar 2017 15:48:49 +0000 Subject: [PATCH] weitere Verschiebungen zwischen wbx-lib und WebKontext, Api, usw. --- src/java/de/uhilger/filecms/api/Api.java | 98 +++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 79 insertions(+), 19 deletions(-) diff --git a/src/java/de/uhilger/filecms/api/Api.java b/src/java/de/uhilger/filecms/api/Api.java index fc588bc..e9c8a4f 100644 --- a/src/java/de/uhilger/filecms/api/Api.java +++ b/src/java/de/uhilger/filecms/api/Api.java @@ -20,22 +20,94 @@ package de.uhilger.filecms.api; -import de.uhilger.transit.web.RequestKontext; import de.uhilger.transit.web.WebKontext; +import de.uhilger.wbx.api.ApiBase; +import de.uhilger.wbx.data.FileRef; +import java.io.File; +import java.util.logging.Logger; import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; /** * */ -public abstract class Api implements WebKontext, RequestKontext { +public abstract class Api extends ApiBase implements WebKontext { - /** Zeiger zum Servlet-Kontext dieser Anwendung */ - private ServletContext ctx; + protected ServletContext ctx; - /** Zeiger zum Request, der zur Ausfuehrung fuehrte */ - private HttpServletRequest request; + 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"; + + /** + * 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(ctx); + targetDir = new File(targetPath, relPath.substring(WBX_BASE.length())); + } else if(relPath.startsWith(WBX_DATA)) { + targetPath = getWbxDataDir(ctx); + 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 = getFileBase(ctx); + if(o instanceof File) { + File file = (File) o; + base = new FileRef(file.getAbsolutePath(), file.isDirectory()); + } + return base; + } + /* ------------- Implementierung WebKontext ------------- */ @@ -47,18 +119,6 @@ @Override public void setServletContext(ServletContext servletContext) { this.ctx = servletContext; - } - - /* ------------- Implementierung RequestKontext ------------- */ - - @Override - public HttpServletRequest getRequest() { - return request; - } - - @Override - public void setRequest(HttpServletRequest r) { - this.request = r; } } -- Gitblit v1.9.3