Store raw fingerprint for testing

pull/32/head
Uku Taht 7 years ago
parent 158dd3f822
commit 16b2dbf023

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

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

@ -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
Loading…
Cancel
Save