From 74fab1c53fd3850bf0fd075c93622f14ad8dbe30 Mon Sep 17 00:00:00 2001
From: ulrich
Date: Wed, 06 Jan 2021 23:03:51 +0000
Subject: [PATCH] null pruefung hinzugefuegt

---
 src/java/de/uhilger/filecms/api/Api.java |  101 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 98 insertions(+), 3 deletions(-)

diff --git a/src/java/de/uhilger/filecms/api/Api.java b/src/java/de/uhilger/filecms/api/Api.java
index e9c8a4f..b26537e 100644
--- a/src/java/de/uhilger/filecms/api/Api.java
+++ b/src/java/de/uhilger/filecms/api/Api.java
@@ -20,32 +20,44 @@
 
 package de.uhilger.filecms.api;
 
+import de.uhilger.filecms.data.FileRef;
+import de.uhilger.filecms.web.Initialiser;
+import de.uhilger.transit.Access;
+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.security.Principal;
 import java.util.logging.Logger;
 import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
 
 /**
  *
  */
-public abstract class Api extends ApiBase implements WebKontext {
+public abstract class Api implements WebKontext, RequestKontext {
   
   protected ServletContext ctx;  
+  
+  /** Zeiger zum Request, der zur Ausfuehrung fuehrte */
+  protected 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 DAV_DIR_PATH = "dav/";
+
   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 DAV_DIR_NAME = "Austausch";
+
   public static final String WBX_ADMIN_ROLE = "wbxAdmin";
   
   public static final String WBX_BASE = "$basis";
   public static final String WBX_DATA = "$daten";
+  public static final String DAV_DATA = "$dav";
     
   /**
    * Einen relativen Pfad in einen absoluten Pfad der WebBox 
@@ -70,6 +82,9 @@
       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(relPath.startsWith(DAV_DIR_NAME)) {
+      targetPath = DAV_DIR_PATH + /* getUserName() +*/ relPath.substring(DAV_DIR_NAME.length());
       targetDir = new File(getBase().getAbsolutePath(), targetPath);
     } else if(getRequest().isUserInRole(WBX_ADMIN_ROLE)) {
       logger.fine("in admin role");
@@ -107,18 +122,98 @@
     }
     return base;
   }
+  
+  /* -------------- Hilfsfunktionen --------------- */
+  
+  /**
+   * Das Datenverzeichnis der WebBox ermitteln
+   * @return Ordner $wbx/daten
+   */
+  protected File getFileBase(ServletContext ctx) {
+    File file = null;
+    Object o = ctx.getAttribute(Initialiser.FILE_BASE);
+    if(o instanceof String) {
+      String baseStr = (String) o;
+      logger.fine(baseStr);
+      file = new File(baseStr);
+    }
+    return file;
+  }
+  
+  /**
+   * Den absoluten Pfad zum Verzeichnis ermitteln das gemaess der 
+   * Tomcat-Doku als CATALINA_BASE der WebBox gilt
+   * @return absoluter Pfad zu $wbx/sys/base
+   */
+  protected String getCatalinaBase(ServletContext ctx) {
+    String path = ctx.getRealPath("/");
+    logger.fine("getRealPath: " + path); // file-cms in webapps
+    File file = new File(path);
+    file = file.getParentFile().getParentFile();
+    return file.getAbsolutePath();
+  }
+  
+  /**
+   * Den absoluten Pfad zum Datenverzeichnis der WebBox ermitteln
+   * @return absoluter Pfad zu $wbx/daten
+   */
+  protected String getWbxDataDir(ServletContext ctx) {
+    return getFileBase(ctx).getAbsolutePath();
+  }
+  
+  /**
+   * Das Verzeichnis ermitteln, in dem die WebBox laeuft
+   * @return der Ordner $wbx
+   */
+  protected File getWbxDir(ServletContext ctx) {
+    String path = ctx.getRealPath("/");
+    logger.fine("getRealPath: " + path);
+    File file = new File(path);
+    file = file.getParentFile().getParentFile().getParentFile().getParentFile();    
+    logger.fine("WebBox: " + file.getAbsolutePath());
+    return file;
+  }
+  
+  /**
+   * den Namen des angemeldeten Benutzers ermitteln
+   * @return Name des angemeldeten Benutzers oder null, wenn keiner angemeldet ist
+   */
+  protected String getUserName() {
+    String userName = null;
+    Object p = getRequest().getUserPrincipal();
+    if(p instanceof Principal) {
+      userName = ((Principal) p).getName();
+    }
+    return userName;
+  }        
 
   
   /* ------------- Implementierung WebKontext ------------- */
 
   @Override
+  @Access(type = Access.Type.RESTRICT)
   public ServletContext getServletContext() {
     return ctx;
   }
 
   @Override
+  @Access(type = Access.Type.RESTRICT)
   public void setServletContext(ServletContext servletContext) {
     this.ctx = servletContext;
   }
   
+  /* ------------- Implementierung RequestKontext ------------- */
+
+  @Override
+  @Access(type = Access.Type.RESTRICT)
+  public HttpServletRequest getRequest() {
+    return request;
+  }
+
+  @Override
+  @Access(type = Access.Type.RESTRICT)
+  public void setRequest(HttpServletRequest r) {
+    this.request = r;
+  }
+  
 }

--
Gitblit v1.9.3