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

Handle undefined main permission url

Browse source
This commit is contained in:
tituspijean 2023-02-28 22:58:17 +01:00 • committed by GitHub
parent 276cf11c4d
commit 8701d8ec62
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/utils/resources.py
View file

@ -320,6 +320,9 @@ class PermissionsResource(AppResource):
def __init__(self, properties: Dict[str, Any], *args, **kwargs):
# FIXME : if url != None, we should check that there's indeed a domain/path defined ? ie that app is a webapp
if "main" not in properties:
properties["main"] = self.default_perm_properties
for perm, infos in properties.items():
properties[perm] = copy.copy(self.default_perm_properties)
properties[perm].update(infos)
@ -327,11 +330,12 @@ class PermissionsResource(AppResource):
properties[perm]["show_tile"] = bool(properties[perm]["url"])
if (
not isinstance(properties["main"].get("url"), str)
or properties["main"]["url"] != "/"
properties["main"]["url"] is not None
and ( not isinstance(properties["main"].get("url"), str)
or properties["main"]["url"] != "/" )
):
raise YunohostError(
"URL for the 'main' permission should be '/' for webapps (or undefined/None for non-webapps). Note that / refers to the install url of the app, i.e $domain.tld/$path/",
"URL for the 'main' permission should be '/' for webapps (or left undefined for non-webapps). Note that / refers to the install url of the app, i.e $domain.tld/$path/",
raw_msg=True,
)