Merge pull request #301 from NDLANO/content-type-resize-check

#3719: Skip resizing svg-images even with weird fileextensions
NDLANO · Sep 25, 2023 · 4e12fd6 · 4e12fd6
2 parents 220b3f6 + db0cda0
commit 4e12fd6
Showing 1 changed file with 18 additions and 4 deletions.
diff --git a/image-api/src/main/scala/no/ndla/imageapi/controller/RawController.scala b/image-api/src/main/scala/no/ndla/imageapi/controller/RawController.scala
@@ -7,6 +7,7 @@
 
 package no.ndla.imageapi.controller
 
+import no.ndla.common.errors.ValidationException
 import no.ndla.common.model.NDLADate
 import no.ndla.imageapi.Props
 import no.ndla.imageapi.model.api.{Error, ErrorHelpers}
@@ -133,11 +134,24 @@ trait RawController {
     }: Unit
 
     private def getRawImage(imageName: String): Try[ImageStream] = {
-      val dynamicCropOrResize = if (canDoDynamicCrop) dynamicCrop _ else resize _
+      val dynamicCropOrResize =
+        if (canDoDynamicCrop) dynamicCrop _
+        else {
+          resize _
+        }
+      val nonResizableMimeTypes = List("image/gif", "image/svg", "image/svg+xml")
       imageStorage.get(imageName) match {
-        case Success(img) if List("gif", "svg").contains(img.format.toLowerCase) => Success(img)
-        case Success(img) => crop(img).flatMap(dynamicCropOrResize)
-        case Failure(e)   => Failure(e)
+        case Success(img) if nonResizableMimeTypes.contains(img.contentType.toLowerCase) => Success(img)
+        case Success(img) =>
+          crop(img)
+            .flatMap(dynamicCropOrResize)
+            .recoverWith {
+              case ex: ValidationException => Failure(ex)
+              case ex =>
+                logger.error(s"Could not crop or resize image '$imageName', got exception: '${ex.getMessage}'", ex)
+                Success(img)
+            }
+        case Failure(e) => Failure(e)
       }
     }