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

[fix] Use authenticator to change admin password without asking old one

Browse source
This commit is contained in:
Jérôme Lebleu 2014-11-22 19:50:08 +01:00
parent f7b591840c
commit 798343d83d
2 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
actionsmap/yunohost.yml
View file

@ -1016,12 +1016,9 @@ tools:
adminpw:
action_help: Change admin password
api: PUT /adminpw
configuration:
authenticate: all
arguments:
-o:
full: --old-password
extra:
password: ask_current_admin_password
required: True
-n:
full: --new-password
extra:

18
tools.py
View file

@ -73,26 +73,22 @@ def tools_ldapinit(auth):
msignals.display(m18n.n('ldap_initialized'), 'success')
def tools_adminpw(old_password, new_password):
def tools_adminpw(auth, new_password):
"""
Change admin password
Keyword argument:
new_password
old_password
"""
old_password.replace('"', '\\"')
old_password.replace('&', '\\&')
new_password.replace('"', '\\"')
new_password.replace('&', '\\&')
result = os.system('ldappasswd -h localhost -D cn=admin,dc=yunohost,dc=org -w "%s" -a "%s" -s "%s"' % (old_password, old_password, new_password))
if result == 0:
msignals.display(m18n.n('admin_password_changed'), 'success')
else:
try:
auth.con.passwd_s('cn=admin,dc=yunohost,dc=org', None, new_password)
except:
logger.exception('unable to change admin password')
raise MoulinetteError(errno.EPERM,
m18n.n('admin_password_change_failed'))
else:
msignals.display(m18n.n('admin_password_changed'), 'success')
def tools_maindomain(auth, old_domain=None, new_domain=None, dyndns=False):