summary refs log tree commit diff
path: root/synapse/api/auth.py
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-31 15:42:51 +0100
committerNeil Johnson <neil@matrix.org>2018-08-31 15:42:51 +0100
commit09f3cf1a7ef0c533d052a5c87257503b710093c6 (patch)
tree527504fc38a6763a2ea9b1453f3332fbfd9f820b /synapse/api/auth.py
parentnews fragemnt (diff)
downloadsynapse-09f3cf1a7ef0c533d052a5c87257503b710093c6.tar.xz
ensure post registration auth checks do not fail erroneously
Diffstat (limited to 'synapse/api/auth.py')
-rw-r--r--synapse/api/auth.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py
index 9c207b9537..6a97c06110 100644
--- a/synapse/api/auth.py
+++ b/synapse/api/auth.py
@@ -809,11 +809,8 @@ class Auth(object):
             elif threepid:
                 # If the user does not exist yet, but is signing up with a
                 # reserved threepid then pass auth check
-                for tp in self.hs.config.mau_limits_reserved_threepids:
-                    if (threepid['medium'] == tp['medium']
-                            and threepid['address'] == tp['address']):
-                        return
-
+                if is_threepid_reserved(threepid):
+                    return
             # Else if there is no room in the MAU bucket, bail
             current_mau = yield self.store.get_monthly_active_count()
             if current_mau >= self.hs.config.max_mau_value: