fix(#2651): Add sanitize file name to FileManger

apache · Apr 3, 2024 · eeff3c5 · eeff3c5
1 parent 30c2f83
commit eeff3c5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/...es-pipeline-management/src/main/java/org/apache/streampipes/manager/file/FileManager.java b/...es-pipeline-management/src/main/java/org/apache/streampipes/manager/file/FileManager.java
@@ -60,13 +60,16 @@ public static FileMetadata storeFile(String user,
                                        String filename,
                                        InputStream fileInputStream) throws IOException {
 
-    String filetype = filename.substring(filename.lastIndexOf(".") + 1);
+    // prevent the user from using special characters in the file name
+    var sanitizedFilename = sanitizeFilename(filename);
+
+    var filetype = filename.substring(sanitizedFilename.lastIndexOf(".") + 1);
 
     fileInputStream = cleanFile(fileInputStream, filetype);
 
 
-    FileMetadata fileMetadata = makeFileMetadata(user, filename, filetype);
-    new FileHandler().storeFile(filename, fileInputStream);
+    var fileMetadata = makeFileMetadata(user, sanitizedFilename, filetype);
+    new FileHandler().storeFile(sanitizedFilename, fileInputStream);
     storeFileMetadata(fileMetadata);
     return fileMetadata;
   }

diff --git a/...ipeline-management/src/test/java/org/apache/streampipes/manager/file/TestFileManager.java b/...ipeline-management/src/test/java/org/apache/streampipes/manager/file/TestFileManager.java
@@ -91,9 +91,9 @@ public void sanitizeFilename_returnsEmptyStringForEmptyFilename() {
 
   @Test
   public void sanitizeFilename_removesSingleParentDirectory() {
-    var filename = "../file";
+    var filename = "../file.csv";
     var sanitizedFilename = FileManager.sanitizeFilename(filename);
-    assertEquals(".._file", sanitizedFilename);
+    assertEquals(".._file.csv", sanitizedFilename);
   }
 
   @Test