Fix: Treat unrecognized MIME types as binary in MediaType

varshith257 · Nov 9, 2024 · 6883910 · 6883910
1 parent c51db7f
commit 6883910
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/zio-http/jvm/src/test/scala/zio/http/MediaTypeSpec.scala b/zio-http/jvm/src/test/scala/zio/http/MediaTypeSpec.scala
@@ -48,5 +48,13 @@ object MediaTypeSpec extends ZIOHttpSpec {
           ),
       )
     },
+    test("application/x-zip-compressed should be binary") {
+      val mediaType = MediaType.forContentType("application/x-zip-compressed")
+      assertTrue(mediaType.exists(_.binary))
+    },
+    test("text/plain should not be binary") {
+      val mediaType = MediaType.forContentType("text/plain")
+      assertTrue(mediaType.exists(!_.binary))
+    },
   )
 }
diff --git a/zio-http/shared/src/main/scala/zio/http/MediaType.scala b/zio-http/shared/src/main/scala/zio/http/MediaType.scala
@@ -64,11 +64,16 @@ object MediaType extends MediaTypes {
     val contentTypeParts = customMediaType.split('/')
     if (contentTypeParts.length == 2) {
       val subtypeParts = contentTypeParts(1).split(';')
+      // Default binary to true for unknown types unless they belong to text families
+      val isBinary     = !customMediaType.startsWith("text/") &&
+        !customMediaType.startsWith("application/json") &&
+        !customMediaType.startsWith("application/xml")
       if (subtypeParts.length >= 1) {
         Some(
           MediaType(
             mainType = contentTypeParts.head,
             subType = subtypeParts.head,
+            binary = isBinary,
             parameters = if (subtypeParts.length >= 2) parseOptionalParameters(subtypeParts.tail) else Map.empty,
           ),
         )