Admin panel, login throttling, and Cloudflare edge hardening (#150)

* Document the remote shell for production user management

* add sitemap to footer links

* remove border under theme selection

* Add admin theme and user management (#144)

Add /admin/themes CRUD and /admin/users list/detail with role and plan editing, guarded by a shared Policy module. Include last-super-admin and self-role protections plus structured id-only admin logs.

Also add admin invitations, confirmation resends and password-reset emails, which work in development through the Swoosh mailbox before SES is configured.

* Rate-limit password logins and emit auth events (#142)

Add a two-bucket login throttle (5 failures per login, 10 per IP in a 15-minute window) and a shared client-address helper for controllers and LiveViews. Blocked attempts skip the database and bcrypt.

Log auth.login.failed and auth.login.throttled warnings with boot-scoped HMAC addresses only, and stop repeated confirmation emails on unconfirmed login attempts.

* Harden the production login edge for Cloudflare

Document the layered login defence: the app throttle is primary, Caddy must pass Cloudflare's CF-Connecting-IP to the app, and Cloudflare edge rate limiting covers request floods.

Update the reference Caddyfile to accept only Cloudflare ranges and reject direct-to-origin traffic, and document the exact Cloudflare dashboard rules.

* Document 10-second Cloudflare rate-limit window

Cloudflare may only offer a 10-second period. Keep the edge rule at 10 login POSTs per 10 seconds per IP and rely on the app's 15-minute login/address throttle for credential guessing.

* Document Cloudflare limits for LiveView registration

Registration submits over the shared LiveView socket, so a Cloudflare rule on POST /users/register will not count account creations. Note the app-level throttle/Turnstile options instead.

* Document current Cloudflare free-plan edge controls

Record the production setup: Cloudflare-only Caddy origins, Bot Fight Mode, and the 10-second login flood rule (10 POSTs per 10 seconds, 10-second block). Clarify that the application's 15-minute throttle remains the real credential lockout.

* Auto-refresh Cloudflare CIDRs for Caddy

Move the origin allowlist into a generated cloudflare-ranges.caddy imported by Caddy. Add an hourly systemd timer and script that fetch Cloudflare's v4/v6 lists, reject malformed responses, validate the candidate Caddyfile, and reload Caddy only when the ranges change. Restore the previous file on validation or reload failure.

* Document Cloudflare CIDR refresher setup and operations

Record the installed paths, permissions, timer checks, manual run, update procedure, and the direct-on-VPS setup fallback when the deploy directory is absent.
This commit is contained in:
2026-11-11 21:27:59 +01:00
committed by GitHub
parent 202b9b1f6a
commit 624ddab644
45 changed files with 3602 additions and 70 deletions
+306 -1
View File
@@ -4,11 +4,14 @@ defmodule Chesstrainer.Accounts do
"""
import Ecto.Query, warn: false
require Logger
alias Chesstrainer.Repo
alias Chesstrainer.Accounts.{User, UserToken, UserNotifier}
alias Chesstrainer.Accounts.{Policy, Role, Scope, User, UserToken, UserNotifier}
alias Chesstrainer.MailingList
@admin_users_per_page 25
## Database getters
@doc """
@@ -165,6 +168,308 @@ defmodule Chesstrainer.Accounts do
|> Repo.update()
end
## Admin user management
@doc """
Returns a page of users the scope may administer, newest first.
Options:
* `:search` - case-insensitive match on email or username
* `:page` - 1-based page number (defaults to 1)
* `:per_page` - page size (defaults to 25, capped at 100)
Admins only see members and moderators; super admins see every role.
Returns `{:error, :unauthorized}` when the scope lacks user management.
"""
def list_users_for_admin(scope, opts \\ []) do
with :ok <- ensure_manage_users(scope) do
page = normalize_page(Keyword.get(opts, :page, 1))
per_page = normalize_per_page(Keyword.get(opts, :per_page, @admin_users_per_page))
offset = (page - 1) * per_page
users =
scope
|> admin_users_query(opts)
|> order_by([u], desc: u.inserted_at, desc: u.id)
|> limit(^per_page)
|> offset(^offset)
|> Repo.all()
{:ok, users}
end
end
@doc """
Counts the users visible to the scope, using the same filters as
`list_users_for_admin/2`.
"""
def count_users_for_admin(scope, opts \\ []) do
with :ok <- ensure_manage_users(scope) do
count =
scope
|> admin_users_query(opts)
|> select([u], count(u.id))
|> Repo.one()
{:ok, count}
end
end
@doc """
Fetches a user for the admin detail page.
Returns `{:error, :unauthorized}` when the scope may not view the target and
`{:error, :not_found}` for an unknown id.
"""
def get_user_for_admin(scope, id) do
with :ok <- ensure_manage_users(scope) do
case fetch_user(id) do
nil ->
{:error, :not_found}
%User{} = user ->
if Policy.can_view_user?(scope, user) do
{:ok, user}
else
{:error, :unauthorized}
end
end
end
end
@doc """
Returns an `%Ecto.Changeset{}` for the admin-editable fields (role and plan).
"""
def change_user_as_admin(%User{} = user, attrs \\ %{}) do
User.admin_changeset(user, attrs)
end
@doc """
Updates a user's role and plan after enforcing the admin capability matrix.
The last-super-admin check runs inside the update transaction with a row lock,
so concurrent demotions cannot remove the final super admin.
Returns `{:error, :unauthorized}`, `{:error, :own_role}`,
`{:error, :last_super_admin}` or `{:error, %Ecto.Changeset{}}` instead of
raising.
"""
def update_user_as_admin(scope, %User{} = user, attrs) do
changeset = User.admin_changeset(user, attrs)
role_change = Ecto.Changeset.get_change(changeset, :role)
with :ok <- ensure_manage_users(scope),
:ok <- ensure_not_own_role_change(scope, user, role_change),
:ok <- ensure_can_manage_user(scope, user),
:ok <- ensure_can_assign_role(scope, role_change),
{:ok, updated} <- persist_user_changes(user, changeset) do
log_user_update(scope, user, changeset)
{:ok, updated}
end
end
@doc """
Creates an invitation and emails the recipient a link to choose a password.
The account is confirmed but has no password until the invitee follows the
link. `invite_url_fun` receives the encoded token and must return a URL.
"""
def invite_user_as_admin(scope, attrs, invite_url_fun)
when is_function(invite_url_fun, 1) do
role = normalize_role(role_param(attrs) || :member)
with :ok <- ensure_manage_users(scope),
:ok <- ensure_can_assign_role(scope, role) do
changeset =
%User{}
|> User.invite_changeset(attrs)
|> User.admin_changeset(attrs)
case Repo.insert(changeset) do
{:ok, user} ->
Logger.info("admin.user.invited",
actor_id: scope.user.id,
target_id: user.id,
fields: [:invite]
)
case deliver_invite_instructions(user, invite_url_fun) do
{:ok, _email} -> {:ok, user}
{:error, reason} -> {:error, reason}
end
{:error, changeset} ->
{:error, changeset}
end
end
end
@doc """
Sends a password-reset email on behalf of an administrator.
Uses the same policy as the editable user screen: an admin cannot trigger a
reset for another admin or a super admin.
"""
def send_user_reset_password_instructions_as_admin(scope, %User{} = user, reset_url_fun)
when is_function(reset_url_fun, 1) do
with :ok <- ensure_manage_users(scope),
:ok <- ensure_can_manage_user(scope, user) do
case deliver_user_reset_password_instructions(user, reset_url_fun) do
{:ok, email} ->
Logger.info("admin.user.password_reset_sent",
actor_id: scope.user.id,
target_id: user.id
)
{:ok, email}
error ->
error
end
end
end
@doc """
Resends the account-confirmation email on behalf of an administrator.
"""
def resend_user_confirmation_instructions_as_admin(scope, %User{} = user, confirmation_url_fun)
when is_function(confirmation_url_fun, 1) do
with :ok <- ensure_manage_users(scope),
:ok <- ensure_can_manage_user(scope, user) do
case deliver_user_confirmation_instructions(user, confirmation_url_fun) do
{:ok, email} ->
Logger.info("admin.user.confirmation_resent",
actor_id: scope.user.id,
target_id: user.id
)
{:ok, email}
error ->
error
end
end
end
defp admin_users_query(scope, opts) do
roles = Policy.visible_roles(scope)
search = opts |> Keyword.get(:search, "") |> to_string() |> String.trim()
query = from(u in User, where: u.role in ^roles)
if search == "" do
query
else
pattern = "%#{search}%"
where(
query,
[u],
ilike(u.email, ^pattern) or ilike(u.username, ^pattern)
)
end
end
defp persist_user_changes(user, changeset) do
Repo.transact(fn ->
with :ok <- ensure_not_last_super_admin(user, changeset),
{:ok, updated} <- Repo.update(changeset) do
{:ok, updated}
end
end)
end
defp ensure_not_last_super_admin(%User{role: :super_admin}, changeset) do
case Ecto.Changeset.get_change(changeset, :role) do
role when role in [nil, :super_admin] ->
:ok
_role ->
super_admins =
Repo.all(from(u in User, where: u.role == :super_admin, lock: "FOR UPDATE"))
if length(super_admins) <= 1 do
{:error, :last_super_admin}
else
:ok
end
end
end
defp ensure_not_last_super_admin(_user, _changeset), do: :ok
defp log_user_update(scope, user, changeset) do
fields = changeset.changes |> Map.keys() |> Enum.sort()
if fields != [] do
Logger.info("admin.user.updated",
actor_id: scope.user.id,
target_id: user.id,
fields: fields
)
end
end
defp deliver_invite_instructions(user, invite_url_fun) do
{encoded_token, user_token} = UserToken.build_email_token(user, "reset_password")
Repo.insert!(user_token)
UserNotifier.deliver_invite_instructions(user, invite_url_fun.(encoded_token))
end
defp ensure_manage_users(scope) do
if Policy.can?(scope, :manage_users), do: :ok, else: {:error, :unauthorized}
end
defp ensure_can_manage_user(scope, user) do
if Policy.can_manage_user?(scope, user), do: :ok, else: {:error, :unauthorized}
end
defp ensure_can_assign_role(_scope, nil), do: :ok
defp ensure_can_assign_role(scope, role) do
if Policy.can_assign_role?(scope, role), do: :ok, else: {:error, :unauthorized}
end
defp ensure_not_own_role_change(%Scope{user: %User{id: id}}, %User{id: id}, role)
when not is_nil(role),
do: {:error, :own_role}
defp ensure_not_own_role_change(_scope, _user, _role), do: :ok
defp fetch_user(id) do
Repo.get(User, id)
rescue
Ecto.Query.CastError -> nil
end
defp role_param(attrs), do: Map.get(attrs, "role") || Map.get(attrs, :role)
defp normalize_role(role) do
cond do
role in Role.values() -> role
is_binary(role) -> Enum.find(Role.values(), &(Atom.to_string(&1) == role))
true -> nil
end
end
defp normalize_page(page) when is_integer(page) and page > 0, do: page
defp normalize_page(page) when is_binary(page) do
case Integer.parse(page) do
{number, ""} when number > 0 -> number
_ -> 1
end
end
defp normalize_page(_page), do: 1
defp normalize_per_page(per_page) when is_integer(per_page) and per_page > 0 do
min(per_page, 100)
end
defp normalize_per_page(_per_page), do: @admin_users_per_page
## Settings
@doc """
+100
View File
@@ -0,0 +1,100 @@
defmodule Chesstrainer.Accounts.Policy do
@moduledoc """
The single source of truth for administrator capabilities.
Roles are ordered by `Chesstrainer.Accounts.Role`. An administrator may only
manage users below their own rank; a `super_admin` may also manage admins and
other super admins, but never changes their own role.
The router uses `can?/2` to gate the admin area, and every mutating admin
LiveView calls back into this module or into the scoped `Accounts` functions
so hidden buttons are never the only protection.
"""
alias Chesstrainer.Accounts.{Role, Scope, User}
@capabilities %{
manage_endgames: [:admin, :super_admin],
manage_themes: [:admin, :super_admin],
manage_users: [:admin, :super_admin]
}
@doc "All admin capabilities."
@spec capabilities() :: [atom()]
def capabilities, do: Map.keys(@capabilities)
@doc """
Returns true when the scope may perform the given admin capability.
A nil scope or a member/moderator never satisfies an admin capability.
"""
@spec can?(Scope.t() | nil, atom()) :: boolean()
def can?(%Scope{user: %User{role: role}}, capability) when is_atom(capability) do
role in Map.get(@capabilities, capability, [])
end
def can?(_scope, _capability), do: false
@doc """
Returns true when the scope may edit the target user's role and plan.
An actor may only modify a user whose role rank is strictly lower, except a
`super_admin`, who may also modify admins and other super admins. Nobody may
modify themselves through the admin area.
"""
@spec can_manage_user?(Scope.t() | nil, User.t()) :: boolean()
def can_manage_user?(%Scope{user: %User{} = actor} = scope, %User{} = target) do
cond do
not can?(scope, :manage_users) -> false
actor.id == target.id -> false
actor.role == :super_admin -> true
Role.rank(actor.role) > Role.rank(target.role) -> true
true -> false
end
end
def can_manage_user?(_scope, _target), do: false
@doc """
Returns true when the scope may view the target user in the admin area.
Admins can see themselves and lower-ranked users read-only; super admins can
see everyone. This is deliberately wider than `can_manage_user?/2`, which
controls the editable form.
"""
@spec can_view_user?(Scope.t() | nil, User.t()) :: boolean()
def can_view_user?(%Scope{user: %User{} = actor} = scope, %User{} = target) do
can?(scope, :manage_users) and
(actor.id == target.id or actor.role == :super_admin or
Role.rank(actor.role) > Role.rank(target.role))
end
def can_view_user?(_scope, _target), do: false
@doc """
Returns true when the scope may assign the given role.
Admins can only assign member or moderator. Super admins can assign any role.
"""
@spec can_assign_role?(Scope.t() | nil, Role.value()) :: boolean()
def can_assign_role?(%Scope{user: %User{role: :super_admin}}, role) do
role in Role.values()
end
def can_assign_role?(%Scope{user: %User{role: actor_role}}, role) do
role in Role.values() and Role.rank(actor_role) > Role.rank(role)
end
def can_assign_role?(_scope, _role), do: false
@doc """
Returns the roles whose users the scope may see in the admin user list.
Admins only see members and moderators; super admins see every role.
"""
@spec visible_roles(Scope.t() | nil) :: [Role.value()]
def visible_roles(%Scope{user: %User{role: :super_admin}}), do: Role.values()
def visible_roles(%Scope{user: %User{role: :admin}}), do: [:member, :moderator]
def visible_roles(_scope), do: []
end
+2
View File
@@ -6,6 +6,8 @@ defmodule Chesstrainer.Accounts.Role do
should ask for the minimum tier they need via `at_least?/2`.
"""
@type value :: :member | :moderator | :admin | :super_admin
@values [:member, :moderator, :admin, :super_admin]
@ranks %{
+2
View File
@@ -20,6 +20,8 @@ defmodule Chesstrainer.Accounts.Scope do
defstruct user: nil
@type t :: %__MODULE__{user: User.t() | nil}
@doc """
Creates a scope for the given user.
+28
View File
@@ -20,6 +20,8 @@ defmodule Chesstrainer.Accounts.User do
timestamps(type: :utc_datetime)
end
@type t :: %__MODULE__{}
@doc """
A user changeset for registration.
@@ -53,6 +55,32 @@ defmodule Chesstrainer.Accounts.User do
|> validate_required([:role])
end
@doc """
A user changeset for an admin-created invitation.
The account is created without a password and marked confirmed, so the
recipient can choose a password from the emailed invitation link and log in
immediately afterwards. Role and plan are applied separately by
`admin_changeset/2` after the caller has checked the policy.
"""
def invite_changeset(user, attrs) do
user
|> cast(attrs, [:email, :username])
|> validate_email([])
|> validate_username([])
|> put_change(:confirmed_at, DateTime.utc_now(:second))
end
@doc """
A user changeset for the fields an administrator may edit.
These values are programmatic, so this changeset is only used by the scoped
admin functions in `Chesstrainer.Accounts`.
"""
def admin_changeset(user, attrs) do
cast(user, attrs, [:role, :plan])
end
@doc """
A user changeset for registering or changing the email.
@@ -38,6 +38,31 @@ defmodule Chesstrainer.Accounts.UserNotifier do
""")
end
@doc """
Deliver an invitation to choose a password.
Admins create the account without a password; the invitation link uses the
same reset-password token flow so the recipient can set one.
"""
def deliver_invite_instructions(user, url) do
deliver(user.email, "You're invited to #{Branding.name()}", """
==============================
Hi #{user.username},
An administrator has created an account for you on #{Branding.name()}.
Choose your password by visiting the URL below:
#{url}
If you weren't expecting this invitation, please ignore this email.
==============================
""")
end
@doc """
Deliver instructions to reset a user password.
"""
+1
View File
@@ -17,6 +17,7 @@ defmodule Chesstrainer.Application do
# Start a worker by calling: Chesstrainer.Worker.start_link(arg)
# {Chesstrainer.Worker, arg},
Chesstrainer.GuestLimits,
ChesstrainerWeb.LoginThrottle,
# Start to serve requests, typically the last entry
ChesstrainerWeb.Endpoint,
{Registry, keys: :unique, name: Chesstrainer.CacheRegistry},
+46
View File
@@ -21,6 +21,43 @@ defmodule Chesstrainer.Themes do
Repo.all(Theme)
end
@doc """
Lists themes for the admin index with their endgame usage count.
Options:
* `:search` - case-insensitive match on the theme name
* `:category` - one of `:endgame`, `:opening`, `:tactic`, or blank for all
Returns `{theme, usage_count}` tuples sorted by name.
"""
def list_themes_for_admin(opts \\ []) do
search = opts |> Keyword.get(:search, "") |> to_string() |> String.trim()
category = normalize_category(Keyword.get(opts, :category, ""))
query = from(t in Theme, order_by: [asc: t.name])
query =
if search == "" do
query
else
where(query, [t], ilike(t.name, ^"%#{search}%"))
end
query =
if category do
where(query, [t], t.category == ^category)
else
query
end
query
|> join(:left, [t], j in "endgames_themes", on: j.theme_id == t.id)
|> group_by([t], t.id)
|> select([t, j], {t, count(j.endgame_id)})
|> Repo.all()
end
@doc """
Gets a single theme.
@@ -153,4 +190,13 @@ defmodule Chesstrainer.Themes do
def names(themes) when is_list(themes) do
themes |> Enum.map(& &1.name) |> Enum.sort()
end
defp normalize_category(category) when category in [:endgame, :opening, :tactic],
do: category
defp normalize_category(category) when is_binary(category) do
Enum.find([:endgame, :opening, :tactic], &(Atom.to_string(&1) == category))
end
defp normalize_category(_category), do: nil
end