Reduce errors sent to Sentry

pull/788/head
Uku Taht 6 years ago
parent 3c7a52bc21
commit 0ceb539a22

@ -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

@ -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

@ -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

@ -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",

@ -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

Loading…
Cancel
Save