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

Merge Profile validator into regular validator

Browse source
This commit is contained in:
Alexandre Aubin 2018-10-25 17:30:55 +00:00
parent 85d3c7df34
commit 2b00e072d8
1 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -45,8 +45,15 @@ class PasswordValidator(object):
[12, 1, 1, 1, 1],
]
def __init__(self, validation_strength):
self.validation_strength = validation_strength
def __init__(self, profile):
self.profile = profile
import json
try:
settings = json.load(open('/etc/yunohost/settings.json', "r"))
setting_key = "security.password." + profile + ".strength"
self.validation_strength = int(settings[setting_key])
except Exception as e:
self.validation_strength = 2 if profile == 'admin' else 1
def validate(self, password):
"""
@ -109,19 +116,7 @@ class PasswordValidator(object):
return True
class ProfilePasswordValidator(PasswordValidator):
def __init__(self, profile):
self.profile = profile
import json
try:
settings = json.load(open('/etc/yunohost/settings.json', "r"))
self.validation_strength = int(settings["security.password." + profile +
'.strength'])
except Exception as e:
self.validation_strength = 2 if profile == 'admin' else 1
return
class LoggerPasswordValidator(ProfilePasswordValidator):
class LoggerPasswordValidator(PasswordValidator):
"""
PasswordValidator class validate password
"""
@ -153,7 +148,7 @@ if __name__ == '__main__':
#print("usage: password.py PASSWORD")
else:
pwd = sys.argv[1]
status, msg = ProfilePasswordValidator('user').validate(pwd)
status, msg = PasswordValidator('user').validate(pwd)
print(msg)
sys.exit(0)