YunoHost/moulinette
1
0
Fork 0
mirror of https://github.com/YunoHost/moulinette.git synced 2024-09-03 20:06:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Correct user function (still broken)

Browse source
This commit is contained in:
Kloadut 2012-10-24 18:36:23 +02:00
parent 0500e6fbea
commit 79c5be580d
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
yunohost_user.py
View file

@ -55,7 +55,7 @@ def user_create(args, connections):
# Manage values # Manage values
fullname = args['firstname'] + ' ' + args['lastname'] fullname = args['firstname'] + ' ' + args['lastname']
rdn = 'cn=' + fullname + ',ou=users' rdn = 'uid=' + args['username'] + ',ou=users'
char_set = string.ascii_uppercase + string.digits char_set = string.ascii_uppercase + string.digits
salt = ''.join(random.sample(char_set,8)) salt = ''.join(random.sample(char_set,8))
salt = '$1$' + salt + '$' salt = '$1$' + salt + '$'
@ -75,10 +75,14 @@ def user_create(args, connections):
'loginShell' : '/bin/bash' 'loginShell' : '/bin/bash'
} }
# Validate values TODO: validate other values # Validate password length
if len(args['password']) < 4:
raise YunoHostError(22, _("Password is too short"))
# Validate other values TODO: validate other values
validate({ validate({
args['username'] : r'^[a-z0-9_]+$', args['username'] : r'^[a-z0-9_]+$',
args['mail'] : r'^[\w.-]+@[\w.-]+\.[a-zA-Z]{2,6}$' args['mail'] : r'^[\w.-]+@[\w.-]+\.[a-zA-Z]{2,6}$',
}) })
yldap.validate_uniqueness({ yldap.validate_uniqueness({
@ -87,13 +91,17 @@ def user_create(args, connections):
'mailalias' : args['mail'] 'mailalias' : args['mail']
}) })
# Check if unix user already exists
if not os.system("getent passwd " + args['username']):
raise YunoHostError(17, _("Username not available"))
#TODO: check if mail belongs to a domain #TODO: check if mail belongs to a domain
if yldap.add(rdn, attr_dict): if yldap.add(rdn, attr_dict):
# Create user /home directory by switching user # Create user /home directory by switching user
os.system("su - " + args['username'] + " -c 'cd'") os.system("su - " + args['username'] + " -c ''")
#TODO: Send a welcome mail to user #TODO: Send a welcome mail to user
win_msg(_("User successfully created")) win_msg(_("User successfully created"))
return { _("Fullname") : fullname, _("Username") : args['username'], _("Mail") : args['mail'] } return { _("Fullname") : fullname, _("Username") : args['username'], _("Mail") : args['mail'] }
else: else:
raise YunoHostError(169, _('An error occured during user creation')) raise YunoHostError(169, _("An error occured during user creation"))