plausible/analytics
1
1
Fork 0
mirror of https://github.com/plausible/analytics.git synced 2024-12-23 09:33:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove raw fingerprint

Browse Source
This commit is contained in:
Uku Taht 2020-02-11 11:02:44 +02:00
parent 759c21fff0
commit 7bb5d98956
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/plausible/event/schema.ex
View File

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

14
lib/plausible_web/controllers/api/external_controller.ex
View File

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

9
priv/repo/migrations/20200211090126_remove_raw_fingerprint.exs Normal file
View File

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