This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch
2651-incorrect-redirect-to-dashboard-instead-of-app-module
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to
refs/heads/2651-incorrect-redirect-to-dashboard-instead-of-app-module by this
push:
new eeff3c5d52 fix(#2651): Add sanitize file name to FileManger
eeff3c5d52 is described below
commit eeff3c5d521a08578ad0659c31fd1cf0504bc353
Author: Philipp Zehnder <[email protected]>
AuthorDate: Wed Apr 3 10:16:23 2024 +0200
fix(#2651): Add sanitize file name to FileManger
---
.../java/org/apache/streampipes/manager/file/FileManager.java | 9 ++++++---
.../org/apache/streampipes/manager/file/TestFileManager.java | 4 ++--
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git
a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/file/FileManager.java
b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/file/FileManager.java
index 5674aaa12e..13ea4dab48 100644
---
a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/file/FileManager.java
+++
b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/file/FileManager.java
@@ -60,13 +60,16 @@ public class FileManager {
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/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/file/TestFileManager.java
b/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/file/TestFileManager.java
index 59e96b1e8c..8712776d09 100644
---
a/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/file/TestFileManager.java
+++
b/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/file/TestFileManager.java
@@ -91,9 +91,9 @@ public class TestFileManager {
@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