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

Fix regex management

Browse source
This commit is contained in:
Josué Tille 2020-04-09 15:42:22 +02:00
parent 8f61e493e4
commit 1c1b88e455
No known key found for this signature in database
GPG key ID: 716A6C99B04194EF
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/yunohost/permission.py
View file

@ -362,14 +362,17 @@ def permission_url(operation_logger, permission,
if not existing_permission:
raise YunohostError('permission_not_found', permission=permission)
show_tile = existing_permission['show_tile']
if url is None:
url = existing_permission["url"]
else:
url = _check_and_normalize_permission_path(url)
domain, path = _get_full_url(url, app_main_path).split('/', 1)
conflicts = _get_conflicting_apps(domain, path, ignore_app=permission.split('.')[0])
conflicts = _get_conflicting_apps(domain.lstrip("re:"), 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
if conflicts:
apps = []
@ -393,7 +396,7 @@ 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, path, ignore_app=permission.split('.')[0])
conflicts = _get_conflicting_apps(domain.lstrip("re:"), path, ignore_app=permission.split('.')[0])
if conflicts:
apps = []
@ -630,6 +633,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.lstrip('re:')
else:
return url