YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Simplify the 'listed' check

Browse source
This commit is contained in:
Alexandre Aubin 2018-10-25 17:10:54 +00:00
parent aac9b78c03
commit 08e1d929c1
1 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/yunohost/utils/password.py
View file

@ -38,10 +38,10 @@ class PasswordValidator(object):
# Unlisted, length, digits, lowers, uppers, others # Unlisted, length, digits, lowers, uppers, others
strength_lvl = [ strength_lvl = [
[100000, 6, 0, 0, 0, 0], [6, 0, 0, 0, 0],
[100000, 8, 1, 1, 1, 0], [8, 1, 1, 1, 0],
[320000000, 8, 1, 1, 1, 1], [8, 1, 1, 1, 1],
[320000000, 12, 1, 1, 1, 1], [12, 1, 1, 1, 1],
] ]
def __init__(self, validation_strength): def __init__(self, validation_strength):
@ -54,6 +54,7 @@ class PasswordValidator(object):
if self.validation_strength <= 0: if self.validation_strength <= 0:
return ("success", "") return ("success", "")
self.listed = password in SMALL_PWD_LIST or self.is_in_cractklib_list(password, PWD_LIST_FILE)
self.strength = self.compute(password) self.strength = self.compute(password)
if self.strength < self.validation_strength: if self.strength < self.validation_strength:
if self.listed: if self.listed:
@ -83,26 +84,15 @@ class PasswordValidator(object):
else: else:
others = others + 1 others = others + 1
# Check small list return self.compare(length, digits, lowers, uppers, others)
unlisted = 0
if password not in SMALL_PWD_LIST:
unlisted = len(SMALL_PWD_LIST)
# Check big list def compare(self, length, digits, lowers, uppers, others):
size_list = 100000
if unlisted > 0 and not self.is_in_cracklib_list(password, PWD_LIST_FILE):
unlisted = 320000000
self.listed = unlisted < 320000000
return self.compare(unlisted, length, digits, lowers, uppers, others)
def compare(self, unlisted, length, digits, lowers, uppers, others):
strength = 0 strength = 0
for i, config in enumerate(self.strength_lvl): for i, config in enumerate(self.strength_lvl):
if unlisted < config[0] or length < config[1] \ if length < config[0] or digits < config[1] \
or digits < config[2] or lowers < config[3] \ or lowers < config[3] or uppers < config[4] \
or uppers < config[4] or others < config[5]: or others < config[5]:
break break
strength = i + 1 strength = i + 1
return strength return strength