tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Fix mypy error: auth handler "checkpw" internal function type mismatch (#8569)

Browse source
This commit is contained in:
Jonathan de Jong 2020-10-19 19:32:24 +02:00 committed by GitHub
parent 8f27b7fde1
commit 21bb50ca3f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/8569.misc Normal file
View file

@ -0,0 +1 @@
Fix mypy not properly checking across the codebase, additionally, fix a typing assertion error in `handlers/auth.py`.

8
synapse/handlers/auth.py
View file

@ -1122,20 +1122,22 @@ class AuthHandler(BaseHandler):
Whether self.hash(password) == stored_hash. Whether self.hash(password) == stored_hash.
""" """
def _do_validate_hash(): def _do_validate_hash(checked_hash: bytes):
# Normalise the Unicode in the password # Normalise the Unicode in the password
pw = unicodedata.normalize("NFKC", password) pw = unicodedata.normalize("NFKC", password)
return bcrypt.checkpw( return bcrypt.checkpw(
pw.encode("utf8") + self.hs.config.password_pepper.encode("utf8"), pw.encode("utf8") + self.hs.config.password_pepper.encode("utf8"),
stored_hash, checked_hash,
) )
if stored_hash: if stored_hash:
if not isinstance(stored_hash, bytes): if not isinstance(stored_hash, bytes):
stored_hash = stored_hash.encode("ascii") 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: else:
return False return False

1
tox.ini
View file

@ -158,7 +158,6 @@ commands=
coverage html coverage html
[testenv:mypy] [testenv:mypy]
skip_install = True
deps = deps =
{[base]deps} {[base]deps}
mypy==0.782 mypy==0.782