From 0ceb539a22caa28f6a368af32643f417ef4b4e3f Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Wed, 3 Mar 2021 11:36:19 +0200 Subject: [PATCH] Reduce errors sent to Sentry --- .../controllers/api/external_controller.ex | 5 ++++- .../controllers/api/internal_controller.ex | 10 ++++++++-- lib/workers/provision_ssl_certificates.ex | 6 ++---- .../api/external_controller_test.exs | 18 ++++++++++++++++++ .../api/internal_controller_test.exs | 12 +++++++++++- 5 files changed, 43 insertions(+), 8 deletions(-) diff --git a/lib/plausible_web/controllers/api/external_controller.ex b/lib/plausible_web/controllers/api/external_controller.ex index 62faa8315..ab09730b4 100644 --- a/lib/plausible_web/controllers/api/external_controller.ex +++ b/lib/plausible_web/controllers/api/external_controller.ex @@ -135,7 +135,10 @@ defmodule PlausibleWeb.Api.ExternalController do raw_meta = params["m"] || params["meta"] || params["p"] || params["props"] if raw_meta do - Jason.decode!(raw_meta) + case Jason.decode(raw_meta) do + {:ok, props} when is_map(props) -> props + _ -> %{} + end else %{} end diff --git a/lib/plausible_web/controllers/api/internal_controller.ex b/lib/plausible_web/controllers/api/internal_controller.ex index 873548a96..6bd858ba8 100644 --- a/lib/plausible_web/controllers/api/internal_controller.ex +++ b/lib/plausible_web/controllers/api/internal_controller.ex @@ -12,7 +12,13 @@ defmodule PlausibleWeb.Api.InternalController do end def sites(conn, _) do - user = Repo.preload(conn.assigns[:current_user], :sites) - json(conn, Enum.map(user.sites, & &1.domain)) + if conn.assigns[:current_user] do + user = Repo.preload(conn.assigns[:current_user], :sites) + json(conn, Enum.map(user.sites, & &1.domain)) + else + conn + |> put_status(401) + |> json(%{error: "You need to be logged in to request a list of sites"}) + end end end diff --git a/lib/workers/provision_ssl_certificates.ex b/lib/workers/provision_ssl_certificates.ex index a542a7ab2..5ed8adf16 100644 --- a/lib/workers/provision_ssl_certificates.ex +++ b/lib/workers/provision_ssl_certificates.ex @@ -36,10 +36,8 @@ defmodule Plausible.Workers.ProvisionSslCertificates do end defp report_result({error_msg, error_code}, domain) do - Logger.error("Error obtaining SSL certificate for #{domain.domain}: #{error_msg}") - - Sentry.capture_message("Error obtaining SSL certificate", - extra: %{error_msg: error_msg, error_code: error_code, domain: domain.domain} + Logger.error( + "Error obtaining SSL certificate for #{domain.domain}: #{error_msg} (code=#{error_code})" ) # Failing to obtain is expected, not a failure for the job queue diff --git a/test/plausible_web/controllers/api/external_controller_test.exs b/test/plausible_web/controllers/api/external_controller_test.exs index 25a8a58d3..6cae5141e 100644 --- a/test/plausible_web/controllers/api/external_controller_test.exs +++ b/test/plausible_web/controllers/api/external_controller_test.exs @@ -416,6 +416,24 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do assert Map.get(event, :"meta.value") == ["true", "12"] end + test "ignores malformed custom props", %{conn: conn} do + params = %{ + name: "Signup", + url: "http://gigride.live/", + domain: "custom-prop-test-2.com", + props: "\"show-more:button\"" + } + + conn + |> put_req_header("content-type", "text/plain") + |> post("/api/event", Jason.encode!(params)) + + event = get_event("custom-prop-test-2.com") + + assert Map.get(event, :"meta.key") == [] + assert Map.get(event, :"meta.value") == [] + end + test "ignores a malformed referrer URL", %{conn: conn} do params = %{ name: "pageview", diff --git a/test/plausible_web/controllers/api/internal_controller_test.exs b/test/plausible_web/controllers/api/internal_controller_test.exs index 428128c0d..c5bbbd094 100644 --- a/test/plausible_web/controllers/api/internal_controller_test.exs +++ b/test/plausible_web/controllers/api/internal_controller_test.exs @@ -23,7 +23,7 @@ defmodule PlausibleWeb.Api.InternalControllerTest do end end - describe "GET /api/status" do + describe "GET /api/sites" do setup [:create_user, :log_in] test "returns a list of site domains for the current user", %{conn: conn, user: user} do @@ -34,4 +34,14 @@ defmodule PlausibleWeb.Api.InternalControllerTest do assert json_response(conn, 200) == [site.domain, site2.domain] end end + + describe "GET /api/sites - user not logged in" do + test "returns 401 unauthorized", %{conn: conn} do + conn = get(conn, "/api/sites") + + assert json_response(conn, 401) == %{ + "error" => "You need to be logged in to request a list of sites" + } + end + end end