Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Fix error with JSON parsing

Uku Taht6b55ace01416
diff --git a/lib/plausible_web/controllers/api/external_controller.ex b/lib/plausible_web/controllers/api/external_controller.ex
index d3f8a1bd57..f32e6f31ca 100644
--- a/lib/plausible_web/controllers/api/external_controller.ex
+++ b/lib/plausible_web/controllers/api/external_controller.ex
@@ -4,12 +4,15 @@ defmodule PlausibleWeb.Api.ExternalController do
require Logger
def event(conn, _params) do
- params = parse_body(conn)
- Sentry.Context.set_extra_context(%{request: params})
-
- case create_event(conn, params) do
- :ok ->
- conn |> put_status(202) |> text("ok")
+ with {:ok, params} <- parse_body(conn),
+ _ <- Sentry.Context.set_extra_context(%{request: params}),
+ :ok <- create_event(conn, params) do
+ conn |> put_status(202) |> text("ok")
+ else
+ {:error, :invalid_json} ->
+ conn
+ |> put_status(400)
+ |> json(%{errors: %{request: "Unable to parse request body as json"}})
{:error, errors} ->
conn |> put_status(400) |> json(%{errors: errors})
@@ -273,10 +276,14 @@ defmodule PlausibleWeb.Api.ExternalController do
case conn.body_params do
%Plug.Conn.Unfetched{} ->
{:ok, body, _conn} = Plug.Conn.read_body(conn)
- Jason.decode!(body)
+
+ case Jason.decode(body) do
+ {:ok, params} -> {:ok, params}
+ _ -> {:error, :invalid_json}
+ end
params ->
- params
+ {:ok, params}
end
end
diff --git a/test/plausible_web/controllers/api/external_controller_test.exs b/test/plausible_web/controllers/api/external_controller_test.exs
index 659c8aecb7..4a9108f8d6 100644
--- a/test/plausible_web/controllers/api/external_controller_test.exs
+++ b/test/plausible_web/controllers/api/external_controller_test.exs
@@ -68,6 +68,15 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
assert pageview.pathname == "/"
end
+ test "returns error if JSON cannot be parsed", %{conn: conn} do
+ conn =
+ conn
+ |> put_req_header("content-type", "text/plain")
+ |> post("/api/event", "")
+
+ assert conn.status == 400
+ end
+
test "can send to multiple dashboards by listing multiple domains", %{conn: conn} do
params = %{
name: "pageview",