d131ba461c
Lint & Test / test (push) Successful in 20s
Security - Default scripts_management, callbacks_management, links_management, and media_folders_management to False so a leaked token cannot escalate to RCE through admin CRUD endpoints. - TokenSpec + scope hierarchy (read | control | admin); legacy bare-string api_tokens entries promote to admin for back-compat. Management endpoints now require admin scope. - WebSocket subprotocol auth (Sec-WebSocket-Protocol: media-server.token.<T>) preferred over ?token= query so the token no longer lands in URL/history/ Referer; query fallback retained for HA integration back-compat. - Origin allow-list check on the WS endpoint (CSWSH defence). - In-process token-bucket rate limiter: 5/min for failed auths, 10/min for /api/scripts/execute and /api/callbacks/execute. - shell=False subprocess path (shlex.split) + per-parameter regex `pattern` in ScriptParameterConfig to harden shell=true scripts against parameter injection (Windows cmd.exe env-var expansion). - CSP gains form-action, worker-src, manifest-src directives. - Refuse cors_origins=["*"] at startup; strip token=... from uvicorn access logs; validate Gitea release tag against strict SemVer regex. - noopener noreferrer + no-referrer referrerpolicy on every outbound link. - icacls hardening of config.yaml on Windows (current user + SYSTEM + Administrators only); 0600 still enforced on POSIX. - WS volume handler clamps input and never drops the socket on bad messages. Performance - Album-art read in windows_media gated by track key — was decoding the WinRT thumbnail twice per second regardless of track changes. - /api/media/artwork returns content-derived ETag + Cache-Control so the browser sends If-None-Match and gets 304s on track repeats. - Foreground-service ctypes argtypes hoisted to one-time module init (was re-declaring ~14 prototypes per probe). - display_service _static_cache keyed by (edid_hash, ...) tuple with eviction of disappeared monitors — fixes stale capabilities on hot-plug swaps where the new topology has the same monitor count. - Visualizer rAF loop paused on document.hidden, resumed on visible. Reliability / bug fixes - Lifespan rewritten as try/yield/finally so a partial-startup failure cannot orphan background tasks or executors. - _run_callback in routes/media.py keeps a strong task ref (GC-safe) and uses the dedicated callback executor instead of the default pool. - macos_media.set_volume() no longer always returns True. - TrayManager._restart_requested initialised in __init__; set before signalling exit so the main thread observes it correctly. - Missing static_dir now logs a WARNING instead of silent UI disable. UX / accessibility / PWA - manifest.json theme_color and background_color match the Studio Reference base (#0E0D0B); added id and scope for PWA installability. - ARIA on mini-player icon buttons; inner SVGs marked aria-hidden. - OS mediaSession API wired so headset / lockscreen / Bluetooth buttons drive play/pause/next/prev/seek and show track metadata + artwork. Observability - X-Request-ID middleware (accept upstream id if it matches a safe regex, otherwise UUID4); request_id_var added to ContextVars and included in every log line alongside the token label. - Audit log (append-only JSONL) for every script + callback execution, including the on_play/on_pause/etc. event callbacks. Background-thread writer; queue capped; flushed in lifespan teardown. Deployment - proxy_headers + forwarded_allow_ips plumbed through Settings → uvicorn.Config for reverse-proxy installs. - HTTPS support via ssl_certfile + ssl_keyfile (+ optional password); startup refuses to launch with only one of the pair set. - Thumbnail cache moved from project-root .cache to %LOCALAPPDATA%/media-server/cache (Windows) and $XDG_CACHE_HOME/media-server/thumbnails (POSIX). Tests - 35 new tests across auth scopes, rate limiter, browser path traversal (../ NUL UNC absolute), script-param validation incl. regex, Gitea tag whitelist, config atomic write + POSIX perms. 47 passed / 4 skipped.
96 lines
3.1 KiB
Python
96 lines
3.1 KiB
Python
"""In-process token-bucket rate limiter.
|
|
|
|
Light enough for a single-process app: one dict keyed by ``(bucket, peer)``
|
|
guarded by a thread lock. No extra dependency, no Redis. Good enough for
|
|
defeating credential-stuffing and runaway clients on a LAN; not a substitute
|
|
for an upstream WAF in a public deployment.
|
|
|
|
Buckets:
|
|
auth — failed-auth attempts, 5/min/peer (used in auth middleware)
|
|
execute — script + callback execute calls, 10/min/peer (LAN-friendly)
|
|
default — generic POST/DELETE writes, 60/min/peer
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
import threading
|
|
import time
|
|
from dataclasses import dataclass
|
|
from typing import Optional
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
@dataclass
|
|
class BucketConfig:
|
|
capacity: float # max tokens (= burst size)
|
|
refill_per_sec: float # tokens added per second
|
|
|
|
|
|
# Defaults — tuned for "trusted LAN" use; operator can override via Settings.
|
|
BUCKETS: dict[str, BucketConfig] = {
|
|
"auth": BucketConfig(capacity=5, refill_per_sec=5 / 60), # 5/min
|
|
"execute": BucketConfig(capacity=10, refill_per_sec=10 / 60), # 10/min
|
|
"default": BucketConfig(capacity=60, refill_per_sec=60 / 60), # 60/min
|
|
}
|
|
|
|
|
|
_state: dict[tuple[str, str], tuple[float, float]] = {}
|
|
_lock = threading.Lock()
|
|
_LAST_CLEANUP = 0.0
|
|
|
|
|
|
def _evict_stale_locked(now: float) -> None:
|
|
"""Drop entries whose buckets are full (= idle for capacity / refill seconds)."""
|
|
global _LAST_CLEANUP
|
|
if now - _LAST_CLEANUP < 60:
|
|
return
|
|
_LAST_CLEANUP = now
|
|
stale = []
|
|
for key, (tokens, last) in _state.items():
|
|
bucket = BUCKETS.get(key[0])
|
|
if bucket is None:
|
|
continue
|
|
if tokens >= bucket.capacity and (now - last) > 3600:
|
|
stale.append(key)
|
|
for key in stale:
|
|
_state.pop(key, None)
|
|
|
|
|
|
def check(bucket: str, peer: str) -> tuple[bool, Optional[float]]:
|
|
"""Try to consume one token from ``(bucket, peer)``.
|
|
|
|
Returns:
|
|
(allowed, retry_after_seconds). When allowed=True retry_after is None.
|
|
When allowed=False, retry_after is the seconds to wait for one more token.
|
|
"""
|
|
cfg = BUCKETS.get(bucket) or BUCKETS["default"]
|
|
now = time.monotonic()
|
|
with _lock:
|
|
_evict_stale_locked(now)
|
|
tokens, last = _state.get((bucket, peer), (cfg.capacity, now))
|
|
elapsed = max(0.0, now - last)
|
|
tokens = min(cfg.capacity, tokens + elapsed * cfg.refill_per_sec)
|
|
if tokens >= 1:
|
|
tokens -= 1
|
|
_state[(bucket, peer)] = (tokens, now)
|
|
return True, None
|
|
deficit = 1 - tokens
|
|
retry = deficit / cfg.refill_per_sec if cfg.refill_per_sec > 0 else 60
|
|
_state[(bucket, peer)] = (tokens, now)
|
|
return False, retry
|
|
|
|
|
|
def get_peer(request) -> str:
|
|
"""Best-effort peer identifier from a Starlette request.
|
|
|
|
Honors X-Forwarded-For (only when settings.proxy_headers is True, which is
|
|
already enforced by uvicorn's middleware) so a reverse-proxied install
|
|
still rate-limits per real client.
|
|
"""
|
|
client = getattr(request, "client", None)
|
|
if client and client.host:
|
|
return client.host
|
|
return "unknown"
|