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 pull request #589 from YunoHost/fix-force-password-during-postinstall

Browse source 
[fix] Password constrains and checks not behaving properly
This commit is contained in:
Alexandre Aubin 2018-11-28 23:04:02 +01:00 • committed by GitHub
commit fd142a0976
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/yunohost/tools.py
View file

@ -118,7 +118,7 @@ def tools_ldapinit():
return auth
def tools_adminpw(auth, new_password):
def tools_adminpw(auth, new_password, check_strength=True):
"""
Change admin password
@ -130,7 +130,8 @@ def tools_adminpw(auth, new_password):
from yunohost.utils.password import assert_password_is_strong_enough
import spwd
assert_password_is_strong_enough("admin", new_password)
if check_strength:
assert_password_is_strong_enough("admin", new_password)
new_hash = _hash_user_password(new_password)
@ -416,7 +417,7 @@ def tools_postinstall(operation_logger, domain, password, ignore_dyndns=False,
tools_maindomain(auth, domain)
# Change LDAP admin password
tools_adminpw(auth, password)
tools_adminpw(auth, password, check_strength=not force_password)
# Enable UPnP silently and reload firewall
firewall_upnp('enable', no_refresh=True)

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

@ -60,7 +60,7 @@ class PasswordValidator(object):
# (or at least that's my understanding -- Alex)
settings = json.load(open('/etc/yunohost/settings.json', "r"))
setting_key = "security.password." + profile + ".strength"
self.validation_strength = int(settings[setting_key])
self.validation_strength = int(settings[setting_key]["value"])
except Exception as e:
# Fallback to default value if we can't fetch settings for some reason
self.validation_strength = 1