alexei.dolgolyov
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.
69 lines
2.0 KiB
Python
69 lines
2.0 KiB
Python
"""Token-bucket rate limiter behaviour."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import time
|
|
|
|
import pytest
|
|
|
|
from media_server.services import rate_limit
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def _reset_state():
|
|
rate_limit._state.clear()
|
|
rate_limit._LAST_CLEANUP = 0.0
|
|
yield
|
|
rate_limit._state.clear()
|
|
|
|
|
|
def test_allows_up_to_capacity_then_blocks(monkeypatch):
|
|
"""Default execute bucket = 10/min."""
|
|
peer = "10.0.0.1"
|
|
for i in range(10):
|
|
ok, retry = rate_limit.check("execute", peer)
|
|
assert ok, f"expected allow on attempt {i + 1}, got block (retry={retry})"
|
|
ok, retry = rate_limit.check("execute", peer)
|
|
assert ok is False
|
|
assert retry is not None and retry > 0
|
|
|
|
|
|
def test_different_peers_independent():
|
|
for _ in range(10):
|
|
assert rate_limit.check("execute", "10.0.0.1")[0]
|
|
# Different peer should still be allowed.
|
|
assert rate_limit.check("execute", "10.0.0.2")[0]
|
|
|
|
|
|
def test_unknown_bucket_uses_default():
|
|
peer = "10.0.0.3"
|
|
# default = 60/min — first call always allowed.
|
|
allowed, _ = rate_limit.check("nonexistent-bucket", peer)
|
|
assert allowed
|
|
|
|
|
|
def test_auth_bucket_is_strict():
|
|
"""auth bucket = 5/min."""
|
|
peer = "10.0.0.4"
|
|
for _ in range(5):
|
|
assert rate_limit.check("auth", peer)[0]
|
|
blocked, retry = rate_limit.check("auth", peer)
|
|
assert not blocked
|
|
assert retry is not None
|
|
|
|
|
|
def test_refill_eventually_unblocks(monkeypatch):
|
|
"""Verify the bucket refills — exhaust then wait one refill period."""
|
|
peer = "10.0.0.5"
|
|
# Replace BUCKETS with a fast-refilling one for the test only.
|
|
monkeypatch.setitem(
|
|
rate_limit.BUCKETS,
|
|
"fast-test",
|
|
rate_limit.BucketConfig(capacity=2, refill_per_sec=10.0),
|
|
)
|
|
assert rate_limit.check("fast-test", peer)[0]
|
|
assert rate_limit.check("fast-test", peer)[0]
|
|
assert not rate_limit.check("fast-test", peer)[0]
|
|
time.sleep(0.15) # 0.15 * 10 = 1.5 tokens
|
|
assert rate_limit.check("fast-test", peer)[0]
|