Compare commits

...
Sign in to create a new pull request.

58 commits

Author SHA1 Message Date
f891b4859f Merge pull request 'Handle expected_minutes=0 gracefully (defense-in-depth)' (#61) from fix/media-verify-runtime-zero-handling into main 2026-09-18 07:19:45 +02:00
de37b51829 Handle runtime=0 gracefully in tests/test_app.py 2026-09-18 07:19:07 +02:00
686272a7c8 Handle runtime=0 gracefully in app.py 2026-09-18 07:19:06 +02:00
af19a60853 Merge pull request 'Fix /media/verify apostrophe false-positive' (#60) from fix/media-verify-apostrophe-escaping into main 2026-09-17 21:55:06 +02:00
211eab032f Fix media/verify apostrophe false-positive in README.md 2026-09-17 21:54:50 +02:00
f5c650fe3d Fix media/verify apostrophe false-positive in tests/test_app.py 2026-09-17 21:54:50 +02:00
4d48fd40c0 Fix media/verify apostrophe false-positive in app.py 2026-09-17 21:54:49 +02:00
e1dafd99b7 Merge pull request 'Add POST /media/verify - ffprobe-based truncated import detection' (#59) from feature/media-verify-endpoint into main 2026-09-17 15:50:29 +02:00
1346f5f8a6 Update README.md for media verify endpoint 2026-09-17 15:50:17 +02:00
8230e03745 Update tests/test_app.py for media verify endpoint 2026-09-17 15:50:17 +02:00
cadcf8766f Update app.py for media verify endpoint 2026-09-17 15:50:16 +02:00
453de2b037 Merge pull request 'Allow serienen/videoen in media handoff' (#58) from fix/handoff-en-categories-20260916 into main 2026-09-16 12:12:15 +02:00
Trulla
f3b9a0c33a Allow serienen/videoen in media handoff
allowed_categories kannte nur serien4k|serien|video4k|video. Die englischen
Arr-Instanzen sonarrEN (Port 8991, Root /data/FHD/serienen) und radarrEN
(Port 7880, Root /data/FHD/videoen) nutzen eigene SAB-Kategorien.

Folge: POST /media/handoff antwortete 422 "Unsupported media category",
movetdarr.sh brach mit "n8n-Handoff konnte nicht registriert werden - kein
Move" ab und Mutiny.2026 x2 (~21 GB) lagen seit 08./09.09.2026 unangetastet
in /usenet/complete/videoen. radarrEN hat den Film weiter monitored,
hasFile=false, Queue leer.

Die Pfadpruefung (expected_prefix) bleibt unveraendert und gilt auch fuer die
neuen Kategorien.

3 neue Tests: serienen+videoen werden geproxyt, erfundene Kategorie bleibt
422, Pfad-Mismatch bei videoen bleibt 422.
6/6 media_handoff-Tests gruen. test_health_exposes_current_version schlug
schon vor dieser Aenderung fehl (Test erwartet 2.4.1, VERSION ist 2.4.6).
2026-09-16 12:11:31 +02:00
f24809a22a Merge pull request 'feat: authenticated DNS RRSet upsert' (#57) from feat/dns-rrset-upsert-20260907 into main 2026-09-07 09:04:19 +02:00
8892ea4597 feat: add authenticated DNS RRSet upsert endpoint 2026-09-07 08:58:05 +02:00
161faf6c65 Merge pull request 'feat: Sascha-Emby auf Direkt-WG und h1+h2 umstellen' (#56) from feat/optimize-tv-sascha-edge-20260905 into main 2026-09-05 13:13:21 +02:00
3c3bc0fcda feat: optimize Sascha Emby edge (tests/test_app.py) 2026-09-05 13:13:19 +02:00
07d3e019e2 feat: optimize Sascha Emby edge (app.py) 2026-09-05 13:13:18 +02:00
36d122d0bb Merge pull request 'feat: Media-Pfade node6 gegen Direkt-WireGuard messen' (#55) from feat/sascha-media-path-benchmark-20260905 into main 2026-09-05 13:06:09 +02:00
fa01dd77fb feat: benchmark direct media path (tests/test_app.py) 2026-09-05 13:06:08 +02:00
f9664d5e36 feat: benchmark direct media path (app.py) 2026-09-05 13:06:07 +02:00
6c92c7023a Merge pull request 'fix: gültiger WireGuard-Kandidatenname' (#54) from fix/wg-candidate-interface-name-20260905 into main 2026-09-05 13:04:08 +02:00
b0fd3c1e36 fix: valid WireGuard interface candidate name (tests/test_app.py) 2026-09-05 13:04:06 +02:00
a9f6c86c7c fix: valid WireGuard interface candidate name (app.py) 2026-09-05 13:04:05 +02:00
02762cc651 Merge pull request 'fix: WireGuard-Kandidat korrekt validieren' (#53) from fix/sascha-media-tunnel-validation-20260905 into main 2026-09-05 13:02:48 +02:00
08c7a5a59d fix: validate wg candidate safely (tests/test_app.py) 2026-09-05 13:02:46 +02:00
ebdb77144a fix: validate wg candidate safely (app.py) 2026-09-05 13:02:45 +02:00
b693ce7467 Merge pull request 'feat: direkter Media-Tunnel für tv.sascha-lutz.de' (#52) from feat/sascha-direct-media-tunnel-20260905 into main 2026-09-05 12:58:10 +02:00
32885c48b9 feat: add Sascha direct media tunnel support (tests/test_app.py) 2026-09-05 12:58:08 +02:00
650caedacf feat: add Sascha direct media tunnel support (app.py) 2026-09-05 12:58:08 +02:00
d36a3ea615 Merge pull request 'fix: wait for every file in season packs' (#51) from fix/media-handoff-season-packs-20260905 into main 2026-09-05 08:20:50 +02:00
05785444d5 fix: wait for every file in season packs 2026-09-05 08:20:48 +02:00
742d3ebfa7 fix: wait for every file in season packs 2026-09-05 08:20:47 +02:00
7ddb88b54e Merge pull request 'feat: add restricted media handoff bridge' (#50) from feat/media-handoff-orchestrator-20260905 into main 2026-09-05 07:59:54 +02:00
197208c571 feat: add restricted media handoff bridge 2026-09-05 07:59:53 +02:00
73d1b0ed38 feat: add restricted media handoff bridge 2026-09-05 07:59:52 +02:00
22d2581431 Merge pull request 'fix: expose Paperless import task result' (#49) from fix/paperless-import-result-logs into main 2026-09-01 08:46:30 +02:00
3facb1f34c fix: include Paperless task result in import status 2026-09-01 08:46:29 +02:00
59aeb3c74c Merge pull request 'fix: route Paperless import through automation1' (#48) from fix/paperless-import-via-automation1 into main 2026-09-01 08:43:29 +02:00
0f967dce73 fix: route Paperless import through automation1 2026-09-01 08:43:28 +02:00
bca531746b fix: route Paperless import through automation1 2026-09-01 08:43:27 +02:00
9d2b5f1185 Merge pull request 'feat: Butler-mediated Paperless PDF import' (#47) from feature/paperless-import-20260901 into main 2026-09-01 08:40:54 +02:00
fccd6db089 feat: add Butler-mediated Paperless PDF import 2026-09-01 08:40:53 +02:00
b70a9a65ec feat: add Butler-mediated Paperless PDF import 2026-09-01 08:40:52 +02:00
1318c826b6 Merge pull request 'Git-zentriertes guck-admin Deployment über Butler' (#46) from feat/guck-admin-deploy-20260831 into main 2026-08-31 09:49:35 +02:00
a253324cbf Git-zentriertes guck-admin Deployment über Butler: tests/test_bw_manager_deploy.py 2026-08-31 09:48:49 +02:00
42040b097b Git-zentriertes guck-admin Deployment über Butler: tests/test_guck_admin_deploy.py 2026-08-31 09:48:48 +02:00
e99e03da20 Git-zentriertes guck-admin Deployment über Butler: app.py 2026-08-31 09:48:47 +02:00
50a23dc780 Git-zentriertes guck-admin Deployment über Butler: app.py 2026-08-31 09:47:25 +02:00
4102dd6b83 fix: proxy base_url cfg.get(url) for apikey_urlfile services (radarr/sonarr1080p) 2026-08-18 11:32:57 +02:00
9d5e1e90ae Merge pull request 'Emby-Historie für 30 und 90 Tage stabilisieren' (#45) from fix/emby-history-long-ranges into main 2026-08-16 22:04:34 +02:00
cf8249ae88 Fix long Emby history ranges (tests/test_app.py) 2026-08-16 22:04:21 +02:00
e5dd433906 Fix long Emby history ranges (app.py) 2026-08-16 22:04:20 +02:00
6605940a81 Merge pull request 'Akteursbezogenes KI- und Butler-Aktivitätsprotokoll' (#44) from feature/butler-ai-activity-log into main 2026-08-16 21:40:41 +02:00
6620384dc4 Add actor-aware Butler activity log (tests/test_app.py) 2026-08-16 21:40:28 +02:00
ef4fd59197 Add actor-aware Butler activity log (ui.html) 2026-08-16 21:40:27 +02:00
4870dbd31d Add actor-aware Butler activity log (app.py) 2026-08-16 21:40:26 +02:00
815bcd94cf Merge pull request 'Emby Account-Sharing-Analyse und read-only UI ohne Login' (#43) from feature/emby-account-sharing into main 2026-08-16 21:29:17 +02:00
6 changed files with 1777 additions and 27 deletions

View file

@ -45,6 +45,7 @@ Known secret response fields such as Dockhand's `hawserToken` and `webhookSecret
| `/docker/inspect/{host}/{container}` | GET | Sanitized image, runtime, resources, mounts and state |
| `/docker/restart/{host}/{container}` | POST | Restart container; supports `dry_run=true` |
| `/config/reload` | POST | Reload YAML configuration and credential cache |
| `/media/verify` | POST | ffprobe duration check on a NAS media file to catch truncated Sonarr/Radarr imports; flags `suspect` if deviation from `expected_minutes` exceeds `tolerance_pct` |
## VM lifecycle and inventory
@ -97,6 +98,14 @@ Integration Compose definition: `tests/compose.integration.yaml` (binds only to
## Changelog
### 2.4.8 — 17.09.2026
- Fixed `POST /media/verify` false-positive rejection: filenames containing a legitimate apostrophe (e.g. "La'An" in a Star Trek episode title) were blocked as "unsafe characters". Replaced the naive single-quote wrapping + apostrophe blocklist with proper `shlex.quote()` escaping for the remote ffprobe command; only newline/NUL byte injection is still rejected.
### 2.4.7 — 17.09.2026
- Added `POST /media/verify`: probes a media file's real duration via `ffprobe` (running inside the existing `bazarrUHD` container on `arrapps`, which already mounts `/data` and ships ffmpeg — no new service needed) and flags it as `suspect` when it deviates from an `expected_minutes` value beyond `tolerance_pct`. Catches truncated Sonarr/Radarr imports (e.g. a re-grab that lands as 1.8 GB instead of the expected 8 GB for a UHD episode) after the file is already on the NAS.
### 2.3.2 — 22.07.2026
- Make Vaultwarden refresh durable: persistent named cache volume, protected runtime credentials, automatic API-key re-login and atomic cache writes.

1203
app.py

File diff suppressed because it is too large Load diff

View file

@ -1,6 +1,7 @@
import os
import asyncio
import json
import shlex
import time
from datetime import datetime, timedelta, timezone
@ -43,7 +44,207 @@ def test_health_exposes_current_version():
with TestClient(app.app) as client:
response = client.get("/health")
assert response.status_code == 200
assert response.json()["version"] == app.VERSION == "2.3.5"
assert response.json()["version"] == app.VERSION == "2.4.1"
def test_media_handoff_proxies_strict_category_contract(monkeypatch):
captured = {}
class FakeResponse:
status_code = 200
def json(self):
return {"ok": True, "jobId": "test-job-1234", "state": "registered"}
class FakeClient:
def __init__(self, **kwargs):
captured["client"] = kwargs
async def __aenter__(self):
return self
async def __aexit__(self, *_args):
return None
async def post(self, url, json, headers):
captured.update(url=url, json=json, headers=headers)
return FakeResponse()
monkeypatch.setattr(app.httpx, "AsyncClient", FakeClient)
with TestClient(app.app) as client:
monkeypatch.setattr(app, "SERVICES", {"n8n": {"url": "http://n8n:5678", "auth": "n8n"}})
response = client.post(
"/media/handoff",
headers={"Authorization": "Bearer test-token"},
json={
"action": "start",
"category": "serien4k",
"directory": "/usenet/complete/serien4k/Show.S01E01",
"release": "Show.S01E01-GRP",
"cleanName": "Show S01E01",
"expectedFiles": 2,
},
)
assert response.status_code == 200
assert response.json()["state"] == "registered"
assert captured["url"] == "http://n8n:5678/webhook/media-handoff"
assert captured["json"]["category"] == "serien4k"
assert captured["json"]["expectedFiles"] == 2
def test_media_handoff_rejects_untrusted_caller_before_proxy(monkeypatch):
monkeypatch.setattr(app.httpx, "AsyncClient", lambda **_kwargs: (_ for _ in ()).throw(AssertionError("must not proxy")))
with TestClient(app.app) as client:
response = client.post(
"/media/handoff",
json={"action": "status", "jobId": "test-job-1234"},
)
assert response.status_code == 403
def test_media_handoff_rejects_wrong_category_path(monkeypatch):
monkeypatch.setattr(app.httpx, "AsyncClient", lambda **_kwargs: (_ for _ in ()).throw(AssertionError("must not proxy")))
with TestClient(app.app) as client:
response = client.post(
"/media/handoff",
headers={"Authorization": "Bearer test-token"},
json={
"action": "start",
"category": "video4k",
"directory": "/usenet/complete/serien4k/Wrong",
"release": "Wrong",
},
)
assert response.status_code == 422
def test_media_handoff_accepts_english_arr_categories(monkeypatch):
"""serienen/videoen muessen durchgehen (sonarrEN 8991 / radarrEN 7880).
16.09.2026: fehlten in allowed_categories -> HTTP 422 -> movetdarr.sh
brach mit "n8n-Handoff konnte nicht registriert werden" ab und liess
Mutiny.2026 x2 tagelang in /usenet/complete/videoen liegen.
"""
seen = []
class FakeResponse:
status_code = 200
def json(self):
return {"ok": True, "jobId": "test-job-5678", "state": "registered"}
class FakeClient:
def __init__(self, **_kwargs):
pass
async def __aenter__(self):
return self
async def __aexit__(self, *_args):
return None
async def post(self, url, json, headers):
seen.append(json)
return FakeResponse()
monkeypatch.setattr(app.httpx, "AsyncClient", FakeClient)
with TestClient(app.app) as client:
monkeypatch.setattr(app, "SERVICES", {"n8n": {"url": "http://n8n:5678", "auth": "n8n"}})
for category in ("serienen", "videoen"):
response = client.post(
"/media/handoff",
headers={"Authorization": "Bearer test-token"},
json={
"action": "start",
"category": category,
"directory": f"/usenet/complete/{category}/Release.2026",
"release": "Release.2026-GRP",
"cleanName": "Release 2026",
"expectedFiles": 1,
},
)
assert response.status_code == 200, (category, response.text)
assert response.json()["state"] == "registered", category
assert [item["category"] for item in seen] == ["serienen", "videoen"]
def test_media_handoff_still_rejects_unknown_category(monkeypatch):
"""Fail-closed bleibt: eine frei erfundene Kategorie wird nicht geproxyt."""
monkeypatch.setattr(
app.httpx,
"AsyncClient",
lambda **_kwargs: (_ for _ in ()).throw(AssertionError("must not proxy")),
)
with TestClient(app.app) as client:
response = client.post(
"/media/handoff",
headers={"Authorization": "Bearer test-token"},
json={
"action": "start",
"category": "hoerbuecher",
"directory": "/usenet/complete/hoerbuecher/Buch",
"release": "Buch",
},
)
assert response.status_code == 422
def test_media_handoff_english_category_path_must_match(monkeypatch):
"""Pfadpruefung gilt auch fuer die neuen Kategorien."""
monkeypatch.setattr(
app.httpx,
"AsyncClient",
lambda **_kwargs: (_ for _ in ()).throw(AssertionError("must not proxy")),
)
with TestClient(app.app) as client:
response = client.post(
"/media/handoff",
headers={"Authorization": "Bearer test-token"},
json={
"action": "start",
"category": "videoen",
"directory": "/usenet/complete/video4k/Wrong",
"release": "Wrong",
},
)
assert response.status_code == 422
def test_paperless_import_queues_pdf_through_butler(monkeypatch):
captured = {}
def fake_upload(host, command, payload, timeout):
captured.update(host=host, command=command, payload=payload, timeout=timeout)
return 0, "", ""
monkeypatch.setattr(app, "_ssh_bytes", fake_upload)
pdf = b"%PDF-1.7\nvalid-test-payload"
with TestClient(app.app) as client:
response = client.post(
"/paperless/import?filename=Hausordnung%20Stand%2009.05.2022.pdf",
content=pdf,
headers={"Authorization": "Bearer test-token", "Content-Type": "application/pdf"},
)
assert response.status_code == 200
body = response.json()
assert body["status"] == "queued"
assert body["filename"].startswith("Hausordnung_Stand_09.05.2022-")
assert captured["host"] == app.PAPERLESS_GATEWAY
assert app.PAPERLESS_SSH in captured["command"]
assert captured["payload"] == pdf
assert app.PAPERLESS_CONSUME_DIR in captured["command"]
def test_paperless_import_rejects_non_pdf(monkeypatch):
monkeypatch.setattr(app, "_ssh_bytes", lambda *args: (_ for _ in ()).throw(AssertionError("must not upload")))
with TestClient(app.app) as client:
response = client.post(
"/paperless/import?filename=bad.pdf",
content=b"not a pdf",
headers={"Authorization": "Bearer test-token"},
)
assert response.status_code == 400
def test_ui_serves_self_contained_operator_console():
@ -216,6 +417,60 @@ def test_emby_account_sharing_endpoint_is_read_only_and_filterable(monkeypatch):
assert payload["users"][0]["username"] == "Alice"
def test_emby_history_step_stays_below_prometheus_resolution_limit():
assert app._emby_history_step(7) == 60
for days in (7, 30, 90):
step = app._emby_history_step(days)
assert step % 60 == 0
assert (days * 86400) / step <= 10_500
def test_emby_history_fetch_chunks_90_days_and_merges_equal_series(monkeypatch):
calls = []
class FakeResponse:
def __init__(self, params):
self.params = params
def raise_for_status(self):
return None
def json(self):
start = self.params["start"]
end = self.params["end"]
return {"status": "success", "data": {"result": [{
"metric": {"job": "emby-sascha", "username": "Alice", "remoteEndPoint": "8.8.8.8"},
"values": [[start, "1"], [end, "1"]],
}]}}
class FakeClient:
def __init__(self, **_kwargs):
pass
async def __aenter__(self):
return self
async def __aexit__(self, *_args):
return None
async def get(self, _url, params, headers, cookies):
calls.append(params)
return FakeResponse(params)
monkeypatch.setattr(app, "SERVICES", {"grafana": {"url": "http://grafana", "auth": "none"}})
monkeypatch.setattr(app.httpx, "AsyncClient", FakeClient)
monkeypatch.setattr(app.time, "time", lambda: 10_000_000)
series, step = asyncio.run(app._fetch_emby_session_history(90, "all"))
assert len(calls) == 3
assert all(call["end"] - call["start"] <= 30 * 86400 for call in calls)
assert step == 780
assert len(series) == 1
timestamps = [value[0] for value in series[0]["values"]]
assert timestamps == sorted(set(timestamps))
def test_capabilities_is_live_machine_readable_safety_map():
with TestClient(app.app) as client:
response = client.get(
@ -231,6 +486,9 @@ def test_capabilities_is_live_machine_readable_safety_map():
assert removal["mode"] == "mutation"
assert removal["dry_run"] is True
assert removal["critical"] is True
tunnel = by_operation[("POST", "/network/media-tunnel/sascha")]
assert tunnel["dry_run"] is True
assert tunnel["critical"] is True
assert by_operation[("DELETE", "/vm/destroy/{vmid}")]["dry_run"] is True
assert all(item["path"] != "/{service}/{path}" for item in payload["operations"])
assert payload["model_contract"]["instruction"].startswith("Prefer read_only")
@ -266,6 +524,39 @@ def test_audit_persists_and_redacts_secrets(tmp_path, monkeypatch):
assert entry["detail"].count("[REDACTED]") == 3
def test_audit_records_ai_and_web_ui_actor(tmp_path, monkeypatch):
db = tmp_path / "audit.sqlite3"
monkeypatch.setattr(app, "AUDIT_DB_PATH", str(db))
async def empty_status():
return {}
monkeypatch.setattr(app, "_collect_service_status", empty_status)
app._ui_sessions.clear()
with TestClient(app.app) as client:
ai = client.get(
"/status",
headers={"Authorization": "Bearer test-token", "X-Butler-Actor": "Trulla"},
)
assert ai.status_code == 200
client.headers.pop("Authorization", None)
client.get("/ui/session")
web = client.get("/status")
assert web.status_code == 200
entries = client.get("/audit").json()
assert [item["actor"] for item in entries[:2]] == ["Weboberfläche", "Trulla"]
def test_ui_audit_has_actor_column_and_filter():
with TestClient(app.app) as client:
response = client.get("/ui")
assert '<th>Akteur</th>' in response.text
assert 'id="audit-actor"' in response.text
def test_wireguard_status_returns_redacted_live_state(monkeypatch):
payload = {
"interface": "wg0",
@ -611,6 +902,115 @@ def test_uptime_monitor_remove_rejects_invalid_expected_name_before_ssh(monkeypa
assert response.status_code == 400
def test_media_verify_returns_duration_and_not_suspect_when_within_tolerance(monkeypatch):
monkeypatch.setattr(app, "_find_inventory_host", lambda host: {"user": "sascha", "ip": "10.2.1.100"})
calls = []
def fake_ssh(host, command, timeout=30):
calls.append((host, command, timeout))
return 0, "2967.355000\n", ""
monkeypatch.setattr(app, "_ssh", fake_ssh)
with TestClient(app.app) as client:
response = client.post(
"/media/verify",
headers={"Authorization": "Bearer test-token"},
json={"host": "arrapps", "path": "/data/UHD/serien/Show/ep.mkv", "expected_minutes": 49.5},
)
assert response.status_code == 200
body = response.json()
assert body["duration_minutes"] == 49.46
assert body["suspect"] is False
assert calls[0][0] == "sascha@10.2.1.100"
assert "bazarrUHD" in calls[0][1]
assert "ffprobe" in calls[0][1]
def test_media_verify_flags_truncated_file_as_suspect(monkeypatch):
monkeypatch.setattr(app, "_find_inventory_host", lambda host: {"user": "sascha", "ip": "10.2.1.100"})
monkeypatch.setattr(app, "_ssh", lambda *_args, **_kwargs: (0, "1836.0\n", ""))
with TestClient(app.app) as client:
response = client.post(
"/media/verify",
headers={"Authorization": "Bearer test-token"},
json={"host": "arrapps", "path": "/data/UHD/serien/Show/ep.mkv", "expected_minutes": 49.5},
)
assert response.status_code == 200
body = response.json()
assert body["suspect"] is True
assert body["deviation_pct"] > 20
def test_media_verify_rejects_path_outside_data_before_ssh(monkeypatch):
monkeypatch.setattr(app, "_ssh", lambda *_args, **_kwargs: (_ for _ in ()).throw(AssertionError("must not SSH")))
with TestClient(app.app) as client:
response = client.post(
"/media/verify",
headers={"Authorization": "Bearer test-token"},
json={"host": "arrapps", "path": "/etc/passwd"},
)
assert response.status_code == 400
def test_media_verify_allows_apostrophe_in_filename_and_quotes_it_safely(monkeypatch):
monkeypatch.setattr(app, "_find_inventory_host", lambda host: {"user": "sascha", "ip": "10.2.1.100"})
calls = []
def fake_ssh(host, command, timeout=30):
calls.append((host, command, timeout))
return 0, "2967.0\n", ""
monkeypatch.setattr(app, "_ssh", fake_ssh)
path = "/data/FHD/serien/Star Trek - Strange New Worlds (2022)/Season 04/Once La'An a Time.mkv"
with TestClient(app.app) as client:
response = client.post(
"/media/verify",
headers={"Authorization": "Bearer test-token"},
json={"host": "arrapps", "path": path, "expected_minutes": 49.5},
)
assert response.status_code == 200
# shlex.quote must produce a command the remote shell parses as ONE argument,
# i.e. no unescaped apostrophe breaks out of quoting.
executed_cmd = calls[0][1]
quoted = shlex.quote(path)
assert quoted in executed_cmd
assert shlex.split(executed_cmd)[-1] == path
def test_media_verify_rejects_shell_metacharacters_before_ssh(monkeypatch):
monkeypatch.setattr(app, "_ssh", lambda *_args, **_kwargs: (_ for _ in ()).throw(AssertionError("must not SSH")))
with TestClient(app.app) as client:
response = client.post(
"/media/verify",
headers={"Authorization": "Bearer test-token"},
json={"host": "arrapps", "path": "/data/UHD/serien/a\x00.mkv"},
)
assert response.status_code == 400
def test_media_verify_rejects_unknown_host_before_ssh(monkeypatch):
monkeypatch.setattr(app, "_ssh", lambda *_args, **_kwargs: (_ for _ in ()).throw(AssertionError("must not SSH")))
with TestClient(app.app) as client:
response = client.post(
"/media/verify",
headers={"Authorization": "Bearer test-token"},
json={"host": "unknown-host", "path": "/data/UHD/serien/ep.mkv"},
)
assert response.status_code == 400
def test_media_verify_returns_502_on_unparsable_ffprobe_output(monkeypatch):
monkeypatch.setattr(app, "_find_inventory_host", lambda host: {"user": "sascha", "ip": "10.2.1.100"})
monkeypatch.setattr(app, "_ssh", lambda *_args, **_kwargs: (0, "N/A\n", ""))
with TestClient(app.app) as client:
response = client.post(
"/media/verify",
headers={"Authorization": "Bearer test-token"},
json={"host": "arrapps", "path": "/data/UHD/serien/ep.mkv", "expected_minutes": 49.5},
)
assert response.status_code == 502
def test_invalid_log_target_is_rejected_before_ssh():
with TestClient(app.app) as client:
response = client.get(
@ -1080,3 +1480,124 @@ def test_speedtest_deploy_requires_strong_secrets_and_uses_full_git_app(monkeypa
assert deploy[1]["compose.yaml"] == "content:compose.yaml"
assert deploy[2] == "correct-horse-battery-staple"
assert deploy[3] == "streamscope-session-secret-with-entropy"
def test_sascha_media_edge_audit_uses_fixed_hetzner_host(monkeypatch):
payload = {
"hostname": "pfannkuchen",
"caddy": {"container_running": True, "protocols": ["h1", "h2", "h3"], "upstreams": ["10.6.1.103:8096"]},
"network": {"wg_media": False, "udp_51821": False},
}
calls = []
monkeypatch.setattr(app, "_find_inventory_host", lambda name: {"name": name, "user": "root", "ip": "46.225.230.72"})
monkeypatch.setattr(app, "_ssh", lambda host, command, timeout=30: (calls.append((host, command, timeout)) or (0, json.dumps(payload), "")))
with TestClient(app.app) as client:
response = client.get("/media/edge/sascha", headers={"Authorization": "Bearer test-token"})
assert response.status_code == 200
assert response.json()["caddy"]["upstreams"] == ["10.6.1.103:8096"]
assert calls[0][0] == "root@46.225.230.72"
assert "PrivateKey" not in response.text
def test_sascha_media_tunnel_defaults_to_side_effect_free_dry_run(monkeypatch):
monkeypatch.setattr(app, "_ssh", lambda *_args, **_kwargs: (_ for _ in ()).throw(AssertionError("dry-run must not SSH")))
with TestClient(app.app) as client:
response = client.post(
"/network/media-tunnel/sascha",
headers={"Authorization": "Bearer test-token"},
json={},
)
assert response.status_code == 200
body = response.json()
assert body["status"] == "would_deploy"
assert body["vps_address"] == "10.11.13.1/32"
assert body["emby_address"] == "10.11.13.3/32"
assert body["listen_port"] == 51821
def test_sascha_media_tunnel_requires_explicit_confirmation(monkeypatch):
monkeypatch.setattr(app, "_ssh", lambda *_args, **_kwargs: (_ for _ in ()).throw(AssertionError("unconfirmed request must not SSH")))
with TestClient(app.app) as client:
response = client.post(
"/network/media-tunnel/sascha",
headers={"Authorization": "Bearer test-token"},
json={"dry_run": False},
)
assert response.status_code == 400
def test_sascha_media_tunnel_apply_returns_redacted_result(monkeypatch):
result = {
"status": "deployed",
"interface": "wg-media",
"vps_address": "10.11.13.1/32",
"emby_address": "10.11.13.3/32",
"listen_port": 51821,
"handshake": True,
"ping_vps_to_emby": True,
"ping_emby_to_vps": True,
}
monkeypatch.setattr(app, "_deploy_sascha_media_tunnel", lambda: result)
with TestClient(app.app) as client:
response = client.post(
"/network/media-tunnel/sascha",
headers={"Authorization": "Bearer test-token"},
json={"dry_run": False, "confirmation": "DEPLOY_DIRECT_SASCHA_MEDIA_TUNNEL"},
)
assert response.status_code == 200
assert response.json()["handshake"] is True
assert "private" not in response.text.lower()
def test_sascha_media_tunnel_candidate_uses_valid_wireguard_interface_name():
import base64
import re
command = app._media_tunnel_install_command("vps", "A" * 43 + "=")
encoded = re.search(r"b64decode\('([^']+)'\)", command).group(1)
script = base64.b64decode(encoded).decode()
assert 'root / "wgmtest.conf"' in script
assert len("wgmtest") <= 15
def test_sascha_media_path_benchmark_returns_both_fixed_routes(monkeypatch):
monkeypatch.setattr(app, "_benchmark_sascha_media_paths", lambda: {
"legacy_node6": {"bytes": 268435456, "seconds": 4.0, "mbit_s": 536.9},
"direct_wg_media": {"bytes": 268435456, "seconds": 3.0, "mbit_s": 715.8},
})
with TestClient(app.app) as client:
response = client.post(
"/network/media-tunnel/sascha/benchmark",
headers={"Authorization": "Bearer test-token"},
)
assert response.status_code == 200
assert response.json()["direction"] == "emby-sascha_to_hetzner"
assert set(response.json()["results"]) == {"legacy_node6", "direct_wg_media"}
def test_sascha_media_edge_optimize_is_dry_run_by_default(monkeypatch):
monkeypatch.setattr(app, "_optimize_sascha_media_edge", lambda: (_ for _ in ()).throw(AssertionError("dry-run must not mutate")))
with TestClient(app.app) as client:
response = client.post("/media/edge/sascha/optimize", headers={"Authorization": "Bearer test-token"}, json={})
assert response.status_code == 200
assert response.json()["protocols"] == ["h1", "h2"]
assert response.json()["upstream"] == "10.11.13.3:8096"
def test_sascha_media_edge_optimize_requires_confirmation(monkeypatch):
monkeypatch.setattr(app, "_optimize_sascha_media_edge", lambda: (_ for _ in ()).throw(AssertionError("must not mutate")))
with TestClient(app.app) as client:
response = client.post("/media/edge/sascha/optimize", headers={"Authorization": "Bearer test-token"}, json={"dry_run": False})
assert response.status_code == 400
def test_sascha_media_edge_optimize_applies_fixed_safe_result(monkeypatch):
monkeypatch.setattr(app, "_optimize_sascha_media_edge", lambda: {"status": "optimized", "upstream": "10.11.13.3:8096", "protocols": ["h1", "h2"], "backup": "/app-config/caddy/backup", "sha256": "a" * 64})
with TestClient(app.app) as client:
response = client.post(
"/media/edge/sascha/optimize",
headers={"Authorization": "Bearer test-token"},
json={"dry_run": False, "confirmation": "OPTIMIZE_TV_SASCHA_LUTZ_DE"},
)
assert response.status_code == 200
assert response.json()["status"] == "optimized"

View file

@ -18,6 +18,8 @@ def load_app(monkeypatch):
def test_bw_manager_deploy_rejects_bundle_without_and_gate(monkeypatch):
app = load_app(monkeypatch)
if not hasattr(app, "BW_MANAGER_REPO_FILES"):
pytest.skip("BW-Manager was intentionally retired on 13.08.2026")
files = {path: "placeholder" for path in app.BW_MANAGER_REPO_FILES}
files["compose.yaml"] = "services:\n bw-manager:\n build: ./src\n"
files["src/app.py"] = "def old_policy(): pass\n"

View file

@ -0,0 +1,54 @@
import app
import pytest
from fastapi.testclient import TestClient
def valid_bundle():
files={path:'placeholder' for path in app.GUCK_ADMIN_REPO_FILES}
files['guck-admin/compose.yaml']='''services:\n guck-admin:\n build: .\n network_mode: host\n cap_add: [NET_ADMIN]\n environment:\n GUCK_LIMIT: /host/guck-limit.sh\n volumes:\n - /app-config/guck-admin/data:/data\n control-monitor:\n build: .\n network_mode: host\n cap_add: [NET_ADMIN]\n'''
files['guck-admin/src/control.py']='''CREATE TABLE IF NOT EXISTS custom_networks\n2a00:8c40:f000::/36\n45.58.235.0/24\ndef sync_custom_networks(): pass\n'''
return files
def test_guck_admin_bundle_requires_persistent_custom_network_policy():
files=valid_bundle()
files['guck-admin/src/control.py']='def old_control(): pass\n'
with pytest.raises(ValueError,match='custom VPN'):
app._validate_guck_admin_bundle(files)
def test_guck_admin_deploy_dry_run_has_no_remote_side_effect(monkeypatch):
calls=[]
monkeypatch.setattr(app,'_find_inventory_host',lambda host:{'user':'debian','ip':'141.94.237.199'})
monkeypatch.setattr(app,'_ssh',lambda *args,**kwargs:calls.append(args))
result=app._deploy_guck_admin_compose(valid_bundle(),dry_run=True)
assert result['status']=='validated'
assert result['host']=='guck-vps'
assert calls==[]
def test_guck_admin_deploy_uses_inventory_target_and_verifies_policy(monkeypatch):
calls=[]
monkeypatch.setattr(app,'_find_inventory_host',lambda host:{'user':'debian','ip':'141.94.237.199'})
def fake_ssh(host,command,timeout=600):
calls.append((host,command,timeout))
if 'ipset test vpn-v6' in command:
return 0,'policy ok',''
return 0,'ok',''
monkeypatch.setattr(app,'_ssh',fake_ssh)
result=app._deploy_guck_admin_compose(valid_bundle(),dry_run=False)
assert result['status']=='deployed'
assert result['policy']=='verified'
assert all(host=='debian@141.94.237.199' for host,_,_ in calls)
commands='\n'.join(command for _,command,_ in calls)
assert 'docker compose build' in commands
assert '127.0.0.1:9090/health' in commands
assert '/actions/limiter/refresh' in commands
assert 'ipset test vpn-v6 2a00:8c40:f02d:a34c::1' in commands
assert 'ipset test vpn-v4 45.58.235.7' in commands
def test_guck_admin_deploy_endpoint_requires_auth(monkeypatch):
monkeypatch.setattr(app,'BUTLER_TOKEN','test-token')
response=TestClient(app.app).post('/vps/guck-admin/deploy',json={'dry_run':True})
assert response.status_code in (401,403)

13
ui.html
View file

@ -76,8 +76,8 @@
</section>
<section id="view-audit" class="view">
<div class="hero"><div><div class="eyebrow">Persistente Historie</div><h2>Audit</h2><p>Redigierte Butler-Aktionen aus SQLite.</p></div></div>
<article class="panel"><div class="panel-head"><div class="panel-title">Letzte Aktionen</div><button id="audit-refresh" class="btn">Aktualisieren</button></div><div class="table-wrap"><table><thead><tr><th>Zeit</th><th>Methode</th><th>Endpoint</th><th>Status</th><th>Dry-run</th><th>Detail</th></tr></thead><tbody id="audit-body"><tr><td colspan="6">Wird geladen …</td></tr></tbody></table></div></article>
<div class="hero"><div><div class="eyebrow">KI- und API-Protokoll</div><h2>Butler-Aktivitäten</h2><p>Wer hat wann welche Butler-Funktion aufgerufen? Sensible Werte bleiben redigiert.</p></div></div>
<article class="panel"><div class="panel-head"><div class="panel-title">Letzte Aktivitäten</div><div class="top-actions"><select id="audit-actor" class="input" aria-label="Akteur filtern" style="min-width:170px"><option value="all">Alle Akteure</option><option value="ai">Nur KI / API</option><option value="Weboberfläche">Nur Weboberfläche</option></select><button id="audit-refresh" class="btn">Aktualisieren</button></div></div><div class="table-wrap"><table><thead><tr><th>Zeit</th><th>Akteur</th><th>Methode</th><th>Endpoint</th><th>Status</th><th>Dry-run</th><th>Detail</th></tr></thead><tbody id="audit-body"><tr><td colspan="7">Wird geladen …</td></tr></tbody></table></div></article>
</section>
<section id="view-functions" class="view">
@ -93,7 +93,7 @@
<script>
(() => {
'use strict';
const state={capabilities:null,operations:[],filter:'all'};
const state={capabilities:null,operations:[],audit:[],filter:'all'};
const $=s=>document.querySelector(s);
const $$=s=>[...document.querySelectorAll(s)];
const esc=v=>String(v??'').replace(/[&<>'"]/g,c=>({'&':'&amp;','<':'&lt;','>':'&gt;',"'":'&#39;','"':'&quot;'}[c]));
@ -101,9 +101,9 @@
const toast=msg=>{const el=$('#toast');el.textContent=msg;el.classList.add('show');setTimeout(()=>el.classList.remove('show'),2600)};
async function api(path,options={}){const method=(options.method||'GET').toUpperCase();const headers={...(options.headers||{})};if(!['GET','HEAD','OPTIONS'].includes(method))headers['X-CSRF-Token']=decodeURIComponent(cookie('butler_csrf'));if(options.body&&!headers['Content-Type'])headers['Content-Type']='application/json';const res=await fetch(path,{credentials:'same-origin',...options,headers});if(res.status===401){await fetch('/ui/session',{credentials:'same-origin'});location.reload();throw new Error('Read-only Sitzung wurde erneuert')}const text=await res.text();let data;try{data=JSON.parse(text)}catch{data=text}if(!res.ok)throw new Error(data?.detail||data?.error||`HTTP ${res.status}`);return data}
$$('.nav button[data-view]').forEach(btn=>btn.addEventListener('click',()=>switchView(btn.dataset.view)));
function switchView(name){$$('.view').forEach(v=>v.classList.toggle('active',v.id===`view-${name}`));$$('.nav button[data-view]').forEach(b=>b.classList.toggle('active',b.dataset.view===name));$('#view-title').textContent={overview:'Übersicht',doctor:'Doctor',sharing:'Emby Account Sharing',safety:'Wartung & Drift',audit:'Audit',functions:'Alle Funktionen'}[name];$('#sidebar').classList.remove('open')}
function switchView(name){$$('.view').forEach(v=>v.classList.toggle('active',v.id===`view-${name}`));$$('.nav button[data-view]').forEach(b=>b.classList.toggle('active',b.dataset.view===name));$('#view-title').textContent={overview:'Übersicht',doctor:'Doctor',sharing:'Emby Account Sharing',safety:'Wartung & Drift',audit:'Butler-Aktivitäten',functions:'Alle Funktionen'}[name];$('#sidebar').classList.remove('open')}
$('#menu').addEventListener('click',()=>$('#sidebar').classList.toggle('open'));
$('#refresh').addEventListener('click',refreshAll);$('#drift-refresh').addEventListener('click',loadDrift);$('#audit-refresh').addEventListener('click',loadAudit);
$('#refresh').addEventListener('click',refreshAll);$('#drift-refresh').addEventListener('click',loadDrift);$('#audit-refresh').addEventListener('click',loadAudit);$('#audit-actor').addEventListener('change',renderAudit);
async function refreshAll(){toast('Aktualisierung gestartet');await Promise.allSettled([loadOverview(),loadDrift(),loadAudit(),loadCapabilities()]);toast('Live-Daten aktualisiert')}
async function loadOverview(){try{const x=await api('/overview');const good=x.overall_state==='healthy';const box=$('#metric-state');box.className=`metric ${good?'good':x.overall_state==='warning'?'warn':'bad'}`;box.querySelector('.metric-value').textContent=x.overall_state;$('#metric-services').textContent=x.components.services.healthy;$('#metric-hosts').textContent=x.components.hosts.healthy;$('#metric-backups').textContent=x.components.backups.healthy;$('#finding-count').textContent=x.findings.length;$('#updated').textContent=new Date(x.generated).toLocaleString('de-DE');$('#findings').innerHTML=x.findings.length?x.findings.map(f=>`<div class="finding ${esc(f.severity)}"><span class="finding-dot"></span><div><strong>${esc(f.target)} · ${esc(f.code)}</strong><p>${esc(f.message)}</p></div><span class="badge">${esc(f.severity)}</span></div>`).join(''):'<div class="empty">Keine Findings. Alles sieht gut aus.</div>'}catch(e){$('#findings').innerHTML=`<div class="empty">${esc(e.message)}</div>`}}
async function loadCapabilities(){try{const x=await api('/capabilities');state.capabilities=x;state.operations=x.operations;$('#capability-summary').innerHTML=[['Operationen',x.counts.total],['Read-only',x.counts.read_only],['Mutationen',x.counts.mutations],['Destruktiv',x.counts.destructive]].map(([k,v])=>`<div class="layer"><h4>${k}</h4><div class="metric-value">${v}</div></div>`).join('');renderOperations()}catch(e){$('#operations-grid').innerHTML=`<div class="empty">${esc(e.message)}</div>`}}
@ -116,7 +116,8 @@
$('#sharing-form').addEventListener('submit',async e=>{e.preventDefault();const q=new URLSearchParams({days:$('#sharing-days').value,server:$('#sharing-server').value});const username=$('#sharing-username').value.trim();if(username)q.set('username',username);$('#sharing-events').innerHTML='<div class="empty"><span class="spinner"></span> Sitzungsverlauf wird analysiert …</div>';$('#sharing-users').innerHTML='<div class="empty">Analyse läuft …</div>';try{renderSharing(await api(`/emby/account-sharing?${q}`))}catch(err){$('#sharing-events').innerHTML=`<div class="empty">${esc(err.message)}</div>`;$('#sharing-users').innerHTML='<div class="empty">Keine Auswertung verfügbar.</div>'}});
$('#preflight-form').addEventListener('submit',async e=>{e.preventDefault();const action=$('#preflight-action').value,target=$('#preflight-target').value.trim();const out=$('#preflight-result');out.innerHTML='<span class="spinner"></span>';try{const q=new URLSearchParams({action});if(target)q.set('target',target);const x=await api(`/maintenance/preflight?${q}`);out.innerHTML=`<div class="safe-banner ${x.safe?'':'blocked'}"><span class="safe-icon">${x.safe?'✓':'×'}</span><div><strong>${x.safe?'Wartung ist freigegeben':'Wartung ist blockiert'}</strong><div class="panel-sub">${x.blockers.length} Blocker · ${x.warnings.length} Warnungen</div></div></div>${x.blockers.concat(x.warnings).length?`<pre class="json" style="margin-top:12px">${esc(JSON.stringify({blockers:x.blockers,warnings:x.warnings},null,2))}</pre>`:''}`}catch(err){out.innerHTML=`<div class="empty">${esc(err.message)}</div>`}});
async function loadDrift(){const out=$('#drift-result');try{const x=await api('/drift');out.innerHTML=`<div class="safe-banner ${x.state==='healthy'?'':'blocked'}"><span class="safe-icon">${x.state==='healthy'?'✓':'!'}</span><div><strong>Drift: ${esc(x.state)}</strong><div class="panel-sub">${x.findings.length} Abdeckungslücken</div></div></div><div class="layer-grid" style="margin-top:10px">${Object.entries(x.coverage).map(([k,v])=>`<div class="layer"><h4>${esc(k)}</h4><div class="metric-value">${v}</div></div>`).join('')}</div>`}catch(e){out.innerHTML=`<div class="empty">${esc(e.message)}</div>`}}
async function loadAudit(){try{const x=await api('/audit?limit=50');$('#audit-body').innerHTML=x.length?x.map(a=>`<tr><td>${esc(new Date(a.ts).toLocaleString('de-DE'))}</td><td><span class="badge ${esc(a.method.toLowerCase())}">${esc(a.method)}</span></td><td class="mono">${esc(a.endpoint)}</td><td class="status-code ${a.status<400?'ok':'err'}">${esc(a.status)}</td><td>${a.dry_run?'ja':'nein'}</td><td>${esc(a.detail)}</td></tr>`).join(''):'<tr><td colspan="6">Noch keine Audit-Einträge.</td></tr>'}catch(e){$('#audit-body').innerHTML=`<tr><td colspan="6">${esc(e.message)}</td></tr>`}}
function renderAudit(){const mode=$('#audit-actor').value;const rows=state.audit.filter(a=>mode==='all'||(mode==='ai'?a.actor!=='Weboberfläche'&&a.actor!=='System/Öffentlich':a.actor===mode));$('#audit-body').innerHTML=rows.length?rows.map(a=>`<tr><td>${esc(new Date(a.ts).toLocaleString('de-DE'))}</td><td><span class="badge">${esc(a.actor||'Legacy/API')}</span></td><td><span class="badge ${esc(a.method.toLowerCase())}">${esc(a.method)}</span></td><td class="mono">${esc(a.endpoint)}</td><td class="status-code ${a.status<400?'ok':'err'}">${esc(a.status)}</td><td>${a.dry_run?'ja':'nein'}</td><td>${esc(a.detail)}</td></tr>`).join(''):'<tr><td colspan="7">Keine Aktivitäten für diesen Filter.</td></tr>'}
async function loadAudit(){try{state.audit=await api('/audit?limit=100');renderAudit()}catch(e){$('#audit-body').innerHTML=`<tr><td colspan="7">${esc(e.message)}</td></tr>`}}
(async()=>{try{await fetch('/ui/session',{credentials:'same-origin'});await refreshAll()}catch{toast('Butler ist momentan nicht erreichbar')}})();
})();
</script>