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

Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into neilj/fix_off_by_1+maus

Browse source
This commit is contained in:
Neil Johnson 2018-08-14 14:51:38 +01:00
commit 9b5bf3d858
8 changed files with 46 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

27
synapse/handlers/register.py
View file

@ -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)