bug fix für Nachrichtenversand vom mobilen Client
This commit is contained in:
1 parent
c793e8b16d
commit
c477a05f03
8 files changed
+133
-32
No files matched your search
@@ -573,6 +573,10 @@ class WebSocketBroker:
|
||||
# einem Neuladen der Seite wieder sichtbar.
|
||||
if apply_business and code in (100, 200, 300):
|
||||
if not self._apply_business_change(tenant_id, message, sender):
|
||||
current_app.logger.warning(
|
||||
'WebSocket-Nachricht abgelehnt: code=%s sender=%s tenant=%s msg=%s',
|
||||
code, sender['id'], tenant_id, str(message.msg)[:300]
|
||||
)
|
||||
return
|
||||
|
||||
message = self._prepare_message(tenant_id, message, sender)
|
||||
@@ -721,7 +725,7 @@ class WebSocketBroker:
|
||||
|
||||
def _apply_street_change(self, tenant_id, message, sender, payload):
|
||||
"""Wendet einen Straßen-State-Wechsel aus einer Code-100-Nachricht an."""
|
||||
if sender['role'] not in ('Dispatcher', 'Administrator'):
|
||||
if sender['role'] not in ('Dispatcher', 'Administrator', 'Gruppe'):
|
||||
return False
|
||||
|
||||
db = get_db()
|
||||
@@ -746,6 +750,24 @@ class WebSocketBroker:
|
||||
if not street:
|
||||
return False
|
||||
|
||||
# Gruppen-Accounts dürfen nur Straßen bearbeiten, die ihrer eigenen
|
||||
# Gruppe zugewiesen sind. Die Zuordnung darf dabei nicht auf eine
|
||||
# andere Gruppe verschoben werden.
|
||||
own_group_id = None
|
||||
if sender['role'] == 'Gruppe':
|
||||
group = db.execute(
|
||||
'''SELECT g.id FROM groups g
|
||||
JOIN group_accounts ga
|
||||
ON ga.group_id = g.id AND ga.tenant_id = g.tenant_id
|
||||
WHERE ga.account_id = ? AND g.tenant_id = ?''',
|
||||
(sender['id'], tenant_id)
|
||||
).fetchone()
|
||||
if not group:
|
||||
return False
|
||||
own_group_id = group['id']
|
||||
if street['group_id'] != own_group_id:
|
||||
return False
|
||||
|
||||
new_state = payload.get('state')
|
||||
if new_state not in ('unbearbeitet', 'zugewiesen', 'erledigt'):
|
||||
return False
|
||||
@@ -769,6 +791,15 @@ class WebSocketBroker:
|
||||
elif new_state == 'zugewiesen' and group_id is None:
|
||||
return False
|
||||
|
||||
if sender['role'] == 'Gruppe':
|
||||
# Eine Gruppe darf ihre eigene Straße freigeben (unbearbeitet),
|
||||
# aber nicht einer anderen Gruppe zuweisen.
|
||||
if new_state != 'unbearbeitet':
|
||||
if new_state == 'erledigt' and group_id is None:
|
||||
group_id = own_group_id
|
||||
if group_id != own_group_id:
|
||||
return False
|
||||
|
||||
if group_id is not None:
|
||||
group = db.execute(
|
||||
'SELECT id FROM groups WHERE id = ? AND tenant_id = ?',
|
||||
|
||||
@@ -6,12 +6,15 @@ from datetime import datetime
|
||||
|
||||
|
||||
class WSMessage:
|
||||
def __init__(self, sender_id=None, receiver_id=None, code=0, msg="", ts=None):
|
||||
def __init__(self, sender_id=None, receiver_id=None, code=0, msg="", ts=None, session_id=None):
|
||||
self.sender_id = sender_id
|
||||
self.receiver_id = receiver_id
|
||||
self.code = code
|
||||
self.msg = msg
|
||||
self.ts = ts or int(datetime.now().timestamp() * 1000)
|
||||
# Nur für den Code-0-Handshake. Wird nicht an andere Clients
|
||||
# weitergegeben und deshalb auch nicht in to_dict() serialisiert.
|
||||
self.session_id = session_id
|
||||
|
||||
def to_dict(self):
|
||||
return {
|
||||
@@ -32,7 +35,8 @@ class WSMessage:
|
||||
receiver_id=data.get('receiver_id'),
|
||||
code=data.get('code', 0),
|
||||
msg=data.get('msg', ''),
|
||||
ts=data.get('ts')
|
||||
ts=data.get('ts'),
|
||||
session_id=data.get('session_id')
|
||||
)
|
||||
|
||||
@classmethod
|
||||
|
||||
@@ -10,7 +10,7 @@ Ablauf einer Verbindung:
|
||||
"""
|
||||
import json
|
||||
|
||||
from flask import session
|
||||
from flask import session, current_app
|
||||
from cmbnet.extensions import sock
|
||||
from cmbnet.ws import broker
|
||||
from cmbnet.ws.protocol import WSMessage
|
||||
@@ -74,11 +74,24 @@ def ws(ws, tenant):
|
||||
# Code 0: Authentifizierung über den Einmal-Token.
|
||||
if msg.code == 0:
|
||||
token, session_id = _parse_auth_payload(msg.msg)
|
||||
if not session_id:
|
||||
session_id = getattr(msg, 'session_id', None)
|
||||
if not token or not broker.authenticate(
|
||||
tenant_id, account_id, token, session_id
|
||||
):
|
||||
current_app.logger.warning(
|
||||
'WebSocket-Authentifizierung fehlgeschlagen: tenant=%s account=%s',
|
||||
tenant_id, account_id
|
||||
)
|
||||
ws.close()
|
||||
break
|
||||
# Bestätigt dem Client den erfolgreichen Handshake. Erst jetzt
|
||||
# darf er gepufferte fachliche Nachrichten senden.
|
||||
broker.send_to_connection(
|
||||
tenant_id,
|
||||
account_id,
|
||||
WSMessage(sender_id=0, code=0, msg='authenticated').to_json()
|
||||
)
|
||||
continue
|
||||
|
||||
# Fachliche Nachrichten sind erst nach erfolgreicher
|
||||
|
||||
Reference in new issue
Block a user