diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2020-05-18 09:46:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-18 09:46:18 -0400 |
| commit | 56db0b1365965c02ff539193e26c333b7f70d101 (patch) | |
| tree | eee3ca1f7b66287334cf02ca5aed246e6bc7bba7 /synapse/handlers | |
| parent | 1.13.0rc2 (diff) | |
| download | synapse-56db0b1365965c02ff539193e26c333b7f70d101.tar.xz | |
Hash passwords earlier in the registration process (#7523)
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/register.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index 1e6bdac0ad..a6178e74a1 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -132,7 +132,7 @@ class RegistrationHandler(BaseHandler): def register_user( self, localpart=None, - password=None, + password_hash=None, guest_access_token=None, make_guest=False, admin=False, @@ -147,7 +147,7 @@ class RegistrationHandler(BaseHandler): Args: localpart: The local part of the user ID to register. If None, one will be generated. - password (unicode): The password to assign to this user so they can + password_hash (str|None): The hashed password to assign to this user so they can login again. This can be None which means they cannot login again via a password (e.g. the user is an application service user). user_type (str|None): type of user. One of the values from @@ -164,11 +164,6 @@ class RegistrationHandler(BaseHandler): yield self.check_registration_ratelimit(address) yield self.auth.check_auth_blocking(threepid=threepid) - password_hash = None - if password: - password_hash = yield defer.ensureDeferred( - self._auth_handler.hash(password) - ) if localpart is not None: yield self.check_username(localpart, guest_access_token=guest_access_token) |