Compare commits

...

6 Commits
master ... v1.4

Author SHA1 Message Date
Uku Taht ff52f8855c Changelog 5 years ago
Uku Taht 3e46f1bcf2 Deliver password reset email asynchronously
Fixes a potential timing attack where someone could find out
whether an email address is in our database or not.
5 years ago
Uku Taht 2037605d84 Use safe email functions
Fixes #1545
5 years ago
Uku Taht bbd2bd4627 Update changelog 5 years ago
Uku Taht 3f8804a530 Fix error with conversion rate 5 years ago
Uku Taht 7aa4c7812c Ensure that question marks are encoded properly for the database 5 years ago

@ -1,7 +1,32 @@
# Changelog # Changelog
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
## Unreleased ## v1.4.4
### Fixed
- Fix vulnerability with password reset emails
## v1.4.3
### Fixed
- Make sure that ownership transfer can be made in self-hosted without creating a trial
## v1.4.3
### Added
- Data exported via the download button will contain CSV data for all visible graphs in a zip file.
## v1.4.2
### Fixed
- Fixes database error when filtered for goal with empty data
## v1.4.1
### Fixed
- Fixes database error when pathname contains a question mark
## v1.4.0
### Added ### Added
- New parameter `metrics` for the `/api/v1/stats/timeseries` endpoint plausible/analytics#952 - New parameter `metrics` for the `/api/v1/stats/timeseries` endpoint plausible/analytics#952

@ -157,33 +157,30 @@ defmodule Plausible.Stats.Base do
Enum.reduce(Filters.visit_props(), sessions_q, fn prop_name, sessions_q -> Enum.reduce(Filters.visit_props(), sessions_q, fn prop_name, sessions_q ->
filter = query.filters["visit:" <> prop_name] filter = query.filters["visit:" <> prop_name]
prop_name = Map.get(@api_prop_name_to_db, prop_name, prop_name)
prop_name =
Map.get(@api_prop_name_to_db, prop_name, prop_name)
|> String.to_existing_atom()
case filter do case filter do
{:is, value} -> {:is, value} ->
where_target = [{String.to_existing_atom(prop_name), db_prop_val(prop_name, value)}] value = db_prop_val(prop_name, value)
from(s in sessions_q, where: ^where_target) from(s in sessions_q, where: fragment("? = ?", field(s, ^prop_name), ^value))
{:is_not, value} -> {:is_not, value} ->
fragment_data = [ value = db_prop_val(prop_name, value)
{String.to_existing_atom(prop_name), {:!=, db_prop_val(prop_name, value)}} from(s in sessions_q, where: fragment("? != ?", field(s, ^prop_name), ^value))
]
from(s in sessions_q, where: fragment(^fragment_data))
{:member, values} -> {:member, values} ->
list = Enum.map(values, &db_prop_val(prop_name, &1)) list = Enum.map(values, &db_prop_val(prop_name, &1))
fragment_data = [{String.to_existing_atom(prop_name), {:in, list}}] from(s in sessions_q, where: fragment("? in tuple(?)", field(s, ^prop_name), ^list))
from(s in sessions_q, where: fragment(^fragment_data))
{:matches, expr} -> {:matches, expr} ->
regex = page_regex(expr) regex = page_regex(expr)
prop_name = String.to_existing_atom(prop_name)
from(s in sessions_q, where: fragment("match(?, ?)", field(s, ^prop_name), ^regex)) from(s in sessions_q, where: fragment("match(?, ?)", field(s, ^prop_name), ^regex))
{:does_not_match, expr} -> {:does_not_match, expr} ->
regex = page_regex(expr) regex = page_regex(expr)
prop_name = String.to_existing_atom(prop_name)
from(s in sessions_q, where: fragment("not(match(?, ?))", field(s, ^prop_name), ^regex)) from(s in sessions_q, where: fragment("not(match(?, ?))", field(s, ^prop_name), ^regex))
nil -> nil ->
@ -310,11 +307,11 @@ defmodule Plausible.Stats.Base do
end end
end end
defp db_prop_val("referrer_source", @no_ref), do: "" defp db_prop_val(:referrer_source, @no_ref), do: ""
defp db_prop_val("referrer", @no_ref), do: "" defp db_prop_val(:referrer, @no_ref), do: ""
defp db_prop_val("utm_medium", @no_ref), do: "" defp db_prop_val(:utm_medium, @no_ref), do: ""
defp db_prop_val("utm_source", @no_ref), do: "" defp db_prop_val(:utm_source, @no_ref), do: ""
defp db_prop_val("utm_campaign", @no_ref), do: "" defp db_prop_val(:utm_campaign, @no_ref), do: ""
defp db_prop_val(_, val), do: val defp db_prop_val(_, val), do: val
defp utc_boundaries(%Query{period: "realtime"}, _timezone) do defp utc_boundaries(%Query{period: "realtime"}, _timezone) do

@ -616,6 +616,8 @@ defmodule PlausibleWeb.Api.StatsController do
end) end)
end end
defp maybe_add_cr([], _site, _query, _pagination, _key_name, _filter_name), do: []
defp maybe_add_cr(list, site, query, pagination, key_name, filter_name) do defp maybe_add_cr(list, site, query, pagination, key_name, filter_name) do
if Map.has_key?(query.filters, "event:goal") do if Map.has_key?(query.filters, "event:goal") do
items = Enum.map(list, fn item -> item[key_name] end) items = Enum.map(list, fn item -> item[key_name] end)

