From dd747ba0458db644c0d2cd36f2f8635560d994fb Mon Sep 17 00:00:00 2001 From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com> Date: Thu, 4 Apr 2019 17:45:12 +0100 Subject: Prevent exception when hs or shadow_hs missing (#5012) * Prevent exception when hs or shadow_hs missing --- synapse/util/threepids.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'synapse') diff --git a/synapse/util/threepids.py b/synapse/util/threepids.py index e48c6201d0..4cc7d27ce5 100644 --- a/synapse/util/threepids.py +++ b/synapse/util/threepids.py @@ -49,8 +49,8 @@ def check_3pid_allowed(hs, medium, address): # 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 + data.get('hs') != hs.config.server_name + and data.get('shadow_hs') != hs.config.server_name ): defer.returnValue(False) -- cgit 1.5.1