From 16b2dbf0239718df8e4b26678d00a6a964d6022e Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Tue, 11 Feb 2020 10:10:53 +0200 Subject: [PATCH] Store raw fingerprint for testing --- lib/plausible/event/schema.ex | 3 ++- .../controllers/api/external_controller.ex | 14 ++++++++++---- .../20200211080841_add_raw_fingerprint.exs | 9 +++++++++ 3 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 priv/repo/migrations/20200211080841_add_raw_fingerprint.exs diff --git a/lib/plausible/event/schema.ex b/lib/plausible/event/schema.ex index 1dedeb218..aae310aed 100644 --- a/lib/plausible/event/schema.ex +++ b/lib/plausible/event/schema.ex @@ -10,6 +10,7 @@ defmodule Plausible.Event do field :new_visitor, :boolean field :user_id, :binary_id field :fingerprint, :string + field :raw_fingerprint, :string field :referrer, :string field :referrer_source, :string @@ -23,7 +24,7 @@ defmodule Plausible.Event do def changeset(pageview, attrs) do pageview - |> cast(attrs, [:name, :domain, :hostname, :pathname, :referrer, :new_visitor, :user_id, :fingerprint, :operating_system, :browser, :referrer_source, :country_code, :screen_size]) + |> cast(attrs, [:name, :domain, :hostname, :pathname, :referrer, :new_visitor, :user_id, :fingerprint, :raw_fingerprint, :operating_system, :browser, :referrer_source, :country_code, :screen_size]) |> validate_required([:name, :domain, :hostname, :pathname, :new_visitor, :user_id, :fingerprint]) end end diff --git a/lib/plausible_web/controllers/api/external_controller.ex b/lib/plausible_web/controllers/api/external_controller.ex index 4d29f330a..616feccb0 100644 --- a/lib/plausible_web/controllers/api/external_controller.ex +++ b/lib/plausible_web/controllers/api/external_controller.ex @@ -56,6 +56,7 @@ defmodule PlausibleWeb.Api.ExternalController do country_code: country_code, user_id: params["uid"], fingerprint: calculate_fingerprint(conn, params), + raw_fingerprint: calculate_raw_fingerprint(conn, params), operating_system: ua && os_name(ua), browser: ua && browser_name(ua), referrer_source: ref && referrer_source(uri, ref), @@ -69,15 +70,20 @@ defmodule PlausibleWeb.Api.ExternalController do end defp calculate_fingerprint(conn, params) do - user_agent = List.first(Plug.Conn.get_req_header(conn, "user-agent")) || "" - ip_address = to_string(:inet_parse.ntoa(conn.remote_ip)) || "" - domain = strip_www(params["domain"]) || "" + fingerprint = calculate_raw_fingerprint(conn, params) - :crypto.hash(:sha256, [user_agent, ip_address, domain]) + :crypto.hash(:sha256, fingerprint) |> Base.encode16 |> String.downcase end + defp calculate_raw_fingerprint(conn, params) do + user_agent = List.first(Plug.Conn.get_req_header(conn, "user-agent")) || "" + ip_address = to_string(:inet_parse.ntoa(conn.remote_ip)) || "" + domain = strip_www(params["domain"]) || "" + Enum.join([user_agent, ip_address, domain], ":") + end + defp calculate_screen_size(nil) , do: nil defp calculate_screen_size(width) when width < 576, do: "Mobile" defp calculate_screen_size(width) when width < 992, do: "Tablet" diff --git a/priv/repo/migrations/20200211080841_add_raw_fingerprint.exs b/priv/repo/migrations/20200211080841_add_raw_fingerprint.exs new file mode 100644 index 000000000..97b8e4d43 --- /dev/null +++ b/priv/repo/migrations/20200211080841_add_raw_fingerprint.exs @@ -0,0 +1,9 @@ +defmodule Plausible.Repo.Migrations.AddRawFingerprint do + use Ecto.Migration + + def change do + alter table(:events) do + add :raw_fingerprint, :text + end + end +end