OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix attestations to check correct server name

pull/2533/head
Erik Johnston 2017-10-11 14:11:43 +01:00
parent c2c47550f9
commit 4ce4379235
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
synapse/handlers/groups_local.py
View File

@ -102,6 +102,8 @@ class GroupsLocalHandler(object):
get_domain_from_id(group_id), group_id, requester_user_id, get_domain_from_id(group_id), group_id, requester_user_id,
) )
group_server_name = get_domain_from_id(group_id)
# Loop through the users and validate the attestations. # Loop through the users and validate the attestations.
chunk = res["users_section"]["users"] chunk = res["users_section"]["users"]
valid_users = [] valid_users = []
@ -109,10 +111,12 @@ class GroupsLocalHandler(object):
g_user_id = entry["user_id"] g_user_id = entry["user_id"]
attestation = entry.pop("attestation") attestation = entry.pop("attestation")
try: try:
if get_domain_from_id(g_user_id) != group_server_name:
yield self.attestations.verify_attestation( yield self.attestations.verify_attestation(
attestation, attestation,
group_id=group_id, group_id=group_id,
user_id=g_user_id, user_id=g_user_id,
server_name=get_domain_from_id(g_user_id),
) )
valid_users.append(entry) valid_users.append(entry)
except Exception as e: except Exception as e:
@ -160,6 +164,7 @@ class GroupsLocalHandler(object):
remote_attestation, remote_attestation,
group_id=group_id, group_id=group_id,
user_id=user_id, user_id=user_id,
server_name=get_domain_from_id(group_id),
) )
is_publicised = content.get("publicise", False) is_publicised = content.get("publicise", False)
@ -187,6 +192,8 @@ class GroupsLocalHandler(object):
) )
defer.returnValue(res) defer.returnValue(res)
group_server_name = get_domain_from_id(group_id)
res = yield self.transport_client.get_users_in_group( res = yield self.transport_client.get_users_in_group(
get_domain_from_id(group_id), group_id, requester_user_id, get_domain_from_id(group_id), group_id, requester_user_id,
) )
@ -197,10 +204,12 @@ class GroupsLocalHandler(object):
g_user_id = entry["user_id"] g_user_id = entry["user_id"]
attestation = entry.pop("attestation") attestation = entry.pop("attestation")
try: try:
if get_domain_from_id(g_user_id) != group_server_name:
yield self.attestations.verify_attestation( yield self.attestations.verify_attestation(
attestation, attestation,
group_id=group_id, group_id=group_id,
user_id=g_user_id, user_id=g_user_id,
server_name=get_domain_from_id(g_user_id),
) )
valid_entries.append(entry) valid_entries.append(entry)
except Exception as e: except Exception as e:
@ -240,6 +249,7 @@ class GroupsLocalHandler(object):
remote_attestation, remote_attestation,
group_id=group_id, group_id=group_id,
user_id=user_id, user_id=user_id,
server_name=get_domain_from_id(group_id),
) )
# TODO: Check that the group is public and we're being added publically # TODO: Check that the group is public and we're being added publically