forked from MirrorHub/synapse
Fix mypy error: auth handler "checkpw" internal function type mismatch (#8569)
This commit is contained in:
parent
8f27b7fde1
commit
21bb50ca3f
3 changed files with 6 additions and 4 deletions
1
changelog.d/8569.misc
Normal file
1
changelog.d/8569.misc
Normal file
|
@ -0,0 +1 @@
|
|||
Fix mypy not properly checking across the codebase, additionally, fix a typing assertion error in `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
|
||||
|
||||
|
|
1
tox.ini
1
tox.ini
|
@ -158,7 +158,6 @@ commands=
|
|||
coverage html
|
||||
|
||||
[testenv:mypy]
|
||||
skip_install = True
|
||||
deps =
|
||||
{[base]deps}
|
||||
mypy==0.782
|
||||
|
|
Loading…
Reference in a new issue