add unit test for Filesystem BlobKey and ContainerName validator

apache · May 6, 2024 · 6670c55 · 6670c55
1 parent 03aeccf
commit 6670c55
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/...org/jclouds/filesystem/predicates/validators/internal/FilesystemBlobKeyValidatorImpl.java b/...org/jclouds/filesystem/predicates/validators/internal/FilesystemBlobKeyValidatorImpl.java
@@ -20,6 +20,9 @@
 
 import com.google.inject.Singleton;
 
+import java.io.File;
+import java.util.Arrays;
+
 /**
  * Validates name for filesystem container blob keys implementation
  *
@@ -38,7 +41,7 @@ public void validate(String name) throws IllegalArgumentException {
         //blobkey cannot start with / (or \ in Windows) character
         if (name.startsWith("\\") || name.startsWith("/"))
             throw new IllegalArgumentException("Blob key '" + name + "' cannot start with \\ or /");
-        if (name.contains("../"))
+        if (Arrays.asList(name.split(File.separator.equals("\\") ? "\\\\" : File.separator)).contains(".."))
             throw new IllegalArgumentException("Blob key '" + name + "' cannot contain ../");
     }
 

diff --git a/...org/jclouds/filesystem/predicates/validators/internal/FilesystemBlobKeyValidatorTest.java b/...org/jclouds/filesystem/predicates/validators/internal/FilesystemBlobKeyValidatorTest.java
@@ -36,6 +36,7 @@ public void testNamesValidity() {
 
         validator.validate("all.img");
         validator.validate("all" + File.separator + "is" + File.separator + "" + "ok");
+        validator.validate("all" + File.separator + "is" + File.separator + ".." + "ok");
     }
 
     @Test
@@ -51,6 +52,11 @@ public void testInvalidNames() {
             validator.validate(File.separator + "is" + File.separator + "" + "ok");
             fail("Blob key value incorrect, but was not recognized");
         } catch (IllegalArgumentException e) {}
+
+        try {
+            validator.validate("all" + File.separator + ".." + File.separator + "ok");
+            fail("Blob key value incorrect, but was not recognized");
+        } catch (IllegalArgumentException e) {}
     }
 
 

diff --git a/...louds/filesystem/predicates/validators/internal/FilesystemContainerNameValidatorTest.java b/...louds/filesystem/predicates/validators/internal/FilesystemContainerNameValidatorTest.java
@@ -60,6 +60,16 @@ public void testInvalidNames() {
             validator.validate("all" + File.separator + "is" + File.separator);
             fail("Container name value incorrect, but was not recognized");
         } catch (IllegalArgumentException e) {}
+
+        try {
+            validator.validate(".");
+            fail("Container name value incorrect, but was not recognized");
+        } catch (IllegalArgumentException e) {}
+
+        try {
+            validator.validate("..");
+            fail("Container name value incorrect, but was not recognized");
+        } catch (IllegalArgumentException e) {}
     }