sinfonie/photo26
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix symfony password hasher

Browse source
This commit is contained in:
Alexandre Iooss 2021-10-12 13:32:05 +02:00
parent a33f7217f6
commit bf7e20e282
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
photo21/hashers.py
View file

@ -17,23 +17,26 @@ class SHA512PasswordHasher(BasePasswordHasher):
""" """
algorithm = "sha512" algorithm = "sha512"
def encode(self, password, salt): def encode(self, password, iteration, salt):
assert password is not None assert password is not None
assert salt and '$' not in salt assert salt and '$' not in salt
hash = hashlib.sha512(force_bytes(password + "{" + salt + "}")) salted = force_bytes(password + "{" + salt + "}")
hash = base64.b64encode(hash) digest = hashlib.sha512(salted).digest()
encoded = "%s$%s$%s" % (self.algorithm, salt, hash) # "stretch" hash
encoded = encoded[:128] for _i in range(1, int(iteration)):
return encoded digest = hashlib.sha512(digest + salted).digest()
digest = base64.b64encode(digest).decode()
encoded = "%s$%s$%s$%s" % (self.algorithm, iteration, salt, digest)
return encoded[:128]
def verify(self, password, encoded): def verify(self, password, encoded):
algorithm, salt, hash = encoded.split('$', 2) algorithm, iteration, salt, hash = encoded.split('$', 3)
assert algorithm == self.algorithm assert algorithm == self.algorithm
encoded_2 = self.encode(password, salt) encoded_2 = self.encode(password, iteration, salt)
return constant_time_compare(encoded, encoded_2) return constant_time_compare(encoded, encoded_2)
def safe_summary(self, encoded): def safe_summary(self, encoded):
algorithm, salt, hash = encoded.split('$', 2) algorithm, iteration, salt, hash = encoded.split('$', 3)
assert algorithm == self.algorithm assert algorithm == self.algorithm
return OrderedDict([ return OrderedDict([
(_('algorithm'), algorithm), (_('algorithm'), algorithm),