block jp2 processing for image/vnd.microsoft.icon and add test (#1837)

UNC-Libraries · Nov 20, 2024 · c722d36 · c722d36
1 parent 8392846
commit c722d36
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/...el-app/src/main/java/edu/unc/lib/boxc/services/camel/images/ImageDerivativeProcessor.java b/...el-app/src/main/java/edu/unc/lib/boxc/services/camel/images/ImageDerivativeProcessor.java
@@ -19,7 +19,8 @@ public class ImageDerivativeProcessor implements Processor {
 
     private static final Pattern MIMETYPE_PATTERN = Pattern.compile("^(image.*$|application.*?(photoshop|psd)$)");
 
-    private static final Pattern DISALLOWED_PATTERN = Pattern.compile(".*(vnd\\.fpx|x-icon|x-raw-panasonic).*");
+    private static final Pattern DISALLOWED_PATTERN =
+            Pattern.compile(".*(vnd\\.fpx|x-icon|x-raw-panasonic|vnd\\.microsoft\\.icon).*");
 
     /**
      * Returns true if the subject of the exchange is a binary which

diff --git a/...pp/src/test/java/edu/unc/lib/boxc/services/camel/images/ImageDerivativeProcessorTest.java b/...pp/src/test/java/edu/unc/lib/boxc/services/camel/images/ImageDerivativeProcessorTest.java
@@ -73,4 +73,11 @@ public void testAllowedImageTypePhotoshop() {
 
         assertTrue(ImageDerivativeProcessor.allowedImageType(exchange));
     }
+
+    @Test
+    public void testAllowedImageTypeMicrosoft() {
+        when(messageIn.getHeader(CdrFcrepoHeaders.CdrBinaryMimeType)).thenReturn("image/vnd.microsoft.icon");
+
+        assertFalse(ImageDerivativeProcessor.allowedImageType(exchange));
+    }
 }