diff --git a/lib/plausible/event/schema.ex b/lib/plausible/event/schema.ex index e98c08516..1dedeb218 100644 --- a/lib/plausible/event/schema.ex +++ b/lib/plausible/event/schema.ex @@ -9,6 +9,7 @@ defmodule Plausible.Event do field :pathname, :string field :new_visitor, :boolean field :user_id, :binary_id + field :fingerprint, :string field :referrer, :string field :referrer_source, :string @@ -22,7 +23,7 @@ defmodule Plausible.Event do def changeset(pageview, attrs) do pageview - |> cast(attrs, [:name, :domain, :hostname, :pathname, :referrer, :new_visitor, :user_id, :operating_system, :browser, :referrer_source, :country_code, :screen_size]) - |> validate_required([:name, :domain, :hostname, :pathname, :new_visitor, :user_id]) + |> cast(attrs, [:name, :domain, :hostname, :pathname, :referrer, :new_visitor, :user_id, :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 1668cc16c..0c6af6c22 100644 --- a/lib/plausible_web/controllers/api/external_controller.ex +++ b/lib/plausible_web/controllers/api/external_controller.ex @@ -55,6 +55,7 @@ defmodule PlausibleWeb.Api.ExternalController do new_visitor: params["new_visitor"], country_code: country_code, user_id: params["uid"], + fingerprint: calculate_fingerprint(conn, params), operating_system: ua && os_name(ua), browser: ua && browser_name(ua), referrer_source: ref && referrer_source(uri, ref), @@ -67,6 +68,16 @@ defmodule PlausibleWeb.Api.ExternalController do end 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 = Map.get(params, "domain", "") + + :crypto.hash(:sha256, [user_agent, ip_address, domain]) + |> Base.encode16 + |> String.downcase + 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/20200210134612_add_fingerprint_to_events.exs b/priv/repo/migrations/20200210134612_add_fingerprint_to_events.exs new file mode 100644 index 000000000..aa52987ea --- /dev/null +++ b/priv/repo/migrations/20200210134612_add_fingerprint_to_events.exs @@ -0,0 +1,9 @@ +defmodule Plausible.Repo.Migrations.AddFingerprintToEvents do + use Ecto.Migration + + def change do + alter table(:events) do + add :fingerprint, :string, size: 64 + end + end +end