more admin stuff 2

app/rdp_proxy/ws_tunnel.py

@@ -19,6 +19,7 @@ from app.config import settings
 from app.db import get_db
 from app.rbac import user_has_role_for_host
 from app.recordings.recorder import SessionRecorder
+from app.security import active_sessions
 from app.security.audit import write_audit_event
 from app.security.crypto import decrypt_secret
 from app.rdp_proxy.guacd_client import (
@@ -115,6 +116,11 @@ async def rdp_tunnel(
         details={"host_id": host_id, "hostname": host["hostname"], "session_id": session_id},
     )
     await conn.commit()
+    logger.debug(
+        "RDP-Sitzung %s gestartet: user=%s host=%s (%s:%s) client_ip=%s",
+        session_id, user.username, host["hostname"], host["address"], host["port"], client_ip,
+    )
+    active_sessions.register(session_id, asyncio.current_task())
 
     end_reason = "logout"
     tunnel = None
@@ -125,6 +131,7 @@ async def rdp_tunnel(
             guacd_host=settings.guacd_host, guacd_port=settings.guacd_port,
             protocol="rdp", params=params, screen_width=width, screen_height=height, dpi=dpi,
         )
+        logger.debug("RDP-Sitzung %s: guacd-Tunnel zu %s aufgebaut", session_id, host["hostname"])
         clipboard_enabled = bool(host.get("clipboard_enabled", True))
         tasks = [
             asyncio.create_task(_guacd_to_ws(tunnel, websocket, recorder)),
@@ -144,13 +151,20 @@ async def rdp_tunnel(
     except (GuacamoleProtocolError, ConnectionError, OSError) as exc:
         logger.warning("RDP-Sessionfehler (session_id=%s): %s", session_id, exc)
         end_reason = "error"
+    except asyncio.CancelledError:
+        # Zwangs-Beendigung durch einen Superadmin ueber die Sessionview
+        # (POST /admin/sessions/{id}/terminate, siehe app/security/active_sessions.py).
+        end_reason = "terminated_by_admin"
+        raise
     finally:
+        active_sessions.unregister(session_id)
         del password  # Klartext-Passwort so schnell wie moeglich freigeben
         for task in tasks:
             task.cancel()
         if tunnel:
             await tunnel.close()
         recorder.close()
+        logger.debug("RDP-Sitzung %s beendet: reason=%s", session_id, end_reason)
         await conn.execute(
             "UPDATE sessions SET ended_at = strftime('%Y-%m-%dT%H:%M:%fZ','now'), end_reason = ? "
             "WHERE id = ?",