default to utf-8 if charset is invalid

apache · Aug 12, 2024 · e7fd945 · e7fd945
1 parent 38cceb3
commit e7fd945
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/...st/scala/org/apache/pekko/http/scaladsl/server/directives/MarshallingDirectivesSpec.scala b/...st/scala/org/apache/pekko/http/scaladsl/server/directives/MarshallingDirectivesSpec.scala
@@ -283,11 +283,15 @@ class MarshallingDirectivesSpec extends RoutingSpec with Inside {
         responseEntity shouldEqual HttpEntity(ContentType(`text/plain`, `UTF-8`), foo)
       }
     }
-    "rrender text with UTF-8 encoding if an `Accept-Charset` request header requests a non-UTF-8 encoding" in {
+    "render text with requested encoding if an `Accept-Charset` request header requests a non-UTF-8 encoding" in {
       Get() ~> `Accept-Charset`(`ISO-8859-1`) ~> complete(foo) ~> check {
         responseEntity shouldEqual HttpEntity(ContentType(`text/plain`, `ISO-8859-1`), foo)
       }
     }
-
+    "render text with UTF-8 encoding if an `Accept-Charset` request header requests an unknown encoding" in {
+      Get() ~> `Accept-Charset`(HttpCharset("unknown")(Nil)) ~> complete(foo) ~> check {
+        responseEntity shouldEqual HttpEntity(ContentType(`text/plain`, `UTF-8`), foo)
+      }
+    }
   }
 }
diff --git a/...main/scala/org/apache/pekko/http/scaladsl/marshalling/PredefinedToEntityMarshallers.scala b/...main/scala/org/apache/pekko/http/scaladsl/marshalling/PredefinedToEntityMarshallers.scala
@@ -14,6 +14,7 @@
 package org.apache.pekko.http.scaladsl.marshalling
 
 import java.nio.CharBuffer
+import java.nio.charset.UnsupportedCharsetException
 
 import org.apache.pekko
 import pekko.http.scaladsl.model.MediaTypes._
@@ -55,7 +56,17 @@ trait PredefinedToEntityMarshallers extends MultipartMarshallers {
 
   implicit val StringMarshaller: ToEntityMarshaller[String] = stringMarshaller(`text/plain`)
   def stringMarshaller(mediaType: MediaType.WithOpenCharset): ToEntityMarshaller[String] =
-    Marshaller.withOpenCharset(mediaType) { (s, cs) => HttpEntity(mediaType.withCharset(cs), s) }
+    Marshaller.withOpenCharset(mediaType) { (s, cs) =>
+      // https://github.com/apache/pekko-http/issues/300
+      // ignore issues with invalid charset - use UTF-8 instead
+      try {
+        HttpEntity(mediaType.withCharset(cs), s)
+      } catch {
+        case _: UnsupportedCharsetException =>
+          HttpEntity(mediaType.withCharset(HttpCharsets.`UTF-8`), s)          
+      }
+
+    }
   def stringMarshaller(mediaType: MediaType.WithFixedCharset): ToEntityMarshaller[String] =
     Marshaller.withFixedContentType(mediaType) { s => HttpEntity(mediaType, s) }