github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-16 02:02:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update hashing_passwords with 2to3

Browse source
This commit is contained in:
JonnyWong16 2019-11-23 18:50:49 -08:00
parent 1771674b53
commit cd6057e1ca
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/hashing_passwords.py
View file

@ -19,7 +19,7 @@
import hashlib import hashlib
from os import urandom from os import urandom
from base64 import b64encode, b64decode from base64 import b64encode, b64decode
from itertools import izip
# From https://github.com/mitsuhiko/python-pbkdf2 # From https://github.com/mitsuhiko/python-pbkdf2
from pbkdf2 import pbkdf2_bin from pbkdf2 import pbkdf2_bin
@ -37,7 +37,7 @@ COST_FACTOR = 10000
def make_hash(password): def make_hash(password):
"""Generate a random salt and return a new hash for the password.""" """Generate a random salt and return a new hash for the password."""
if isinstance(password, unicode): if isinstance(password, str):
password = password.encode('utf-8') password = password.encode('utf-8')
salt = b64encode(urandom(SALT_LENGTH)) salt = b64encode(urandom(SALT_LENGTH))
return 'PBKDF2${}${}${}${}'.format( return 'PBKDF2${}${}${}${}'.format(
@ -50,7 +50,7 @@ def make_hash(password):
def check_hash(password, hash_): def check_hash(password, hash_):
"""Check a password against an existing hash.""" """Check a password against an existing hash."""
if isinstance(password, unicode): if isinstance(password, str):
password = password.encode('utf-8') password = password.encode('utf-8')
algorithm, hash_function, cost_factor, salt, hash_a = hash_.split('$') algorithm, hash_function, cost_factor, salt, hash_a = hash_.split('$')
assert algorithm == 'PBKDF2' assert algorithm == 'PBKDF2'
@ -61,6 +61,6 @@ def check_hash(password, hash_):
# Same as "return hash_a == hash_b" but takes a constant time. # Same as "return hash_a == hash_b" but takes a constant time.
# See http://carlos.bueno.org/2011/10/timing.html # See http://carlos.bueno.org/2011/10/timing.html
diff = 0 diff = 0
for char_a, char_b in izip(hash_a, hash_b): for char_a, char_b in zip(hash_a, hash_b):
diff |= ord(char_a) ^ ord(char_b) diff |= ord(char_a) ^ ord(char_b)
return diff == 0 return diff == 0