more admin stuff 2

app/ssh_proxy/terminal_ws.py

@@ -21,6 +21,7 @@ from app.auth.deps import get_current_user_ws
 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.ssh_proxy.proxy import HostNotConfiguredError, connect_to_host, load_host
 
@@ -83,6 +84,11 @@ async def ssh_terminal(websocket: WebSocket, host_id: int):
         details={"host_id": host_id, "hostname": host["hostname"], "session_id": session_id},
     )
     await conn.commit()
+    logger.debug(
+        "SSH-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"
     ssh_conn = None
@@ -90,6 +96,7 @@ async def ssh_terminal(websocket: WebSocket, host_id: int):
     pump_task = None
     try:
         ssh_conn = await connect_to_host(conn, host_id)
+        logger.debug("SSH-Sitzung %s: Verbindung zu %s hergestellt", session_id, host["hostname"])
         process = await ssh_conn.create_process(term_type="xterm-256color")
         pump_task = asyncio.create_task(_pump_ssh_to_ws(process, websocket, recorder))
 
@@ -120,7 +127,13 @@ async def ssh_terminal(websocket: WebSocket, host_id: int):
             logger.debug("Fehlermeldung konnte nicht mehr an Client gesendet werden", exc_info=True)
     except HostNotConfiguredError:
         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)
         if pump_task:
             pump_task.cancel()
         if process:
@@ -128,6 +141,7 @@ async def ssh_terminal(websocket: WebSocket, host_id: int):
         if ssh_conn:
             ssh_conn.close()
         recorder.close()
+        logger.debug("SSH-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 = ?",