Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-05 13:44:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "support admin_email config and pass through into blocking errors, return AuthError in all cases"

Browse source 
This reverts commit 0d43f991a1.
This commit is contained in:
Neil Johnson 2018-08-13 18:06:18 +01:00
parent 0d43f991a1
commit ce7de9ae6b
7 changed files with 22 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

27
synapse/handlers/register.py
View file

@ -144,8 +144,7 @@ class RegistrationHandler(BaseHandler):
Raises:
RegistrationError if there was a problem registering.
"""
yield self.auth.check_auth_blocking()
yield self._check_mau_limits()
password_hash = None
if password:
password_hash = yield self.auth_handler().hash(password)
@ -290,7 +289,7 @@ class RegistrationHandler(BaseHandler):
400,
"User ID can only contain characters a-z, 0-9, or '=_-./'",
)
yield self.auth.check_auth_blocking()
yield self._check_mau_limits()
user = UserID(localpart, self.hs.hostname)
user_id = user.to_string()
@ -440,7 +439,7 @@ class RegistrationHandler(BaseHandler):
"""
if localpart is None:
raise SynapseError(400, "Request must include user id")
yield self.auth.check_auth_blocking()
yield self._check_mau_limits()
need_register = True
try:
@ -535,13 +534,13 @@ class RegistrationHandler(BaseHandler):
action="join",
)
# @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)
@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)