From 9b13038d05b0a3ebba86e6884999bcc534c3f0e2 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Wed, 27 Feb 2019 15:22:41 +0000 Subject: [PATCH] Check shadow_hs as well as hs during 3pid reg --- synapse/util/threepids.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/synapse/util/threepids.py b/synapse/util/threepids.py index 4f3cb9c804..1db0a01e27 100644 --- a/synapse/util/threepids.py +++ b/synapse/util/threepids.py @@ -43,17 +43,19 @@ def check_3pid_allowed(hs, medium, address): {'medium': medium, 'address': address} ) - # Assume false if invalid response - if 'hs' not in data: + # Check for invalid response + if 'hs' not in data and 'shadow_hs' not in data: + defer.returnValue(False) + + # Check if this user is intended to register for this homeserver + if data['hs'] != hs.config.server_name and data['shadow_hs'] != hs.config.server_name: defer.returnValue(False) if data.get('requires_invite', False) and data.get('invited', False) == False: # Requires an invite but hasn't been invited defer.returnValue(False) - if hs.config.allow_invited_3pids and data.get('invited'): - defer.returnValue(True) - else: - defer.returnValue(data['hs'] == hs.config.server_name) + + defer.returnValue(True) if hs.config.allowed_local_3pids: for constraint in hs.config.allowed_local_3pids: