Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-10-01 01:36:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Safer handling of incoming presence EDUs that may or maynot contain 'presence' or 'state'

Browse Source
This commit is contained in:
Paul "LeoNerd" Evans 2014-09-02 11:17:43 +01:00
parent 7b56a7a3cb
commit d9d6fbb085
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
synapse/handlers/presence.py
View File

@ -655,10 +655,20 @@ class PresenceHandler(BaseHandler):
state = dict(push) state = dict(push)
del state["user_id"] del state["user_id"]
# Legacy handling if "presence" in state:
if "presence" not in state: # all is OK
pass
elif "state" in state:
# Legacy handling
state["presence"] = state["state"] state["presence"] = state["state"]
del state["state"] else:
logger.warning("Received a presence 'push' EDU from %s without"
+ " either a 'presence' or 'state' key", origin
)
continue
if "state" in state:
del state["state"]
if "last_active_ago" in state: if "last_active_ago" in state:
state["last_active"] = int( state["last_active"] = int(