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

Moar cleaning

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

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

@ -26,17 +26,18 @@ import cracklib
import string import string
ASCII_UPPERCASE = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" ASCII_UPPERCASE = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
ASCII_LOWERCASE = "abcdefghijklmnopqrstuvwxyz" ASCII_LOWERCASE = "abcdefghijklmnopqrstuvwxyz"
PWDDICT_PATH = '/usr/local/share/dict/cracklib/'
SMALL_PWD_LIST = ["yunohost", "olinuxino", "olinux", "raspberry", "admin", SMALL_PWD_LIST = ["yunohost", "olinuxino", "olinux", "raspberry", "admin",
"root", "test", "rpi"] "root", "test", "rpi"]
PWD_LIST_FILE = '100000-most-used'
PWDDICT_FOLDER = '/usr/local/share/dict/cracklib/'
PWDDICT_LIST = '100000-most-used'
class PasswordValidator(object): class PasswordValidator(object):
""" """
PasswordValidator class validate password PasswordValidator class validate password
""" """
# Unlisted, length, digits, lowers, uppers, others # Length, digits, lowers, uppers, others
strength_lvl = [ strength_lvl = [
[6, 0, 0, 0, 0], [6, 0, 0, 0, 0],
[8, 1, 1, 1, 0], [8, 1, 1, 1, 0],
@ -54,7 +55,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.listed = password in SMALL_PWD_LIST or self.is_in_cracklib_list(password)
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:
@ -97,10 +98,10 @@ class PasswordValidator(object):
strength = i + 1 strength = i + 1
return strength return strength
def is_in_cracklib_list(self, password, pwd_dict): def is_in_cracklib_list(self, password):
try: try:
cracklib.VeryFascistCheck(password, None, cracklib.VeryFascistCheck(password, None,
os.path.join(PWDDICT_PATH, pwd_dict)) os.path.join(PWDDICT_FOLDER, PWDDICT_LIST))
except ValueError as e: except ValueError as e:
# We only want the dictionnary check of cracklib, not the is_simple # We only want the dictionnary check of cracklib, not the is_simple
# test. # test.