Merge pull request #775 from matrix-org/erikj/password_hash

Correctly handle NULL password hashes from the database
pull/776/head
Erik Johnston 2016-05-11 12:18:13 +01:00
commit 108434e53d
1 changed files with 4 additions and 1 deletions

View File

@ -615,4 +615,7 @@ class AuthHandler(BaseHandler):
Returns:
Whether self.hash(password) == stored_hash (bool).
"""
return bcrypt.hashpw(password, stored_hash) == stored_hash
if stored_hash:
return bcrypt.hashpw(password, stored_hash) == stored_hash
else:
return False