Merge pull request #1711 from matrix-org/matthew/utf8-password-change

fix ability to change password to a non-ascii one
This commit is contained in:
Matthew Hodgson 2016-12-20 00:02:13 +00:00 committed by GitHub
commit 09f15918be

View File

@ -656,8 +656,8 @@ class AuthHandler(BaseHandler):
Whether self.hash(password) == stored_hash (bool). Whether self.hash(password) == stored_hash (bool).
""" """
if stored_hash: if stored_hash:
return bcrypt.hashpw(password + self.hs.config.password_pepper, return bcrypt.hashpw(password.encode('utf8') + self.hs.config.password_pepper,
stored_hash.encode('utf-8')) == stored_hash stored_hash.encode('utf8')) == stored_hash
else: else:
return False return False