Broker/Protocol Analyse
This commit is contained in:
1 parent
c477a05f03
commit
268e150f2b
7 files changed
+868
-2
No files matched your search
+102
-1
@@ -238,6 +238,81 @@ class WebSocketBroker:
|
||||
def _get_connection(self, tenant_id, account_id):
|
||||
return self.connections.get(tenant_id, {}).get(account_id)
|
||||
|
||||
def log_incoming(self, tenant_id, message, sender=None, recipients=None, note=None):
|
||||
"""Schreibt eine Debugzeile für eine beim Broker eingehende Nachricht.
|
||||
|
||||
Erfasst werden Absender, Code, Empfänger-ID, Payload (bei Code 0 ohne
|
||||
Token) und der ermittelte Empfängerkreis inklusive Verbindungsstatus.
|
||||
Die Ausgabe ist unabhängig von der Flask-Logger-Konfiguration und kann
|
||||
über ``WS_DEBUG_MESSAGES`` abgeschaltet werden.
|
||||
"""
|
||||
try:
|
||||
if not current_app.config.get('WS_DEBUG_MESSAGES', True):
|
||||
return
|
||||
except RuntimeError:
|
||||
return
|
||||
|
||||
try:
|
||||
db = get_db()
|
||||
if sender is None and message.sender_id:
|
||||
sender = db.execute(
|
||||
'SELECT * FROM accounts WHERE id = ? AND tenant_id = ?',
|
||||
(message.sender_id, tenant_id)
|
||||
).fetchone()
|
||||
|
||||
sender_info = None
|
||||
if sender is not None:
|
||||
sender_info = self._get_sender_info(tenant_id, sender)
|
||||
|
||||
recipient_rows = []
|
||||
for recipient_id in sorted(set(recipients or [])):
|
||||
account = db.execute(
|
||||
'SELECT * FROM accounts WHERE id = ? AND tenant_id = ?',
|
||||
(recipient_id, tenant_id)
|
||||
).fetchone()
|
||||
if account is None:
|
||||
recipient_rows.append({
|
||||
'account_id': recipient_id,
|
||||
'known': False,
|
||||
'connected': False,
|
||||
'authenticated': False
|
||||
})
|
||||
continue
|
||||
|
||||
info = self._get_sender_info(tenant_id, account)
|
||||
info['connected'] = bool(self._get_connection(tenant_id, recipient_id))
|
||||
info['authenticated'] = self.is_authenticated(tenant_id, recipient_id)
|
||||
recipient_rows.append(info)
|
||||
|
||||
payload = message.msg
|
||||
if message.code == 0:
|
||||
payload = '<redacted>'
|
||||
elif not isinstance(payload, str):
|
||||
payload = json.dumps(payload, ensure_ascii=False, default=str)
|
||||
payload = str(payload)
|
||||
if len(payload) > 1000:
|
||||
payload = payload[:1000] + '…'
|
||||
|
||||
entry = {
|
||||
'code': message.code,
|
||||
'sender': sender_info,
|
||||
'receiver_id': message.receiver_id,
|
||||
'session_id': getattr(message, 'session_id', None),
|
||||
'ts': message.ts,
|
||||
'msg': payload,
|
||||
'recipients': recipient_rows,
|
||||
'note': note
|
||||
}
|
||||
|
||||
from cmbnet.core.logging import write_ws_debug_log
|
||||
write_ws_debug_log(tenant_id, entry)
|
||||
except Exception as exc:
|
||||
# Eine Debugausgabe darf den Nachrichtenfluss niemals stören.
|
||||
try:
|
||||
current_app.logger.warning('WS-Debugausgabe fehlgeschlagen: %s', exc)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# ------------------------------------------------------------------
|
||||
# Sitzungs-Queues
|
||||
# ------------------------------------------------------------------
|
||||
@@ -533,6 +608,10 @@ class WebSocketBroker:
|
||||
(message.sender_id, tenant_id)
|
||||
).fetchone()
|
||||
if not sender:
|
||||
self.log_incoming(
|
||||
tenant_id, message, sender=None, recipients=[],
|
||||
note='Absender nicht im Mandanten gefunden'
|
||||
)
|
||||
return
|
||||
|
||||
code = message.code
|
||||
@@ -540,11 +619,19 @@ class WebSocketBroker:
|
||||
# Code 0 wird ausschließlich in der WebSocket-Route (Handshake)
|
||||
# verarbeitet und niemals weitergeleitet.
|
||||
if code <= 0:
|
||||
self.log_incoming(
|
||||
tenant_id, message, sender, recipients=[],
|
||||
note='interner Code, wird nicht über route_message verteilt'
|
||||
)
|
||||
return
|
||||
|
||||
# Code 1 sendet ausschließlich der Server (Heartbeat-Routine).
|
||||
# Nachrichten dieses Typs von Clients werden ignoriert.
|
||||
if code == 1:
|
||||
self.log_incoming(
|
||||
tenant_id, message, sender, recipients=[],
|
||||
note='Code 1 von Client ignoriert'
|
||||
)
|
||||
return
|
||||
|
||||
# Code 2 ist die Antwort eines Clients auf den Heartbeat. Sie wird nur
|
||||
@@ -559,12 +646,20 @@ class WebSocketBroker:
|
||||
# dürfen diesen Code nicht selbst auslösen.
|
||||
if code == 99:
|
||||
if apply_business:
|
||||
self.log_incoming(
|
||||
tenant_id, message, sender, recipients=[],
|
||||
note='Code 99 von Client ignoriert'
|
||||
)
|
||||
return
|
||||
self._deliver(tenant_id, message, sender)
|
||||
return
|
||||
|
||||
# Sonstige interne Codes (< 100) werden nicht an die Oberfläche gegeben.
|
||||
if code < 100:
|
||||
self.log_incoming(
|
||||
tenant_id, message, sender, recipients=[],
|
||||
note='interner Code < 100 ignoriert'
|
||||
)
|
||||
return
|
||||
|
||||
# Ab hier: fachliche Nachrichten (>= 100).
|
||||
@@ -577,6 +672,10 @@ class WebSocketBroker:
|
||||
'WebSocket-Nachricht abgelehnt: code=%s sender=%s tenant=%s msg=%s',
|
||||
code, sender['id'], tenant_id, str(message.msg)[:300]
|
||||
)
|
||||
self.log_incoming(
|
||||
tenant_id, message, sender, recipients=[],
|
||||
note='fachliche Änderung abgelehnt'
|
||||
)
|
||||
return
|
||||
|
||||
message = self._prepare_message(tenant_id, message, sender)
|
||||
@@ -1126,7 +1225,9 @@ class WebSocketBroker:
|
||||
|
||||
def _deliver(self, tenant_id, message, sender):
|
||||
"""Stellt eine Nachricht an alle berechtigten, verbundenen Clients zu."""
|
||||
for recipient_id in self._get_recipients(tenant_id, message, sender):
|
||||
recipients = sorted(self._get_recipients(tenant_id, message, sender))
|
||||
self.log_incoming(tenant_id, message, sender, recipients=recipients)
|
||||
for recipient_id in recipients:
|
||||
self._send(tenant_id, recipient_id, message)
|
||||
|
||||
def _send(self, tenant_id, account_id, message):
|
||||
|
||||
Reference in new issue
Block a user