fix: provide more accurate result for content type

Author: deki

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsServletContext.java

@@ -23,12 +23,17 @@
 import javax.activation.MimetypesFileTypeMap;
 import javax.servlet.*;
 import javax.servlet.descriptor.JspConfigDescriptor;
+import javax.ws.rs.core.MediaType;
 
 import java.io.File;
+import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
+import java.nio.file.Paths;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -129,23 +134,33 @@ public int getEffectiveMinorVersion() {
 
     @Override
     @SuppressFBWarnings("PATH_TRAVERSAL_IN") // suppressing because we are using the getValidFilePath
-    public String getMimeType(String s) {
-        if (s == null || !s.contains(".")) {
+    public String getMimeType(String file) {
+        if (file == null || !file.contains(".")) {
             return null;
         }
+        String mimeType = null;
+        try {
+            mimeType = Files.probeContentType(Paths.get(file));
+        } catch (IOException | InvalidPathException e) {
+            log("unable to probe for content type, will use fallback", e);
+        }
+
+        // MimetypesFileTypeMap is kept for backwards compatibility, remove in 2.0
         if (mimeTypes == null) {
             mimeTypes = new MimetypesFileTypeMap();
         }
-        if (s.endsWith(".css")) {
-                return "text/css";
+        String backwardsCompatibleMimeType = mimeTypes.getContentType(file);
+        // The getContentType method of the MimetypesFileTypeMap
+        // returns MimetypesFileTypeMap.defaultType = application/octet-stream
+        // instead of null when the type cannot be found.
+        if (mimeType == null || (backwardsCompatibleMimeType != null && !backwardsCompatibleMimeType.equals(mimeType)
+          && !MediaType.APPLICATION_OCTET_STREAM.equals(backwardsCompatibleMimeType))) {
+            log("using type " + backwardsCompatibleMimeType + " from MimetypesFileTypeMap for " + file
+              + " instead of " + mimeType + " for backwards compatibility");
+            mimeType = backwardsCompatibleMimeType;
         }
-        if (s.endsWith(".js")) {
-                return "application/javascript";
-        }
-        // TODO: The getContentType method of the MimetypesFileTypeMap returns application/octet-stream
-        // instead of null when the type cannot be found. We should replace with an implementation that
-        // loads the System mime types ($JAVA_HOME/lib/mime.types
-        return mimeTypes.getContentType(s);
+
+        return mimeType;
     }
 
 

aws-serverless-java-container-core/src/test/java/com/amazonaws/serverless/proxy/internal/servlet/AwsServletContextTest.java

@@ -75,7 +75,7 @@ void getMimeType_mimeTypeOfJavascript_expectApplicationJavascript() {
         String tmpFilePath = TMP_DIR + "some.js";
         AwsServletContext ctx = new AwsServletContext(null);
         String mimeType = ctx.getMimeType(tmpFilePath);
-        assertEquals("application/javascript", mimeType);
+        assertEquals("text/javascript", mimeType);
     }
 
     @Test