lukasandClaude Opus 5
8fce86559e
Three strands that only make sense together, so they land together. Registration gate (migration 0016). POST /auth/register was open to anyone who could reach the port. Now the first account on an empty instance is always allowed, becomes the administrator, and closes registration behind itself; after that it takes an admin reopening it. The decision is made under a row lock on app_settings so two simultaneous first signups cannot both see an empty table and both claim administrator. Existing installs keep their oldest account as admin and start closed. Instance default quota (migration 0017). users.quota_bytes is snapshotted at creation from app_settings.default_quota_bytes, so changing the default affects later accounts only and never resizes a mailbox that exists. The panel is a separate app, not a page in the mail client. admin.html is its own Vite entry (5.8 KB next to the client's 1.7 MB; they share only the vendor chunk), with its own administrator sign-in. One nginx now serves two listeners: :80 is the mail client and 404s both /admin.html and /api/admin/*, :81 is the panel. docker-compose publishes them as WEB_PORT and ADMIN_PORT. The boundary is nginx refusing paths on one listener, not process isolation — CurrentAdmin still guards every admin route — so ADMIN_PORT must be restricted to the LAN, which the runbook now covers for both DSM and QNAP. Also QNAP: deploy/webmail.sh finds Container Station's docker under /share/*/.qpkg/container-station/bin, which is off an SSH session's PATH, before anything shells out to it. docs/nas-install.md gains a QuTS hero runbook (§2.6), splits the DSM firewall section into container-to-container (§8.1) and the egress case that makes account-add time out while autodiscovery appears to work (§8.2), and scopes both to Synology. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_018SqJYt7jD7oUEkoY68sBZo
87 lines
2.8 KiB
Nginx Configuration File
87 lines
2.8 KiB
Nginx Configuration File
# Webmail front door: static SPA + reverse proxy to the API container.
|
|
#
|
|
# This file is dropped into /etc/nginx/conf.d/, i.e. it is already inside the
|
|
# `http` block — hence the bare `map` below.
|
|
#
|
|
# TWO LISTENERS, one app:
|
|
#
|
|
# :80 public — the mail client. Neither the admin bundle nor /api/admin/*
|
|
# is served here; both 404.
|
|
# :81 admin — the admin panel (its own bundle, its own sign-in), and the
|
|
# /api/admin/* endpoints it needs.
|
|
#
|
|
# The compose file publishes :80 as WEB_PORT and :81 as ADMIN_PORT, and the
|
|
# firewall is what makes the split mean anything: allow ADMIN_PORT from the LAN
|
|
# only, leave WEB_PORT as exposed as you like (docs/nas-install.md §5.1).
|
|
#
|
|
# Note what this boundary is and is not. It is nginx refusing paths on one
|
|
# listener — good enough to keep the admin panel and its API off an
|
|
# internet-facing port, and it fails closed if the app forgets a permission
|
|
# check. It is NOT process isolation: both listeners proxy to the same API
|
|
# container, so anything that can reach :81 can reach every admin route. The
|
|
# panel still demands an administrator sign-in, and the API's own `CurrentAdmin`
|
|
# dependency still guards each route; this is the outer layer, not the only one.
|
|
|
|
map $http_x_forwarded_proto $fwd_proto {
|
|
default $scheme;
|
|
https https;
|
|
http http;
|
|
}
|
|
|
|
# Connection header for the WebSocket upgrade dance on /api/ws.
|
|
map $http_upgrade $connection_upgrade {
|
|
default upgrade;
|
|
'' close;
|
|
}
|
|
|
|
upstream webmail_api {
|
|
server api:8000;
|
|
keepalive 16;
|
|
}
|
|
|
|
# ---- :80 — public -----------------------------------------------------------
|
|
server {
|
|
listen 80;
|
|
server_name _;
|
|
|
|
# Regex locations beat prefix ones, so this wins over `location /api/`
|
|
# regardless of order. `(/|$)` keeps it to /api/admin and /api/admin/...,
|
|
# never a future /api/administrators. 404 rather than 403: a port open to
|
|
# the internet shouldn't confirm which endpoints exist.
|
|
location ~ ^/api/admin(/|$) {
|
|
access_log off;
|
|
return 404;
|
|
}
|
|
|
|
# The admin bundle ships in the same dist; don't hand it out here.
|
|
location = /admin.html {
|
|
access_log off;
|
|
return 404;
|
|
}
|
|
|
|
include /etc/nginx/webmail-app.conf;
|
|
|
|
# SPA fallback -> the mail client.
|
|
location / {
|
|
try_files $uri $uri/ /index.html;
|
|
}
|
|
}
|
|
|
|
# ---- :81 — admin ------------------------------------------------------------
|
|
server {
|
|
listen 81;
|
|
server_name _;
|
|
|
|
include /etc/nginx/webmail-app.conf;
|
|
|
|
location = /admin.html {
|
|
add_header Cache-Control "no-store, must-revalidate";
|
|
}
|
|
|
|
# SPA fallback -> the admin panel. `/` on this port IS the panel; the mail
|
|
# client is not reachable here at all.
|
|
location / {
|
|
try_files $uri /admin.html;
|
|
}
|
|
}
|