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

synapse/handlers/presence.py

@@ -655,9 +655,19 @@ class PresenceHandler(BaseHandler):
             state = dict(push)
             del state["user_id"]
 
+            if "presence" in state:
+                # all is OK
+                pass
+            elif "state" in state:
                 # Legacy handling
-            if "presence" not in state:
                 state["presence"] = 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: