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

Let's convert this in list in all cases (+ simplify later core)

Browse source
This commit is contained in:
Alexandre Aubin 2019-11-29 15:51:43 +01:00
parent 32b6c2eccf
commit 9697ca8e4b
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/yunohost/permission.py
View file

@ -140,11 +140,11 @@ def user_permission_update(operation_logger, permission, add=None, remove=None,
# If we end up with something like allowed groups is ["all_users", "volunteers"] # If we end up with something like allowed groups is ["all_users", "volunteers"]
# we shall warn the users that they should probably choose between one or the other, # we shall warn the users that they should probably choose between one or the other,
# because the current situation is probably not what they expect / is temporary ? # because the current situation is probably not what they expect / is temporary ?
if "all_users" in new_allowed_groups: if "all_users" in new_allowed_groups:
if len(new_allowed_groups) > 1 and "visitors" not in new_allowed_groups or len(new_allowed_groups) > 2: if len(new_allowed_groups) > 1 and "visitors" not in new_allowed_groups or len(new_allowed_groups) > 2:
logger.warning(m18n.n("permission_currently_allowed_for_all_users")) logger.warning(m18n.n("permission_currently_allowed_for_all_users"))
# If visitors are allowed, but not all users, it can break some applications, so we prohibit it. # If visitors are allowed, but not all users, it can break some applications, so we prohibit it.
if "visitors" in new_allowed_groups and "all_users" not in new_allowed_groups: if "visitors" in new_allowed_groups and "all_users" not in new_allowed_groups:
raise YunohostError('permission_allowed_for_visitors_but_not_for_all_users') raise YunohostError('permission_allowed_for_visitors_but_not_for_all_users')
@ -261,15 +261,14 @@ def permission_create(operation_logger, permission, url=None, allowed=None, sync
attr_dict['URL'] = url attr_dict['URL'] = url
if allowed is not None: if allowed is not None:
if not isinstance(allowed, list):
allowed = [allowed]
if "visitors" in allowed and "all_users" not in allowed: if "visitors" in allowed and "all_users" not in allowed:
if not isinstance(allowed, list):
allowed = [allowed]
allowed.append("all_users") allowed.append("all_users")
# Validate that the groups to add actually exist # Validate that the groups to add actually exist
all_existing_groups = user_group_list()['groups'].keys() all_existing_groups = user_group_list()['groups'].keys()
allowed_ = [] if allowed is None else [allowed] if not isinstance(allowed, list) else allowed for group in allowed or []:
for group in allowed_:
if group not in all_existing_groups: if group not in all_existing_groups:
raise YunohostError('group_unknown', group=group) raise YunohostError('group_unknown', group=group)