Changeset 1377

Timestamp:

2008-01-20 18:59:56 (9 months ago)

Author:

mosipov

Message:

Added method and testcases to validate path

Location:

FCKeditor.Java/branches/2.4/src

Files:

• main/java/net/fckeditor/connector/ConnectorServlet.java (modified) (2 diffs)
• main/java/net/fckeditor/tool/Utils.java (modified) (3 diffs)
• test/java/net/fckeditor/tool/UtilsTest.java (modified) (1 diff)

FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/connector/ConnectorServlet.java

@@ -114 +114 @@
         String typeStr = request.getParameter("Type");
         String currentFolderStr = request.getParameter("CurrentFolder");
-
+        boolean validPath = Utils.isValidPath(currentFolderStr);
         // TODO untersuchen wie es vom Res Browser kommt
         String currentPath = constructTypeBasedFolderString(typeStr, currentFolderStr);
@@ -121 +121 @@
         File currentDir = new File(currentDirPath);
         if (!currentDir.exists()) {
-            currentDir.mkdir();
+            currentDir.mkdirs();
             logger.debug("Dir successfull created: " + currentDirPath);
         }

FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/tool/Utils.java

@@ -24 +24 @@
 import java.util.Set;
 import java.util.StringTokenizer;
+
+import org.apache.commons.io.FilenameUtils;
 
 /**
@@ -119 +121 @@
 
         // TODO code isn't very beautiful, is there a better way besides looping through the filename?
-        static String forceSingleExtension (final String filename) {
+        public static String forceSingleExtension (final String filename) {
                 
                 int lastDotPosition = filename.lastIndexOf(".");
@@ -129 +131 @@
         }
 
-        static boolean isSingleExtension (final String filename) {
+        public static boolean isSingleExtension (final String filename) {
                 
                 return filename.matches("[^\\.]+\\.[^\\.]+");
                 
         }
+        
+        public static boolean isValidPath (final String path) {
+                
+                if (isEmpty(path))
+                        return false;
+                
+                if (!path.startsWith("/"))
+                        return false;
+                
+                if (isEmpty(FilenameUtils.normalize(path)))
+                        return false;
+                
+                return true;
+        }
 }

FCKeditor.Java/branches/2.4/src/test/java/net/fckeditor/tool/UtilsTest.java

@@ -146 +146 @@
                 assertEquals("hacked_.txt", actual);
         }
+        
+        @Test
+        public void isValidPath01 () {
+                String path = "";
+                boolean condition = !Utils.isValidPath(path);
+                assertTrue(condition);
+        }
+        @Test
+        public void isValidPath02 () {
+                String path = "/";
+                boolean condition = Utils.isValidPath(path);
+                assertTrue(condition);
+        }
+        
+        @Test
+        public void isValidPath03 () {
+                String path = "/./";
+                boolean condition = Utils.isValidPath(path);
+                assertTrue(condition);
+        }
+        
+        @Test
+        public void isValidPath04 () {
+                String path = "/newf/..";
+                boolean condition = Utils.isValidPath(path);
+                assertTrue(condition);
+        }
+        
+        @Test
+        public void isValidPath05 () {
+                String path = "/../";
+                boolean condition = !Utils.isValidPath(path);
+                assertTrue(condition);
+        }
+        
+        @Test
+        public void isValidPath06 () {
+                String path = "/stuff/../..";
+                boolean condition = !Utils.isValidPath(path);
+                assertTrue(condition);
+        }
+        
+        @Test
+        public void isValidPath07 () {
+                String path = "/my/stuff/..";
+                boolean condition = Utils.isValidPath(path);
+                assertTrue(condition);
+        }
 }