adminpw function

This commit is contained in:
root 2012-10-25 21:17:26 +02:00
parent f31be0bacf
commit 615d0202bd

View file

@ -5,7 +5,7 @@ import sys
import yaml import yaml
import re import re
import getpass import getpass
from yunohost import validate, colorize, get_required_args from yunohost import YunoHostError, validate, colorize, get_required_args
def tools_ldapinit(args, connections): def tools_ldapinit(args, connections):
@ -58,10 +58,10 @@ def tools_adminpw(args):
dict dict
""" """
if not args['old']: if not 'old' in args:
args['old'] = getpass.getpass(colorize('Actual admin password: ', 'cyan')) args['old'] = getpass.getpass(colorize('Actual admin password: ', 'cyan'))
if not args['new']: if not 'new' in args:
args['new'] = getpass.getpass(colorize('New admin password: ', 'cyan')) args['new'] = getpass.getpass(colorize('New admin password: ', 'cyan'))
pwd2 = getpass.getpass(colorize('Retype new password: ', 'cyan')) pwd2 = getpass.getpass(colorize('Retype new password: ', 'cyan'))
if args['new'] != pwd2: if args['new'] != pwd2:
@ -71,9 +71,12 @@ def tools_adminpw(args):
if len(args['new']) < 4: if len(args['new']) < 4:
raise YunoHostError(22, _("Password is too short")) raise YunoHostError(22, _("Password is too short"))
os.system('ldappasswd -h localhost -D cn=admin,dc=yunohost,dc=org -w "'+ args['old'] +'" -a "'+ args['old'] +'" -s "' + args['new'] + '"') result = os.system('ldappasswd -h localhost -D cn=admin,dc=yunohost,dc=org -w "'+ args['old'] +'" -a "'+ args['old'] +'" -s "' + args['new'] + '"')
return { 'Success' : _("Admin password has been changed") } if result == 0:
return { 'Success' : _("Admin password has been changed") }
else:
raise YunoHostError(22, _("Invalid password"))
def tools_maindomain(args): def tools_maindomain(args):