= httpx: make multipart unmarshaller strip Content-Type header, fixes #…

…875
spray · Oct 7, 2014 · b56619a · b56619a
1 parent f9309bb
commit b56619a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/spray-httpx/src/main/scala/spray/httpx/unmarshalling/FormDataUnmarshallers.scala b/spray-httpx/src/main/scala/spray/httpx/unmarshalling/FormDataUnmarshallers.scala
@@ -46,7 +46,7 @@ trait FormDataUnmarshallers {
         .getOrElse(ContentType(`text/plain`, defaultCharset)) // RFC 2046 section 5.1
       val outputStream = new ByteArrayOutputStream
       FileUtils.copyAll(part.readOnce(), outputStream)
-      BodyPart(HttpEntity(contentType, outputStream.toByteArray), headers)
+      BodyPart(HttpEntity(contentType, outputStream.toByteArray), headers.filterNot(_.isInstanceOf[`Content-Type`]))
     }(collection.breakOut)
   }
 

diff --git a/spray-httpx/src/test/scala/spray/httpx/unmarshalling/FormDataUnmarshallersSpec.scala b/spray-httpx/src/test/scala/spray/httpx/unmarshalling/FormDataUnmarshallersSpec.scala
@@ -45,9 +45,7 @@ class FormDataUnmarshallersSpec extends Specification {
             Seq(
               BodyPart(
                 HttpEntity(ContentTypes.`text/plain(UTF-8)`, "test@there.com"),
-                List(
-                  `Content-Disposition`("form-data", Map("name" -> "email")),
-                  `Content-Type`(ContentTypes.`text/plain(UTF-8)`)))))
+                List(`Content-Disposition`("form-data", Map("name" -> "email"))))))
         }
     }
     "correctly unmarshal multipart content with two different parts" in {
@@ -67,9 +65,7 @@ class FormDataUnmarshallersSpec extends Specification {
               BodyPart(HttpEntity(ContentTypes.`text/plain(UTF-8)`, "first part, with a trailing newline\r\n")),
               BodyPart(
                 HttpEntity(`application/octet-stream`, "filecontent"),
-                List(
-                  RawHeader("Content-Transfer-Encoding", "binary"),
-                  `Content-Type`(ContentTypes.`application/octet-stream`)))))
+                List(RawHeader("Content-Transfer-Encoding", "binary")))))
         }
     }
     "reject illegal multipart content" in {
@@ -96,10 +92,10 @@ class FormDataUnmarshallersSpec extends Specification {
             Seq(
               BodyPart(
                 HttpEntity(ContentTypes.`text/plain`, "ABC"),
-                List(`Content-Type`(ContentTypes.`text/plain`), `Content-Range`(ContentRange(0, 2, 26)))),
+                List(`Content-Range`(ContentRange(0, 2, 26)))),
               BodyPart(
                 HttpEntity(ContentTypes.`text/plain`, "XYZ"),
-                List(`Content-Type`(ContentTypes.`text/plain`), `Content-Range`(ContentRange(23, 25, 26))))))
+                List(`Content-Range`(ContentRange(23, 25, 26))))))
         }
     }
   }
@@ -159,6 +155,13 @@ class FormDataUnmarshallersSpec extends Specification {
            |--XYZABC--""".stripMargin).as[MultipartFormData]
       msg === "Illegal multipart/form-data content: unnamed body part (no Content-Disposition header or no 'name' parameter)"
     }
+
+    "round-trip a non-empty multipart message" in {
+      val parts = MultipartFormData(Map("message" -> BodyPart(HttpEntity(ContentTypes.`text/plain(UTF-8)`, "x"))))
+      val entity = spray.httpx.marshalling.marshalUnsafe(parts)
+      val roundtrippedParts = entity.as[MultipartFormData].right.get
+      roundtrippedParts === parts
+    }
   }
 
   "The UrlEncodedFormDataUnmarshaller" should {