Amend the check on IllegalAttachmentFileNameException (#1215)

Co-authored-by: bhou <[email protected]>
Netflix · May 1, 2024 · 0dbdd3d · 0dbdd3d
1 parent 2a82b59
commit 0dbdd3d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/...c/main/java/com/netflix/genie/web/services/impl/LocalFileSystemAttachmentServiceImpl.java b/...c/main/java/com/netflix/genie/web/services/impl/LocalFileSystemAttachmentServiceImpl.java
@@ -94,9 +94,9 @@ public Set<URI> saveAttachments(
                 final long attachmentSize = attachment.contentLength();
                 final String filename = attachment.getFilename();
 
-                if (filename != null && filename.contains("/")) {
+                if (filename != null && (filename.contains("/") || filename.contains("\\"))) {
                     throw new IllegalAttachmentFileNameException("Attachment filename " + filename + " is illegal. "
-                        + "It should not contain the char: /.");
+                        + "Filenames should not contain / or \\.");
                 }
 
                 if (attachmentSize > this.attachmentServiceProperties.getMaxSize().toBytes()) {

diff --git a/...roovy/com/netflix/genie/web/services/impl/LocalFileSystemAttachmentServiceImplSpec.groovy b/...roovy/com/netflix/genie/web/services/impl/LocalFileSystemAttachmentServiceImplSpec.groovy
@@ -154,7 +154,7 @@ class LocalFileSystemAttachmentServiceImplSpec extends Specification {
         thrown(SaveAttachmentException)
     }
 
-    def "reject attachments with illegal filename"() {
+    def "reject attachments with illegal filename containing /"() {
         Set<Resource> attachments = new HashSet<Resource>()
         Resource attachment = Mockito.mock(Resource.class)
         Mockito.doReturn("../../../root/breakout.file").when(attachment).getFilename()
@@ -166,4 +166,17 @@ class LocalFileSystemAttachmentServiceImplSpec extends Specification {
         then:
         thrown(IllegalAttachmentFileNameException)
     }
+
+    def "reject attachments with illegal filename containing \\"() {
+        Set<Resource> attachments = new HashSet<Resource>()
+        Resource attachment = Mockito.mock(Resource.class)
+        Mockito.doReturn("c:\\root\\breakout.file").when(attachment).getFilename()
+        attachments.add(attachment)
+
+        when:
+        service.saveAttachments(null, attachments)
+
+        then:
+        thrown(IllegalAttachmentFileNameException)
+    }
 }