From 7bb5d9895634071bb0d247eaddd75131835064b3 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Tue, 11 Feb 2020 11:02:44 +0200 Subject: [PATCH] Remove raw fingerprint --- lib/plausible/event/schema.ex | 3 +-- .../controllers/api/external_controller.ex | 14 ++++---------- .../20200211090126_remove_raw_fingerprint.exs | 9 +++++++++ 3 files changed, 14 insertions(+), 12 deletions(-) create mode 100644 priv/repo/migrations/20200211090126_remove_raw_fingerprint.exs diff --git a/lib/plausible/event/schema.ex b/lib/plausible/event/schema.ex index aae310aed..1dedeb218 100644 --- a/lib/plausible/event/schema.ex +++ b/lib/plausible/event/schema.ex @@ -10,7 +10,6 @@ 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 @@ -24,7 +23,7 @@ defmodule Plausible.Event do def changeset(pageview, attrs) do pageview - |> cast(attrs, [:name, :domain, :hostname, :pathname, :referrer, :new_visitor, :user_id, :fingerprint, :raw_fingerprint, :operating_system, :browser, :referrer_source, :country_code, :screen_size]) + |> 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 fc00b056b..b3353089b 100644 --- a/lib/plausible_web/controllers/api/external_controller.ex +++ b/lib/plausible_web/controllers/api/external_controller.ex @@ -56,7 +56,6 @@ 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), @@ -70,18 +69,13 @@ defmodule PlausibleWeb.Api.ExternalController do end defp calculate_fingerprint(conn, params) do - fingerprint = calculate_raw_fingerprint(conn, params) - - :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 = List.first(Plug.Conn.get_req_header(conn, "cf-connecting-ip")) || "" domain = strip_www(params["domain"]) || "" - Enum.join([user_agent, ip_address, domain], ":") + + :crypto.hash(:sha256, [user_agent, ip_address, domain]) + |> Base.encode16 + |> String.downcase end defp calculate_screen_size(nil) , do: nil diff --git a/priv/repo/migrations/20200211090126_remove_raw_fingerprint.exs b/priv/repo/migrations/20200211090126_remove_raw_fingerprint.exs new file mode 100644 index 000000000..f0900902a --- /dev/null +++ b/priv/repo/migrations/20200211090126_remove_raw_fingerprint.exs @@ -0,0 +1,9 @@ +defmodule Plausible.Repo.Migrations.RemoveRawFingerprint do + use Ecto.Migration + + def change do + alter table(:events) do + remove :raw_fingerprint + end + end +end