Improve MIME type checks

src/main/java/mil/dds/anet/database/AttachmentDao.java

@@ -92,8 +92,7 @@ public int updateInternal(Attachment obj) {
             + "UPDATE \"attachments\" SET \"mimeType\" = :mimeType, \"fileName\" = :fileName, "
             + "\"description\" = :description, \"classification\" = :classification, "
             + "\"caption\" = :caption, \"updatedAt\" = :updatedAt WHERE uuid = :uuid")
-        .bindBean(obj).bind("updatedAt", DaoUtils.asLocalDateTime(obj.getUpdatedAt()))
-        .bind("updatedAt", DaoUtils.asLocalDateTime(obj.getUpdatedAt())).execute();
+        .bindBean(obj).bind("updatedAt", DaoUtils.asLocalDateTime(obj.getUpdatedAt())).execute();
   }
 
   @Override
@@ -105,6 +104,14 @@ public int deleteInternal(String uuid) {
         .bind("uuid", uuid).mapTo(Integer.class).one();
   }
 
+  @InTransaction
+  public int updateMimeType(Attachment obj) {
+    return getDbHandle()
+        .createUpdate("/* updateAttachmentMimeType */ "
+            + "UPDATE \"attachments\" SET \"mimeType\" = :mimeType WHERE uuid = :uuid")
+        .bindBean(obj).execute();
+  }
+
   public interface AttachmentContent {
     @SqlUpdate("UPDATE attachments SET content = :content WHERE uuid = :uuid")
     void updateContent(@Bind("uuid") String uuid, @Bind("content") InputStream content);

src/main/java/mil/dds/anet/resources/AttachmentResource.java

@@ -105,13 +105,23 @@ private InputStream checkMimeType(final Attachment attachment,
       return attachmentContent;
     }
     if (!detectedMimeType.equals(attachment.getMimeType())) {
-      logger.error(
-          "Attachment content upload rejected for attachment {} (\"{}\"): "
-              + "stated mimeType \"{}\" differs from detected mimeType \"{}\"",
-          attachment.getUuid(), attachment.getFileName(), attachment.getMimeType(),
-          detectedMimeType);
-      throw new WebApplicationException("Attachment content does not match the MIME type",
-          Status.BAD_REQUEST);
+      if (getAllowedMimeTypes().contains(detectedMimeType)) {
+        logger.info(
+            "Attachment content upload for attachment {} (\"{}\"): "
+                + "updated stated mimeType \"{}\" to detected mimeType \"{}\"",
+            attachment.getUuid(), attachment.getFileName(), attachment.getMimeType(),
+            detectedMimeType);
+        attachment.setMimeType(detectedMimeType);
+        dao.updateMimeType(attachment);
+      } else {
+        logger.error(
+            "Attachment content upload rejected for attachment {} (\"{}\"): "
+                + "stated mimeType \"{}\" differs from detected mimeType \"{}\"",
+            attachment.getUuid(), attachment.getFileName(), attachment.getMimeType(),
+            detectedMimeType);
+        throw new WebApplicationException("Attachment content does not match the MIME type",
+            Status.BAD_REQUEST);
+      }
     }
     return tikaInputStream;
   }