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

permissions: fix trailing-slash issue in edge case where app has additional urls related to a different domain

Browse source
This commit is contained in:
Alexandre Aubin 2023-02-09 17:09:15 +01:00
parent dd6d083904
commit a4fa6e07d0
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/permission.py
View file

@ -814,10 +814,12 @@ def _update_ldap_group_permission(
def _get_absolute_url(url, base_path):
#
# For example transform:
# (/api, domain.tld/nextcloud) into domain.tld/nextcloud/api
# (/api, domain.tld/nextcloud/) into domain.tld/nextcloud/api
# (re:/foo.*, domain.tld/app) into re:domain\.tld/app/foo.*
# (domain.tld/bar, domain.tld/app) into domain.tld/bar
# (/, domain.tld/) into domain.tld (no trailing /)
# (/api, domain.tld/nextcloud) into domain.tld/nextcloud/api
# (/api, domain.tld/nextcloud/) into domain.tld/nextcloud/api
# (re:/foo.*, domain.tld/app) into re:domain\.tld/app/foo.*
# (domain.tld/bar, domain.tld/app) into domain.tld/bar
# (some.other.domain/, domain.tld/app) into some.other.domain (no trailing /)
#
base_path = base_path.rstrip("/")
if url is None:
@ -827,7 +829,7 @@ def _get_absolute_url(url, base_path):
if url.startswith("re:/"):
return "re:" + base_path.replace(".", "\\.") + url[3:]
else:
return url
return url.rstrip("/")
def _validate_and_sanitize_permission_url(url, app_base_path, app):