lukasandClaude Opus 5.5
addb2232a1
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>
91 lines
3.3 KiB
Python
91 lines
3.3 KiB
Python
"""WebSocket hub (SPEC §9.2).
|
|
|
|
Auth via session cookie. Relays every §8.3 event belonging to the user as
|
|
``{event, payload}`` frames; the client refetches via TanStack Query invalidation.
|
|
Client -> server: ``{"type":"ping"}`` only.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import asyncio
|
|
import json
|
|
import logging
|
|
|
|
from fastapi import APIRouter, WebSocket, WebSocketDisconnect
|
|
|
|
from app.config import get_settings
|
|
from app.events import get_event_bus
|
|
from app.identity.cookies import SESSION_COOKIE_INSECURE, SESSION_COOKIE_SECURE
|
|
from app.identity.sessions import resolve_session
|
|
from app.redis_client import get_redis
|
|
from app.security.cross_site import is_cross_site
|
|
from app.sync import leases
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
router = APIRouter()
|
|
|
|
|
|
@router.websocket("/ws")
|
|
async def ws_endpoint(websocket: WebSocket) -> None:
|
|
# Only our own pages may listen in: a socket another site opens is refused
|
|
# even if the browser sent the session cookie with it (cross-site WebSocket
|
|
# hijacking; SameSite=Lax already stops current browsers from sending it).
|
|
if is_cross_site(websocket.headers):
|
|
await websocket.close(code=1008)
|
|
return
|
|
token = websocket.cookies.get(SESSION_COOKIE_SECURE) or websocket.cookies.get(
|
|
SESSION_COOKIE_INSECURE, ""
|
|
)
|
|
session = await resolve_session(token)
|
|
if session is None:
|
|
await websocket.close(code=1008) # policy violation
|
|
return
|
|
|
|
await websocket.accept()
|
|
user_id = str(session.user_id)
|
|
grace_s = get_settings().tier_session_grace_min * 60
|
|
# Sync v2 §3/§5: an open WS means the user is active -> session heat + promote.
|
|
await leases.mark_user_active(get_redis(), user_id, grace_s)
|
|
await get_event_bus().publish("user.active", {"user_id": user_id})
|
|
pubsub = get_redis().pubsub()
|
|
await pubsub.psubscribe("evt:*")
|
|
|
|
async def forward() -> None:
|
|
async for message in pubsub.listen():
|
|
if message.get("type") != "pmessage":
|
|
continue
|
|
try:
|
|
data = json.loads(message["data"])
|
|
except (ValueError, TypeError):
|
|
continue
|
|
payload = data.get("payload", {})
|
|
if str(payload.get("user_id")) == user_id:
|
|
await websocket.send_json(data)
|
|
if data.get("event") == "user.signed_out":
|
|
# The session this socket was opened with no longer exists.
|
|
await websocket.close(code=1008)
|
|
return
|
|
|
|
async def receive() -> None:
|
|
while True:
|
|
raw = await websocket.receive_text()
|
|
try:
|
|
if json.loads(raw).get("type") == "ping":
|
|
# A ping keeps the user's session heat alive (§5).
|
|
await leases.mark_user_active(get_redis(), user_id, grace_s)
|
|
await websocket.send_json({"type": "pong"})
|
|
except (ValueError, TypeError):
|
|
continue
|
|
|
|
forward_task = asyncio.create_task(forward())
|
|
receive_task = asyncio.create_task(receive())
|
|
try:
|
|
await asyncio.wait({forward_task, receive_task}, return_when=asyncio.FIRST_COMPLETED)
|
|
except WebSocketDisconnect:
|
|
pass
|
|
finally:
|
|
for task in (forward_task, receive_task):
|
|
task.cancel()
|
|
await pubsub.aclose() # type: ignore[no-untyped-call]
|