Security hardening from the assessment; testing fixes
Security (ultimo-security-report.md):
- Security headers on every response, the app shell included: they lived at
server level and nginx dropped them in any location with its own header.
CSP, framing, nosniff, referrer, permissions (docker/nginx-security.conf).
- Plain HTTP forwarded by the reverse proxy is redirected to HTTPS; HSTS on
HTTPS responses. server_tokens off.
- Cross-site state-changing /api requests refused (login CSRF), WebSocket too.
- Validation errors in the usual error shape, without the request model.
- New-password policy: max 128, common/own-address/repeated refused,
breached-password check (HIBP k-anonymity, fails open).
- Message HTML: links keep only http(s)/mailto (sanitizer v6); the HTML
endpoint carries its own no-script CSP.
- Outbound fetches pinned to the checked IP (DNS rebinding); external
IMAP/SMTP servers re-checked before each connection; CGNAT and mapped
addresses counted as non-public.
Fixes from testing:
- IDLE loop catches up before idling: mail that came while the worker was
away no longer waits up to 10 minutes.
- Restore from Spam/Trash/Archive moves only the removed messages, not your
reply in Sent.
- Narrow desktop list stacks sender/subject/snippet (subject was squeezed
to nothing at the default width), with hover actions.
- Phone: wide emails scale to fit the screen.
- Singular forms ("1 message"); no zip button for a single attachment;
app passwords no longer claim "never used" for mail apps.
- ruff format across the backend.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -122,6 +122,16 @@ def _date_criteria(since: date | None, before: date | None) -> str:
|
||||
return " ".join(parts) if parts else "ALL"
|
||||
|
||||
|
||||
async def _require_public(host: str) -> None:
|
||||
"""Refuse a user-named server that now resolves to a non-public address."""
|
||||
from app.accounts.ssrf import SsrfError, assert_host_is_public
|
||||
|
||||
try:
|
||||
await assert_host_is_public(host)
|
||||
except SsrfError as exc:
|
||||
raise ProviderConnectError(f"refusing to connect to {host}: {exc}") from exc
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ProviderConfig:
|
||||
imap_host: str
|
||||
@@ -138,6 +148,10 @@ class ProviderConfig:
|
||||
# The hosted mail server: every user's mailbox is on that one host, so the
|
||||
# per-host connection cap (which spares outside providers) does not apply.
|
||||
internal: bool = False
|
||||
# A server the user named (every external account): its name is checked
|
||||
# again before each connection, so DNS changed after the account was added
|
||||
# cannot turn the worker on the internal network (DNS rebinding).
|
||||
public_only: bool = False
|
||||
|
||||
|
||||
class ImapSmtpProvider(MailProvider):
|
||||
@@ -196,6 +210,8 @@ class ImapSmtpProvider(MailProvider):
|
||||
if self._imap is not None:
|
||||
return self._imap
|
||||
cfg = self._cfg
|
||||
if cfg.public_only:
|
||||
await _require_public(cfg.imap_host)
|
||||
await self._acquire_conn_slots()
|
||||
try:
|
||||
try:
|
||||
@@ -540,6 +556,8 @@ class ImapSmtpProvider(MailProvider):
|
||||
|
||||
async def send(self, raw: bytes, envelope_from: str, envelope_to: list[str]) -> None:
|
||||
cfg = self._cfg
|
||||
if cfg.public_only:
|
||||
await _require_public(cfg.smtp_host)
|
||||
use_tls = cfg.smtp_tls == "ssl"
|
||||
start_tls = cfg.smtp_tls == "starttls"
|
||||
host_slot = (
|
||||
|
||||
Reference in New Issue
Block a user