@ -252,7 +252,7 @@ defmodule PlausibleWeb.AuthController do
url = PlausibleWeb.Endpoint.url() <> "/password/reset?token=#{token}" url = PlausibleWeb.Endpoint.url() <> "/password/reset?token=#{token}"
Logger.debug("PASSWORD RESET LINK: " <> url) Logger.debug("PASSWORD RESET LINK: " <> url)
email_template = PlausibleWeb.Email.password_reset_email(email, url) email_template = PlausibleWeb.Email.password_reset_email(email, url)
Plausible.Mailer.deliver_now!(email_template) Plausible.Mailer.deliver_later(email_template)
render(conn, "password_reset_request_success.html", render(conn, "password_reset_request_success.html",
email: email, email: email,

@ -19,7 +19,7 @@ defmodule PlausibleWeb.InvitationController do
if invitation.role == :owner do if invitation.role == :owner do
Multi.new() Multi.new()
|> downgrade_previous_owner(invitation.site) |> downgrade_previous_owner(invitation.site)
|> end_trial_of_new_owner(user) |> maybe_end_trial_of_new_owner(user)
else else
Multi.new() Multi.new()
end end
@ -64,6 +64,12 @@ defmodule PlausibleWeb.InvitationController do
Multi.update_all(multi, :prev_owner, prev_owner, set: [role: :admin]) Multi.update_all(multi, :prev_owner, prev_owner, set: [role: :admin])
end end
defp maybe_end_trial_of_new_owner(multi, new_owner) do
if !Application.get_env(:plausible, :is_selfhost) do
end_trial_of_new_owner(multi, new_owner)
end
end
defp end_trial_of_new_owner(multi, new_owner) do defp end_trial_of_new_owner(multi, new_owner) do
if Plausible.Billing.on_trial?(new_owner) || is_nil(new_owner.trial_expiry_date) do if Plausible.Billing.on_trial?(new_owner) || is_nil(new_owner.trial_expiry_date) do
Ecto.Multi.update(multi, :user, Plausible.Auth.User.end_trial(new_owner)) Ecto.Multi.update(multi, :user, Plausible.Auth.User.end_trial(new_owner))
@ -87,22 +93,22 @@ defmodule PlausibleWeb.InvitationController do
defp notify_invitation_accepted(%Invitation{role: :owner} = invitation) do defp notify_invitation_accepted(%Invitation{role: :owner} = invitation) do
PlausibleWeb.Email.ownership_transfer_accepted(invitation) PlausibleWeb.Email.ownership_transfer_accepted(invitation)
|> Plausible.Mailer.send_email() |> Plausible.Mailer.send_email_safe()
end end
defp notify_invitation_accepted(invitation) do defp notify_invitation_accepted(invitation) do
PlausibleWeb.Email.invitation_accepted(invitation) PlausibleWeb.Email.invitation_accepted(invitation)
|> Plausible.Mailer.send_email() |> Plausible.Mailer.send_email_safe()
end end
defp notify_invitation_rejected(%Invitation{role: :owner} = invitation) do defp notify_invitation_rejected(%Invitation{role: :owner} = invitation) do
PlausibleWeb.Email.ownership_transfer_rejected(invitation) PlausibleWeb.Email.ownership_transfer_rejected(invitation)
|> Plausible.Mailer.send_email() |> Plausible.Mailer.send_email_safe()
end end
defp notify_invitation_rejected(invitation) do defp notify_invitation_rejected(invitation) do
PlausibleWeb.Email.invitation_rejected(invitation) PlausibleWeb.Email.invitation_rejected(invitation)
|> Plausible.Mailer.send_email() |> Plausible.Mailer.send_email_safe()
end end
def remove_invitation(conn, %{"invitation_id" => invitation_id}) do def remove_invitation(conn, %{"invitation_id" => invitation_id}) do

@ -93,7 +93,7 @@ defmodule PlausibleWeb.Site.MembershipController do
|> Repo.preload([:site, :inviter]) |> Repo.preload([:site, :inviter])
PlausibleWeb.Email.ownership_transfer_request(invitation, user) PlausibleWeb.Email.ownership_transfer_request(invitation, user)
|> Plausible.Mailer.send_email() |> Plausible.Mailer.send_email_safe()
conn conn
|> put_flash(:success, "Site transfer request has been sent to #{email}") |> put_flash(:success, "Site transfer request has been sent to #{email}")

@ -40,11 +40,11 @@ defmodule Plausible.Workers.NotifyAnnualRenewal do
case user.subscription.status do case user.subscription.status do
"active" -> "active" ->
template = PlausibleWeb.Email.yearly_renewal_notification(user) template = PlausibleWeb.Email.yearly_renewal_notification(user)
Plausible.Mailer.send_email(template) Plausible.Mailer.send_email_safe(template)
"deleted" -> "deleted" ->
template = PlausibleWeb.Email.yearly_expiration_notification(user) template = PlausibleWeb.Email.yearly_expiration_notification(user)
Plausible.Mailer.send_email(template) Plausible.Mailer.send_email_safe(template)
_ -> _ ->
Sentry.capture_message("Invalid subscription for renewal", user: user) Sentry.capture_message("Invalid subscription for renewal", user: user)

@ -78,10 +78,6 @@ defmodule Plausible.Workers.SendEmailReport do
name: name name: name
) )
try do Plausible.Mailer.send_email_safe(template)
Plausible.Mailer.send_email(template)
rescue
_ -> nil
end
end end
end end

