[jboss-svn-commits] JBL Code SVN: r11862 - labs/shotoku/trunk/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess.

[jboss-svn-commits at lists.jboss.org]

Author: adamw
Date: 2007-05-15 13:24:25 -0400 (Tue, 15 May 2007)
New Revision: 11862

Modified:
   labs/shotoku/trunk/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess/FileAccessConfiguration.java
   labs/shotoku/trunk/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess/FileAccessServlet.java
Log:
Some useless improvements

Modified: labs/shotoku/trunk/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess/FileAccessConfiguration.java
===================================================================
--- labs/shotoku/trunk/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess/FileAccessConfiguration.java	2007-05-15 17:02:41 UTC (rev 11861)
+++ labs/shotoku/trunk/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess/FileAccessConfiguration.java	2007-05-15 17:24:25 UTC (rev 11862)
@@ -44,8 +44,12 @@
 
         // 1. Allowed paths which contain a given string.
         String[] containingTokens = getTokensFromProperty(props, "allowed.paths.containing");
-        for (String containingToken : containingTokens) {
-            allowedPatterns.add(Pattern.compile(".*" + Pattern.quote(containingToken) + ".*"));
+        if (containingTokens.length == 0) {
+            allowedPatterns.add(Pattern.compile(".*"));   
+        } else {
+            for (String containingToken : containingTokens) {
+                allowedPatterns.add(Pattern.compile(".*" + Pattern.quote(containingToken) + ".*"));
+            }
         }
     }
 

Modified: labs/shotoku/trunk/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess/FileAccessServlet.java
===================================================================
--- labs/shotoku/trunk/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess/FileAccessServlet.java	2007-05-15 17:02:41 UTC (rev 11861)
+++ labs/shotoku/trunk/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess/FileAccessServlet.java	2007-05-15 17:24:25 UTC (rev 11862)
@@ -52,6 +52,10 @@
         response.getOutputStream().println(FileAccessServlet.ACCESS_DENIED);
     }
 
+    protected String getRealPath(String path) {
+        return path;
+    }
+
     protected void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
         FileAccessConfiguration fac = conf.get(confKey);
@@ -70,6 +74,8 @@
             path = requestedResTokens[2];
         }
 
+        path = getRealPath(path);
+
         try {
             // Checking if we can allow access to this resource.
             if (!fac.checkPath(path)) {