From: cedb <cedb@keylimebox.org>
Date: Sat, 7 Jan 2023 22:46:07 +0000 (-0500)
Subject: Change content-type check to check contains
X-Git-Tag: v0.11.8~15
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/15630356e18f59e8f4d29a5c9f215003ad07402e?ds=sidebyside

Change content-type check to check contains

So far it was doing an equals check, but a string like "application/json; charset=utf-8"
is similarly valid. And some clients like OkHttp actually automatically add the
charset.

Closes #1152
---

diff --git a/src/main/java/org/asamk/signal/http/HttpServerHandler.java b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
index a6213929..f7d06b15 100644
--- a/src/main/java/org/asamk/signal/http/HttpServerHandler.java
+++ b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
@@ -89,7 +89,8 @@ public class HttpServerHandler {
             return;
         }
 
-        if (!"application/json".equals(httpExchange.getRequestHeaders().getFirst("Content-Type"))) {
+        final var contentType = httpExchange.getRequestHeaders().getFirst("Content-Type");
+        if (contentType == null || !contentType.startsWith("application/json")) {
             sendResponse(415, null, httpExchange);
             return;
         }