Cater for dot in file extension

openmrs · Nov 5, 2024 · 1409306 · 1409306
1 parent d8ba8d5
commit 1409306
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/omod/src/main/java/org/openmrs/module/attachments/rest/AttachmentResource.java b/omod/src/main/java/org/openmrs/module/attachments/rest/AttachmentResource.java
@@ -9,6 +9,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import io.swagger.models.Model;
 import io.swagger.models.ModelImpl;
@@ -162,7 +163,11 @@ public Object upload(MultipartFile file, RequestContext context) throws Response
 			String fileType = tika.detect(file.getInputStream());
 			try {
 				MimeType mimeType = MimeTypes.getDefaultMimeTypes().forName(fileType);
-				if (!CollectionUtils.containsAny(mimeType.getExtensions(), Arrays.asList(allowedExtensions))) {
+
+				List<String> mimeTypeExtensions = mimeType.getExtensions().stream()
+				        .map(extension -> extension.replace(".", "")).collect(Collectors.toList());
+
+				if (!CollectionUtils.containsAny(mimeTypeExtensions, Arrays.asList(allowedExtensions))) {
 					throw new IllegalRequestException("The file content type " + fileType + " is not allowed");
 				}
 			}