Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1083 from matrix-org/erikj/check_origin 

Check the user_id for presence/typing matches origin
This commit is contained in:
Erik Johnston 2016-09-08 15:17:24 +01:00 committed by GitHub
parent 2117c409a0 8b93af662d
commit d987353840
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
synapse/handlers/presence.py
View File

@ -651,6 +651,13 @@ class PresenceHandler(object):
) )
continue continue
if get_domain_from_id(user_id) != origin:
logger.info(
"Got presence update from %r with bad 'user_id': %r",
origin, user_id,
)
continue
presence_state = push.get("presence", None) presence_state = push.get("presence", None)
if not presence_state: if not presence_state:
logger.info( logger.info(

9
synapse/handlers/typing.py
View File

@ -199,7 +199,14 @@ class TypingHandler(object):
user_id = content["user_id"] user_id = content["user_id"]
# Check that the string is a valid user id # Check that the string is a valid user id
UserID.from_string(user_id) user = UserID.from_string(user_id)
if user.domain != origin:
logger.info(
"Got typing update from %r with bad 'user_id': %r",
origin, user_id,
)
return
users = yield self.state.get_current_user_in_room(room_id) users = yield self.state.get_current_user_in_room(room_id)
domains = set(get_domain_from_id(u) for u in users) domains = set(get_domain_from_id(u) for u in users)