diff options
author | Neil Johnson <neil@matrix.org> | 2019-01-24 13:02:50 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-24 13:02:50 +0000 |
commit | 10b89d5c2e994e280da6957af7560b2d84ce6048 (patch) | |
tree | e7756ca331a3b1ba775a87e8db4f715e8b10a68c /synapse/api/auth.py | |
parent | Merge pull request #4458 from matrix-org/dbkr/public_baseurl_doc (diff) | |
parent | move guard out of is_threepid_reserved and into register.py (diff) | |
download | synapse-10b89d5c2e994e280da6957af7560b2d84ce6048.tar.xz |
Merge pull request #4435 from matrix-org/neilj/fix_threepid_auth_check
Neilj/fix threepid auth check
Diffstat (limited to 'synapse/api/auth.py')
-rw-r--r-- | synapse/api/auth.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py index ba1019b9b2..e37b807c94 100644 --- a/synapse/api/auth.py +++ b/synapse/api/auth.py @@ -819,7 +819,9 @@ class Auth(object): elif threepid: # If the user does not exist yet, but is signing up with a # reserved threepid then pass auth check - if is_threepid_reserved(self.hs.config, threepid): + if is_threepid_reserved( + self.hs.config.mau_limits_reserved_threepids, threepid + ): return # Else if there is no room in the MAU bucket, bail current_mau = yield self.store.get_monthly_active_count() |