MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-12-15 02:33:51 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2949 from krombel/use_bcrypt_checkpw

Browse source 
use bcrypt.checkpw
This commit is contained in:
Richard van der Hoff 2018-03-06 11:56:06 +00:00 committed by GitHub
commit 8ffaacbee3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
synapse/handlers/auth.py
View file

@ -863,8 +863,10 @@ class AuthHandler(BaseHandler):
""" """
def _do_validate_hash(): def _do_validate_hash():
return bcrypt.hashpw(password.encode('utf8') + self.hs.config.password_pepper, return bcrypt.checkpw(
stored_hash.encode('utf8')) == stored_hash password.encode('utf8') + self.hs.config.password_pepper,
stored_hash.encode('utf8')
)
if stored_hash: if stored_hash:
return make_deferred_yieldable(threads.deferToThread(_do_validate_hash)) return make_deferred_yieldable(threads.deferToThread(_do_validate_hash))

2
synapse/python_dependencies.py
View file

@ -31,7 +31,7 @@ REQUIREMENTS = {
"pyyaml": ["yaml"], "pyyaml": ["yaml"],
"pyasn1": ["pyasn1"], "pyasn1": ["pyasn1"],
"daemonize": ["daemonize"], "daemonize": ["daemonize"],
"bcrypt": ["bcrypt"], "bcrypt": ["bcrypt>=3.1.0"],
"pillow": ["PIL"], "pillow": ["PIL"],
"pydenticon": ["pydenticon"], "pydenticon": ["pydenticon"],
"ujson": ["ujson"], "ujson": ["ujson"],