Admin access

pull/1119/head^2
Uku Taht 6 years ago
parent 62dfb43f10
commit 18ddf9dd9d

@ -49,9 +49,10 @@ db_socket_dir = get_var_from_path_or_env(config_dir, "DATABASE_SOCKET_DIR")
admin_user = get_var_from_path_or_env(config_dir, "ADMIN_USER_NAME")
admin_email = get_var_from_path_or_env(config_dir, "ADMIN_USER_EMAIL")
admin_emails =
get_var_from_path_or_env(config_dir, "ADMIN_EMAILS", "")
admin_user_ids =
get_var_from_path_or_env(config_dir, "ADMIN_USER_IDS", "")
|> String.split(",")
|> Enum.map(fn id -> Integer.parse(id) |> elem(0) end)
admin_pwd = get_var_from_path_or_env(config_dir, "ADMIN_USER_PWD")
env = get_var_from_path_or_env(config_dir, "ENVIRONMENT", "prod")
@ -162,7 +163,7 @@ config :plausible,
admin_pwd: admin_pwd,
environment: env,
mailer_email: mailer_email,
admin_emails: admin_emails,
admin_user_ids: admin_user_ids,
site_limit: site_limit,
site_limit_exempt: site_limit_exempt,
is_selfhost: is_selfhost

@ -15,12 +15,12 @@ defmodule PlausibleWeb.AuthorizeSiteAccess do
if !site do
PlausibleWeb.ControllerHelpers.render_error(conn, 404) |> halt
else
user = conn.assigns[:current_user]
membership_role = user && Plausible.Sites.role(user.id, site)
user_id = get_session(conn, :current_user_id)
membership_role = user_id && Plausible.Sites.role(user_id, site)
role =
cond do
user && membership_role ->
user_id && membership_role ->
membership_role
site.public ->
@ -29,7 +29,7 @@ defmodule PlausibleWeb.AuthorizeSiteAccess do
shared_link_record && shared_link_record.site_id == site.id ->
:public
user.email in admin_emails() ->
user_id in admin_user_ids() ->
:admin
true ->
@ -44,7 +44,7 @@ defmodule PlausibleWeb.AuthorizeSiteAccess do
end
end
defp admin_emails() do
Application.get_env(:plausible, :admin_emails)
defp admin_user_ids() do
Application.get_env(:plausible, :admin_user_ids)
end
end

@ -14,7 +14,7 @@ defmodule PlausibleWeb.CRMAuthPlug do
id ->
user = Repo.get_by(Plausible.Auth.User, id: id)
if user && user.email in admin_emails() do
if user && user.id in admin_user_ids() do
assign(conn, :current_user, user)
else
conn |> send_resp(403, "Not allowed") |> halt
@ -22,5 +22,5 @@ defmodule PlausibleWeb.CRMAuthPlug do
end
end
defp admin_emails(), do: Application.get_env(:plausible, :admin_emails)
defp admin_user_ids(), do: Application.get_env(:plausible, :admin_user_ids)
end

Loading…
Cancel
Save