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

Update yunohost_user.py

Browse source
This commit is contained in:
Alexis Gavoty 2012-10-25 20:48:14 +03:00
parent 79c5be580d
commit 3b216d6a26
1 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
yunohost_user.py
View file

@ -46,6 +46,28 @@ def user_create(args, connections):
except KeyboardInterrupt, EOFError: except KeyboardInterrupt, EOFError:
raise YunoHostError(125, _("Interrupted, user not created")) raise YunoHostError(125, _("Interrupted, user not created"))
# Validate password length
if len(args['password']) < 4:
raise YunoHostError(22, _("Password is too short"))
# Validate other values TODO: validate all values
validate({
args['username'] : r'^[a-z0-9_]+$',
args['mail'] : r'^[\w.-]+@[\w.-]+\.[a-zA-Z]{2,6}$',
})
yldap.validate_uniqueness({
'uid' : args['username'],
'mail' : args['mail'],
'mailalias' : args['mail']
})
# Check if unix user already exists (doesn't work)
#if not os.system("getent passwd " + args['username']):
# raise YunoHostError(17, _("Username not available"))
#TODO: check if mail belongs to a domain
# Get random UID/GID # Get random UID/GID
uid_check = gid_check = 0 uid_check = gid_check = 0
while uid_check == 0 and gid_check == 0: while uid_check == 0 and gid_check == 0:
@ -53,7 +75,7 @@ def user_create(args, connections):
uid_check = os.system("getent passwd " + uid) uid_check = os.system("getent passwd " + uid)
gid_check = os.system("getent group " + uid) gid_check = os.system("getent group " + uid)
# Manage values # Adapt values for LDAP
fullname = args['firstname'] + ' ' + args['lastname'] fullname = args['firstname'] + ' ' + args['lastname']
rdn = 'uid=' + args['username'] + ',ou=users' rdn = 'uid=' + args['username'] + ',ou=users'
char_set = string.ascii_uppercase + string.digits char_set = string.ascii_uppercase + string.digits
@ -75,28 +97,6 @@ def user_create(args, connections):
'loginShell' : '/bin/bash' 'loginShell' : '/bin/bash'
} }
# Validate password length
if len(args['password']) < 4:
raise YunoHostError(22, _("Password is too short"))
# Validate other values TODO: validate other values
validate({
args['username'] : r'^[a-z0-9_]+$',
args['mail'] : r'^[\w.-]+@[\w.-]+\.[a-zA-Z]{2,6}$',
})
yldap.validate_uniqueness({
'uid' : args['username'],
'mail' : 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
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 ''") os.system("su - " + args['username'] + " -c ''")