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

Factorize validation from actual action

Browse source
This commit is contained in:
Alexandre Aubin 2019-03-05 02:07:17 +01:00
parent 4d126ad736
commit 13c6c9e500
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/yunohost/user.py
View file

@ -645,9 +645,12 @@ def user_group_update(operation_logger, auth, groupname, add_user=None, remove_u
if add_user: if add_user:
if not isinstance(add_user, list): if not isinstance(add_user, list):
add_user = [add_user] add_user = [add_user]
for user in add_user: for user in add_user:
if not user in existing_users: if not user in existing_users:
raise YunohostError('user_unknown', user=user) raise YunohostError('user_unknown', user=user)
for user in add_user:
userDN = "uid=" + user + ",ou=users,dc=yunohost,dc=org" userDN = "uid=" + user + ",ou=users,dc=yunohost,dc=org"
if userDN in group['member']: if userDN in group['member']:
logger.warning(m18n.n('user_already_in_group', user=user, group=groupname)) logger.warning(m18n.n('user_already_in_group', user=user, group=groupname))
@ -656,10 +659,13 @@ def user_group_update(operation_logger, auth, groupname, add_user=None, remove_u
if remove_user: if remove_user:
if not isinstance(remove_user, list): if not isinstance(remove_user, list):
remove_user = [remove_user] remove_user = [remove_user]
for user in remove_user: for user in remove_user:
userDN = "uid=" + user + ",ou=users,dc=yunohost,dc=org"
if user == groupname: if user == groupname:
raise YunohostError('remove_user_of_group_not_allowed', user=user, group=groupname) raise YunohostError('remove_user_of_group_not_allowed', user=user, group=groupname)
for user in remove_user:
userDN = "uid=" + user + ",ou=users,dc=yunohost,dc=org"
if 'member' in group and userDN in group['member']: if 'member' in group and userDN in group['member']:
new_group_list['member'].remove(userDN) new_group_list['member'].remove(userDN)
else: else: