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

Make sure the users actually exists when migrating legacy custom permissions

Browse source
This commit is contained in:
Alexandre Aubin 2019-11-06 18:35:21 +01:00
parent 67a11b5b79
commit ddc42e5c8c
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/yunohost/data_migrations/0011_setup_group_permission.py
View file

@ -7,7 +7,7 @@ from moulinette.utils.log import getActionLogger
from moulinette.utils.filesystem import read_yaml from moulinette.utils.filesystem import read_yaml
from yunohost.tools import Migration from yunohost.tools import Migration
from yunohost.user import user_group_create, user_group_update from yunohost.user import user_list, user_group_create, user_group_update
from yunohost.app import app_setting, app_list from yunohost.app import app_setting, app_list
from yunohost.regenconf import regen_conf, BACKUP_CONF_DIR from yunohost.regenconf import regen_conf, BACKUP_CONF_DIR
from yunohost.permission import permission_create, user_permission_update, permission_sync_to_user from yunohost.permission import permission_create, user_permission_update, permission_sync_to_user
@ -109,10 +109,11 @@ class MyMigration(Migration):
url = "/" if domain and path else None url = "/" if domain and path else None
if permission: if permission:
allowed_groups = permission.split(',') known_users = user_list()["users"].keys()
allowed = [user for user in permission.split(',') if user in known_users]
else: else:
allowed_groups = ["all_users"] allowed = ["all_users"]
permission_create(app+".main", url=url, allowed=allowed_groups, sync_perm=False) permission_create(app+".main", url=url, allowed=allowed, sync_perm=False)
app_setting(app, 'allowed_users', delete=True) app_setting(app, 'allowed_users', delete=True)