mirror of
https://github.com/YunoHost/yunohost.git
synced 2024-09-03 20:06:10 +02:00
tools_adminpw was still checking the password strength despite --force-password
This commit is contained in:
parent
5126b3e450
commit
02544f837c
1 changed files with 4 additions and 3 deletions
|
@ -118,7 +118,7 @@ def tools_ldapinit():
|
||||||
return auth
|
return auth
|
||||||
|
|
||||||
|
|
||||||
def tools_adminpw(auth, new_password):
|
def tools_adminpw(auth, new_password, check_strength=True):
|
||||||
"""
|
"""
|
||||||
Change admin password
|
Change admin password
|
||||||
|
|
||||||
|
@ -130,6 +130,7 @@ def tools_adminpw(auth, new_password):
|
||||||
from yunohost.utils.password import assert_password_is_strong_enough
|
from yunohost.utils.password import assert_password_is_strong_enough
|
||||||
import spwd
|
import spwd
|
||||||
|
|
||||||
|
if check_strength:
|
||||||
assert_password_is_strong_enough("admin", new_password)
|
assert_password_is_strong_enough("admin", new_password)
|
||||||
|
|
||||||
new_hash = _hash_user_password(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)
|
tools_maindomain(auth, domain)
|
||||||
|
|
||||||
# Change LDAP admin password
|
# Change LDAP admin password
|
||||||
tools_adminpw(auth, password)
|
tools_adminpw(auth, password, check_strength=not force_password)
|
||||||
|
|
||||||
# Enable UPnP silently and reload firewall
|
# Enable UPnP silently and reload firewall
|
||||||
firewall_upnp('enable', no_refresh=True)
|
firewall_upnp('enable', no_refresh=True)
|
||||||
|
|
Loading…
Add table
Reference in a new issue