From 353b29613d280ab2e2119fcc2f041c840d3374a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Mon, 6 Apr 2020 10:42:12 +0200 Subject: [PATCH] Impove _get_full_url management --- .../data_migrations/0015_extends_permissions_features_1.py | 2 +- src/yunohost/permission.py | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/yunohost/data_migrations/0015_extends_permissions_features_1.py b/src/yunohost/data_migrations/0015_extends_permissions_features_1.py index 83222fd0a..b470b7a6f 100644 --- a/src/yunohost/data_migrations/0015_extends_permissions_features_1.py +++ b/src/yunohost/data_migrations/0015_extends_permissions_features_1.py @@ -35,7 +35,7 @@ class MyMigration(Migration): logger.info(m18n.n("migration_0015_add_new_attributes_in_ldap")) ldap = _get_ldap_interface() - permission_list = user_permission_list(short=True)["permissions"] + permission_list = user_permission_list(short=True, full_path=False)["permissions"] for permission in permission_list: if permission.split('.')[0] in SYSTEM_PERMS: diff --git a/src/yunohost/permission.py b/src/yunohost/permission.py index f2c6eb36d..2128f114d 100644 --- a/src/yunohost/permission.py +++ b/src/yunohost/permission.py @@ -82,8 +82,8 @@ def user_permission_list(short=False, full=False, ignore_system_perms=False, ful permissions[name]["show_tile"] = infos.get("showTile", [False])[0] == "TRUE" permissions[name]["protected"] = infos.get("isProtected", [False])[0] == "TRUE" if full_path and name.split(".")[0] in apps_main_path: - permissions[name]["url"] = _get_full_url(infos.get("URL", [None])[0], apps_main_path[name.split('.')[0]]) - permissions[name]["additional_urls"] = [_get_full_url(url, apps_main_path[name.split('.')[0]]) for url in infos.get("additionalUrls", [None])] + permissions[name]["url"] = _get_full_url(infos["URL"][0], apps_main_path[name.split('.')[0]]) if "URL" in infos else None + permissions[name]["additional_urls"] = [_get_full_url(url, apps_main_path[name.split('.')[0]]) for url in infos.get("additionalUrls", [None]) if url] else: permissions[name]["url"] = infos.get("URL", [None])[0] permissions[name]["additional_urls"] = infos.get("additionalUrls", [None]) @@ -608,8 +608,6 @@ def _update_ldap_group_permission(permission, allowed, def _get_full_url(url, app_main_path): - if url is None: - return None if url.startswith('/'): return app_main_path + url.rstrip("/") if url.startswith('re:/'):