@ -76,7 +76,7 @@ defmodule Plausible.Workers.SendSiteSetupEmails do
defp send_create_site_email(user) do defp send_create_site_email(user) do
PlausibleWeb.Email.create_site_email(user) PlausibleWeb.Email.create_site_email(user)
|> Plausible.Mailer.send_email() |> Plausible.Mailer.send_email_safe()
Repo.insert_all("create_site_emails", [ Repo.insert_all("create_site_emails", [
%{ %{
@ -88,7 +88,7 @@ defmodule Plausible.Workers.SendSiteSetupEmails do
defp send_setup_success_email(user, site) do defp send_setup_success_email(user, site) do
PlausibleWeb.Email.site_setup_success(user, site) PlausibleWeb.Email.site_setup_success(user, site)
|> Plausible.Mailer.send_email() |> Plausible.Mailer.send_email_safe()
Repo.insert_all("setup_success_emails", [ Repo.insert_all("setup_success_emails", [
%{ %{
@ -100,7 +100,7 @@ defmodule Plausible.Workers.SendSiteSetupEmails do
defp send_setup_help_email(user, site) do defp send_setup_help_email(user, site) do
PlausibleWeb.Email.site_setup_help(user, site) PlausibleWeb.Email.site_setup_help(user, site)
|> Plausible.Mailer.send_email() |> Plausible.Mailer.send_email_safe()
Repo.insert_all("setup_help_emails", [ Repo.insert_all("setup_help_emails", [
%{ %{

@ -50,33 +50,25 @@ defmodule Plausible.Workers.SendTrialNotifications do
defp send_one_week_reminder(user) do defp send_one_week_reminder(user) do
PlausibleWeb.Email.trial_one_week_reminder(user) PlausibleWeb.Email.trial_one_week_reminder(user)
|> send_email() |> Plausible.Mailer.send_email_safe()
end end
defp send_tomorrow_reminder(user) do defp send_tomorrow_reminder(user) do
usage = Plausible.Billing.usage_breakdown(user) usage = Plausible.Billing.usage_breakdown(user)
PlausibleWeb.Email.trial_upgrade_email(user, "tomorrow", usage) PlausibleWeb.Email.trial_upgrade_email(user, "tomorrow", usage)
|> send_email() |> Plausible.Mailer.send_email_safe()
end end
defp send_today_reminder(user) do defp send_today_reminder(user) do
usage = Plausible.Billing.usage_breakdown(user) usage = Plausible.Billing.usage_breakdown(user)
PlausibleWeb.Email.trial_upgrade_email(user, "today", usage) PlausibleWeb.Email.trial_upgrade_email(user, "today", usage)
|> send_email() |> Plausible.Mailer.send_email_safe()
end end
defp send_over_reminder(user) do defp send_over_reminder(user) do
PlausibleWeb.Email.trial_over_email(user) PlausibleWeb.Email.trial_over_email(user)
|> send_email() |> Plausible.Mailer.send_email_safe()
end
defp send_email(email) do
try do
Plausible.Mailer.send_email(email)
rescue
_ -> nil
end
end end
end end

@ -57,10 +57,6 @@ defmodule Plausible.Workers.SpikeNotifier do
dashboard_link dashboard_link
) )
try do Plausible.Mailer.send_email_safe(template)
Plausible.Mailer.send_email(template)
rescue
_ -> nil
end
end end
end end

Loading…
Cancel
Save