diff options
| author | Jonathan de Jong <jonathan@automatia.nl> | 2020-10-19 19:32:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-19 18:32:24 +0100 |
| commit | 21bb50ca3fd4c414405b03dbbe9124128d0f2613 (patch) | |
| tree | c241bc24feee6602abb12051a4fa8104d7282b30 /synapse/handlers/auth.py | |
| parent | Expose the experimental appservice login flow to clients. (#8504) (diff) | |
| download | synapse-21bb50ca3fd4c414405b03dbbe9124128d0f2613.tar.xz | |
Fix mypy error: auth handler "checkpw" internal function type mismatch (#8569)
Diffstat (limited to 'synapse/handlers/auth.py')
| -rw-r--r-- | synapse/handlers/auth.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py index 1d1ddc2245..8619fbb982 100644 --- a/synapse/handlers/auth.py +++ b/synapse/handlers/auth.py @@ -1122,20 +1122,22 @@ class AuthHandler(BaseHandler): Whether self.hash(password) == stored_hash. """ - def _do_validate_hash(): + def _do_validate_hash(checked_hash: bytes): # Normalise the Unicode in the password pw = unicodedata.normalize("NFKC", password) return bcrypt.checkpw( pw.encode("utf8") + self.hs.config.password_pepper.encode("utf8"), - stored_hash, + checked_hash, ) if stored_hash: if not isinstance(stored_hash, bytes): stored_hash = stored_hash.encode("ascii") - return await defer_to_thread(self.hs.get_reactor(), _do_validate_hash) + return await defer_to_thread( + self.hs.get_reactor(), _do_validate_hash, stored_hash + ) else: return False |