From 530d94b2cae5d5efec7bf79115e56b61755f8ac1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Thu, 9 Apr 2020 16:53:28 +0200 Subject: [PATCH] Fix regex manamgement --- src/yunohost/permission.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/yunohost/permission.py b/src/yunohost/permission.py index dc933da33..fddb7539e 100644 --- a/src/yunohost/permission.py +++ b/src/yunohost/permission.py @@ -391,7 +391,8 @@ def permission_url(operation_logger, permission, else: url = _check_and_normalize_permission_path(url) domain, path = _get_full_url(url, app_main_path).split('/', 1) - conflicts = _get_conflicting_apps(domain.lstrip("re:"), path, ignore_app=permission.split('.')[0]) + domain = domain[3:] if domain.startswith("re:") else domain + conflicts = _get_conflicting_apps(domain, path, ignore_app=permission.split('.')[0]) if url.startswith('re:') and existing_permission['show_tile']: logger.warning(m18n.n('regex_incompatible_with_tile', regex=url, permission=permission)) show_tile = False @@ -418,7 +419,8 @@ def permission_url(operation_logger, permission, else: ur = _check_and_normalize_permission_path(ur) domain, path = _get_full_url(ur, app_main_path).split('/', 1) - conflicts = _get_conflicting_apps(domain.lstrip("re:"), path, ignore_app=permission.split('.')[0]) + domain = domain[3:] if domain.startswith("re:") else domain + conflicts = _get_conflicting_apps(domain, path, ignore_app=permission.split('.')[0]) if conflicts: apps = [] @@ -655,6 +657,6 @@ def _get_full_url(url, app_main_path): if url.startswith('/'): return app_main_path + url.rstrip("/") if url.startswith('re:/'): - return 're:' + app_main_path + url.lstrip('re:') + return 're:' + app_main_path + url[3:] else: return url