mirrors/Radicale
1
0
Fork 0
mirror of https://github.com/Kozea/Radicale.git synced 2025-04-04 21:57:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix Python3 compatibility of ssha part of htpasswd

Browse source
This commit is contained in:
Guillaume Ayoub 2016-07-07 14:47:28 +02:00
parent 3a4184d1ab
commit 22821cda75
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
radicale/auth/htpasswd.py
View file

@ -88,8 +88,7 @@ def _ssha(hash_salt_value, password):
"""Check if ``hash_salt_value`` and ``password`` match, using salted sha1 """Check if ``hash_salt_value`` and ``password`` match, using salted sha1
method. This method is not directly supported by htpasswd, but it can be method. This method is not directly supported by htpasswd, but it can be
written with e.g. openssl, and nginx can parse it.""" written with e.g. openssl, and nginx can parse it."""
hash_salt_value = hash_salt_value.replace( hash_salt_value = base64.b64decode(hash_salt_value.replace("{SSHA}", ""))
"{SSHA}", "").encode("ascii").decode('base64')
password = password.encode(config.get("encoding", "stock")) password = password.encode(config.get("encoding", "stock"))
hash_value = hash_salt_value[:20] hash_value = hash_salt_value[:20]
salt_value = hash_salt_value[20:] salt_value = hash_salt_value[20:]