Add check for exact path match

[signal-cli] / src / main / java / org / asamk / signal / http / HttpServerHandler.java

diff --git a/src/main/java/org/asamk/signal/http/HttpServerHandler.java b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
index 9fb33a34e327547d90480227c1a5049253fa2f59..32000a1f4db86096ea155ea86432b601ab743b8a 100644 (file)
--- a/src/main/java/org/asamk/signal/http/HttpServerHandler.java
+++ b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
@@ -40,58 +40,14 @@ public class HttpServerHandler {
     }
 
     public void init() throws IOException {
-
         logger.info("Starting server on " + address.toString());
 
         final var server = HttpServer.create(address, 0);
         server.setExecutor(Executors.newFixedThreadPool(10));
 
-        server.createContext("/api/v1/rpc", httpExchange -> {
-
-            if (!"POST".equals(httpExchange.getRequestMethod())) {
-                sendResponse(405, null, httpExchange);
-                return;
-            }
-
-            if (!"application/json".equals(httpExchange.getRequestHeaders().getFirst("Content-Type"))) {
-                sendResponse(415, null, httpExchange);
-                return;
-            }
-
-            try {
-
-                final Object[] result = {null};
-                final var jsonRpcSender = new JsonRpcSender(s -> {
-                    if (result[0] != null) {
-                        throw new AssertionError("There should only be a single JSON-RPC response");
-                    }
-
-                    result[0] = s;
-                });
-
-                final var jsonRpcReader = new JsonRpcReader(jsonRpcSender, httpExchange.getRequestBody());
-                jsonRpcReader.readMessages((method, params) -> commandHandler.handleRequest(objectMapper,
-                        method,
-                        params), response -> logger.debug("Received unexpected response for id {}", response.getId()));
-
-                if (result[0] != null) {
-                    sendResponse(200, result[0], httpExchange);
-                } else {
-                    sendResponse(201, null, httpExchange);
-                }
-
-            } catch (Throwable aEx) {
-                logger.error("Failed to process request.", aEx);
-                sendResponse(200,
-                        JsonRpcResponse.forError(new JsonRpcResponse.Error(JsonRpcResponse.Error.INTERNAL_ERROR,
-                                "An internal server error has occurred.",
-                                null), null),
-                        httpExchange);
-            }
-        });
+        server.createContext("/api/v1/rpc", this::handleRpcEndpoint);
 
         server.start();
-
     }
 
     private void sendResponse(int status, Object response, HttpExchange httpExchange) throws IOException {
@@ -103,10 +59,55 @@ public class HttpServerHandler {
 
             httpExchange.getResponseBody().write(byteResponse);
         } else {
-            httpExchange.sendResponseHeaders(status, 0);
+            httpExchange.sendResponseHeaders(status, -1);
         }
 
         httpExchange.getResponseBody().close();
     }
 
+    private void handleRpcEndpoint(HttpExchange httpExchange) throws IOException {
+        if (!"/api/v1/rpc".equals(httpExchange.getRequestURI().getPath())) {
+            sendResponse(404, null, httpExchange);
+            return;
+        }
+        if (!"POST".equals(httpExchange.getRequestMethod())) {
+            sendResponse(405, null, httpExchange);
+            return;
+        }
+
+        if (!"application/json".equals(httpExchange.getRequestHeaders().getFirst("Content-Type"))) {
+            sendResponse(415, null, httpExchange);
+            return;
+        }
+
+        try {
+
+            final Object[] result = {null};
+            final var jsonRpcSender = new JsonRpcSender(s -> {
+                if (result[0] != null) {
+                    throw new AssertionError("There should only be a single JSON-RPC response");
+                }
+
+                result[0] = s;
+            });
+
+            final var jsonRpcReader = new JsonRpcReader(jsonRpcSender, httpExchange.getRequestBody());
+            jsonRpcReader.readMessages((method, params) -> commandHandler.handleRequest(objectMapper, method, params),
+                    response -> logger.debug("Received unexpected response for id {}", response.getId()));
+
+            if (result[0] != null) {
+                sendResponse(200, result[0], httpExchange);
+            } else {
+                sendResponse(201, null, httpExchange);
+            }
+
+        } catch (Throwable aEx) {
+            logger.error("Failed to process request.", aEx);
+            sendResponse(200,
+                    JsonRpcResponse.forError(new JsonRpcResponse.Error(JsonRpcResponse.Error.INTERNAL_ERROR,
+                            "An internal server error has occurred.",
+                            null), null),
+                    httpExchange);
+        }
+    }
 }