mirror of
https://github.com/TheRealOwenRees/chess-endgame-trainer.git
synced 2026-11-18 03:32:06 +00:00
* 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.
116 lines
2.8 KiB
Bash
Executable File
116 lines
2.8 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
#
|
|
# Refresh Caddy's Cloudflare origin allowlist from Cloudflare's published
|
|
# ranges. Called by chesstrainer-cloudflare-ranges.timer.
|
|
#
|
|
# The generated file is imported by /etc/caddy/Caddyfile:
|
|
#
|
|
# @cloudflare {
|
|
# import cloudflare-ranges.caddy
|
|
# }
|
|
#
|
|
# The script validates the candidate Caddyfile before reloading Caddy. If the
|
|
# download or validation fails, the previous ranges stay in place.
|
|
|
|
set -euo pipefail
|
|
|
|
CADDYFILE="${CADDYFILE:-/etc/caddy/Caddyfile}"
|
|
RANGES_FILE="${RANGES_FILE:-/etc/caddy/cloudflare-ranges.caddy}"
|
|
CADDY_BIN="${CADDY_BIN:-caddy}"
|
|
RELOAD_CMD="${RELOAD_CMD:-systemctl reload caddy}"
|
|
LOCK_FILE="${LOCK_FILE:-/run/lock/chesstrainer-cloudflare-ranges.lock}"
|
|
|
|
tmpdir="$(mktemp -d)"
|
|
trap 'rm -rf "$tmpdir"' EXIT
|
|
|
|
exec 9>"$LOCK_FILE"
|
|
if ! flock -n 9; then
|
|
echo "another Cloudflare range update is already running" >&2
|
|
exit 0
|
|
fi
|
|
|
|
fetch() {
|
|
local url="$1"
|
|
local output="$2"
|
|
|
|
curl --fail --silent --show-error --location \
|
|
--proto '=https' \
|
|
--retry 3 --retry-delay 2 --connect-timeout 10 \
|
|
"$url" --output "$output"
|
|
}
|
|
|
|
validate_download() {
|
|
local file="$1"
|
|
|
|
[[ -s "$file" ]] || return 1
|
|
|
|
# One CIDR per line. Caddy performs the real validation; this prevents
|
|
# obviously malformed or injected content from being written.
|
|
if grep -Evq '^[0-9A-Fa-f:.]+/[0-9]{1,3}$' "$file"; then
|
|
return 1
|
|
fi
|
|
}
|
|
|
|
fetch "https://www.cloudflare.com/ips-v4" "$tmpdir/ips-v4"
|
|
fetch "https://www.cloudflare.com/ips-v6" "$tmpdir/ips-v6"
|
|
|
|
validate_download "$tmpdir/ips-v4"
|
|
validate_download "$tmpdir/ips-v6"
|
|
|
|
ranges="$(awk 'NF { printf "%s ", $0 }' "$tmpdir/ips-v4" "$tmpdir/ips-v6" | sed -e 's/[[:space:]]*$//')"
|
|
|
|
if [[ -z "$ranges" ]]; then
|
|
echo "Cloudflare returned an empty CIDR list" >&2
|
|
exit 1
|
|
fi
|
|
|
|
candidate="$tmpdir/cloudflare-ranges.caddy"
|
|
|
|
{
|
|
echo "# Generated by deploy/update-cloudflare-ranges.sh."
|
|
echo "# Source: https://www.cloudflare.com/ips-v4 and /ips-v6"
|
|
echo "remote_ip $ranges"
|
|
} >"$candidate"
|
|
|
|
if cmp -s "$candidate" "$RANGES_FILE"; then
|
|
echo "Cloudflare ranges are unchanged"
|
|
exit 0
|
|
fi
|
|
|
|
install -d -m 0755 "$(dirname "$RANGES_FILE")"
|
|
|
|
backup="$tmpdir/previous-ranges.caddy"
|
|
if [[ -e "$RANGES_FILE" ]]; then
|
|
cp -a "$RANGES_FILE" "$backup"
|
|
fi
|
|
|
|
install -m 0644 "$candidate" "$RANGES_FILE"
|
|
|
|
if ! "$CADDY_BIN" validate --config "$CADDYFILE" --adapter caddyfile; then
|
|
echo "Caddy rejected the new Cloudflare ranges; restoring the previous file" >&2
|
|
|
|
if [[ -e "$backup" ]]; then
|
|
install -m 0644 "$backup" "$RANGES_FILE"
|
|
else
|
|
rm -f "$RANGES_FILE"
|
|
fi
|
|
|
|
exit 1
|
|
fi
|
|
|
|
read -r -a reload_command <<<"$RELOAD_CMD"
|
|
|
|
if ! "${reload_command[@]}"; then
|
|
echo "Caddy reload failed; restoring the previous ranges" >&2
|
|
|
|
if [[ -e "$backup" ]]; then
|
|
install -m 0644 "$backup" "$RANGES_FILE"
|
|
else
|
|
rm -f "$RANGES_FILE"
|
|
fi
|
|
|
|
exit 1
|
|
fi
|
|
|
|
echo "Cloudflare ranges updated and Caddy reloaded"
|