Extract request and response body by using the charset

newrelic · Nov 19, 2024 · b9cfda2 · b9cfda2
1 parent 12d1c7c
commit b9cfda2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/....23/src/main/scala/com.newrelic.agent.security.http4s.ember.server/RequestProcessor.scala b/....23/src/main/scala/com.newrelic.agent.security.http4s.ember.server/RequestProcessor.scala
@@ -11,6 +11,8 @@ import com.newrelic.api.agent.security.schema.exceptions.NewRelicSecurityExcepti
 import com.newrelic.api.agent.security.schema.operation.RXSSOperation
 import com.newrelic.api.agent.security.schema.policy.AgentPolicy
 import com.newrelic.api.agent.security.utils.logging.LogLevel
+import fs2.text.decodeWithCharset
+import org.http4s.Charset.`UTF-8`
 import org.http4s.{Headers, Message, Request, Response}
 
 import java.util
@@ -109,7 +111,12 @@ object RequestProcessor {
   }
 
   private def extractBody[F[_]: Sync](msg: Message[F]): F[String] = {
-    msg.bodyText.compile.string
+    if (msg.contentType.nonEmpty && msg.contentType.get.charset.nonEmpty) {
+      val charset = msg.contentType.get.charset.get;
+      msg.body.through(decodeWithCharset(charset.nioCharset)).compile.string
+    } else {
+      msg.bodyText.compile.string
+    }
   }
 
   private def processRequestHeaders(headers: Headers, securityRequest: HttpRequest): Unit = {

diff --git a/....23/src/main/scala/com.newrelic.agent.security.http4s.ember.server/RequestProcessor.scala b/....23/src/main/scala/com.newrelic.agent.security.http4s.ember.server/RequestProcessor.scala
@@ -11,6 +11,7 @@ import com.newrelic.api.agent.security.schema.exceptions.NewRelicSecurityExcepti
 import com.newrelic.api.agent.security.schema.operation.RXSSOperation
 import com.newrelic.api.agent.security.schema.policy.AgentPolicy
 import com.newrelic.api.agent.security.utils.logging.LogLevel
+import fs2.text.decodeWithCharset
 import org.http4s.{Headers, Message, Request, Response}
 
 import java.util
@@ -82,7 +83,12 @@ object RequestProcessor {
   }
 
   private def extractBody[F[_]: Sync](msg: Message[F]): F[String] = {
-    msg.bodyText.compile.string
+    if (msg.contentType.nonEmpty && msg.contentType.get.charset.nonEmpty) {
+      val charset = msg.contentType.get.charset.get;
+      msg.body.through(decodeWithCharset(charset.nioCharset)).compile.string
+    } else {
+      msg.bodyText.compile.string
+    }
   }
 
   private def postProcessSecurityHook[F[_]: Sync](isLockAcquired: Boolean, response: Response[F], body: String): F[Unit] = construct {