Merge pull request #738 from LukasLohoff/improve-file-detection

Improve content type detection for file uploads
terrestris · Sep 15, 2023 · 60d1cd2 · 60d1cd2
2 parents f61c9fa + af8fed8
commit 60d1cd2
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -137,7 +137,7 @@
 
     <!-- Utils -->
     <commons.io.version>2.13.0</commons.io.version>
-    <tika.core.version>2.9.0</tika.core.version>
+    <tika.version>2.9.0</tika.version>
     <reflections.version>0.10.2</reflections.version>
     <evo-inflector.version>1.3</evo-inflector.version>
 
@@ -511,7 +511,12 @@
       <dependency>
         <groupId>org.apache.tika</groupId>
         <artifactId>tika-core</artifactId>
-        <version>${tika.core.version}</version>
+        <version>${tika.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.tika</groupId>
+        <artifactId>tika-parsers-standard-package</artifactId>
+        <version>${tika.version}</version>
       </dependency>
 
       <!-- Jackson -->

diff --git a/shogun-lib/pom.xml b/shogun-lib/pom.xml
@@ -228,6 +228,11 @@
       <artifactId>tika-core</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.tika</groupId>
+      <artifactId>tika-parsers-standard-package</artifactId>
+    </dependency>
+
     <!-- Testing -->
     <dependency>
       <groupId>org.springframework</groupId>

diff --git a/shogun-lib/src/main/java/de/terrestris/shogun/lib/service/BaseFileService.java b/shogun-lib/src/main/java/de/terrestris/shogun/lib/service/BaseFileService.java
@@ -21,12 +21,11 @@
 import de.terrestris.shogun.properties.UploadProperties;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.io.FileUtils;
-import org.apache.tika.config.TikaConfig;
-import org.apache.tika.exception.TikaException;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.tika.Tika;
 import org.apache.tika.io.TikaInputStream;
 import org.apache.tika.metadata.Metadata;
 import org.apache.tika.metadata.TikaCoreProperties;
-import org.apache.tika.mime.MediaType;
 import org.apache.tomcat.util.http.fileupload.InvalidFileNameException;
 import org.apache.tomcat.util.http.fileupload.impl.InvalidContentTypeException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -66,21 +65,23 @@ public void isValid(MultipartFile file) throws Exception {
         this.verifyContentType(file);
     }
 
-    public void verifyContentType(MultipartFile file) throws IOException, TikaException {
+    public void verifyContentType(MultipartFile file) throws IOException {
         String contentType = file.getContentType();
         String name = file.getName();
         Metadata metadata = new Metadata();
         metadata.set(TikaCoreProperties.RESOURCE_NAME_KEY, name);
-        TikaConfig tika = new TikaConfig();
-        MediaType mediaType = tika.getDetector().detect(TikaInputStream.get(file.getBytes()), metadata);
-        if (!mediaType.toString().equals(contentType)) {
-            throw new IOException("Mediatype validation failed. Passed content type is " + contentType + " but detected mediatype is " + mediaType);
+
+        Tika tika = new Tika();
+        String detectedMediaType = tika.detect(TikaInputStream.get(file.getBytes()), metadata);
+
+        if (!StringUtils.equalsIgnoreCase(detectedMediaType, contentType)) {
+            throw new IOException("Media type validation failed. Passed content type is " + contentType + " but detected media type is " + detectedMediaType);
         }
     }
 
     public void isValidType(String contentType) throws InvalidContentTypeException {
         List<String> supportedContentTypes = getSupportedContentTypes();
-        boolean isMatch = PatternMatchUtils.simpleMatch(supportedContentTypes.toArray(new String[supportedContentTypes.size()]), contentType);
+        boolean isMatch = PatternMatchUtils.simpleMatch(supportedContentTypes.toArray(new String[0]), contentType);
         if (!isMatch) {
             log.warn("Unsupported content type {} for upload", contentType);
             throw new InvalidContentTypeException("Unsupported content type for upload!");
@@ -90,7 +91,7 @@ public void isValidType(String contentType) throws InvalidContentTypeException {
     public void isValidFileName(String fileName) throws InvalidFileNameException {
         List<String> illegalCharacters = Arrays.asList("\\", "/", ":", "*", "?", "\"", "<", ">", "|", "\\0", "\\n");
         if (illegalCharacters.stream().anyMatch(fileName::contains)) {
-            throw new InvalidFileNameException(fileName, "Filename contains illegal chracters. [\\, /, :, *, ?, \", <, >, |, \\0, \\n]");
+            throw new InvalidFileNameException(fileName, "Filename contains illegal characters. [\\, /, :, *, ?, \", <, >, |, \\0, \\n]");
         }
     }