summary refs log tree commit diff
path: root/synapse/handlers/register.py
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-14 14:51:38 +0100
committerNeil Johnson <neil@matrix.org>2018-08-14 14:51:38 +0100
commit9b5bf3d8581408a417e680c3d5c118a368e51c20 (patch)
tree8e024ada77d93f547913d23e9ad20885d3632c0d /synapse/handlers/register.py
parentMerge branch 'neilj/mau_sync_block' of github.com:matrix-org/synapse into nei... (diff)
parentset admin email via config (diff)
downloadsynapse-9b5bf3d8581408a417e680c3d5c118a368e51c20.tar.xz
Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into neilj/fix_off_by_1+maus
Diffstat (limited to 'synapse/handlers/register.py')
-rw-r--r--synapse/handlers/register.py27
1 files changed, 14 insertions, 13 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py
index 3526b20d5a..ef7222d7b8 100644
--- a/synapse/handlers/register.py
+++ b/synapse/handlers/register.py
@@ -144,7 +144,8 @@ class RegistrationHandler(BaseHandler):
         Raises:
             RegistrationError if there was a problem registering.
         """
-        yield self._check_mau_limits()
+
+        yield self.auth.check_auth_blocking()
         password_hash = None
         if password:
             password_hash = yield self.auth_handler().hash(password)
@@ -289,7 +290,7 @@ class RegistrationHandler(BaseHandler):
                 400,
                 "User ID can only contain characters a-z, 0-9, or '=_-./'",
             )
-        yield self._check_mau_limits()
+        yield self.auth.check_auth_blocking()
         user = UserID(localpart, self.hs.hostname)
         user_id = user.to_string()
 
@@ -439,7 +440,7 @@ class RegistrationHandler(BaseHandler):
         """
         if localpart is None:
             raise SynapseError(400, "Request must include user id")
-        yield self._check_mau_limits()
+        yield self.auth.check_auth_blocking()
         need_register = True
 
         try:
@@ -534,13 +535,13 @@ class RegistrationHandler(BaseHandler):
             action="join",
         )
 
-    @defer.inlineCallbacks
-    def _check_mau_limits(self):
-        """
-        Do not accept registrations if monthly active user limits exceeded
-         and limiting is enabled
-        """
-        try:
-            yield self.auth.check_auth_blocking()
-        except AuthError as e:
-            raise RegistrationError(e.code, str(e), e.errcode)
+    # @defer.inlineCallbacks
+    # def _s(self):
+    #     """
+    #     Do not accept registrations if monthly active user limits exceeded
+    #      and limiting is enabled
+    #     """
+    #     try:
+    #         yield self.auth.check_auth_blocking()
+    #     except AuthError as e:
+    #         raise RegistrationError(e.code, str(e), e.errcode)