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

[enh] Check that url is available and normalize path before app install (#304)

Browse source
This commit is contained in:
Alexandre Aubin 2017-07-24 20:11:58 +02:00 • committed by GitHub
parent 390835e96a
commit a513d0ecbe
1 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/yunohost/app.py
View file

@ -1725,7 +1725,8 @@ def _parse_args_from_manifest(manifest, action, args={}, auth=None):
args -- A dictionnary of arguments to parse args -- A dictionnary of arguments to parse
""" """
from yunohost.domain import domain_list, _get_maindomain from yunohost.domain import (domain_list, _get_maindomain,
domain_url_available, _normalize_domain_path)
from yunohost.user import user_info from yunohost.user import user_info
args_dict = OrderedDict() args_dict = OrderedDict()
@ -1830,6 +1831,33 @@ def _parse_args_from_manifest(manifest, action, args={}, auth=None):
m18n.n('app_argument_choice_invalid', m18n.n('app_argument_choice_invalid',
name=arg_name, choices='0, 1')) name=arg_name, choices='0, 1'))
args_dict[arg_name] = arg_value args_dict[arg_name] = arg_value
# END loop over action_args...
# If there's only one "domain" and "path", validate that domain/path
# is an available url and normalize the path.
domain_args = [arg["name"] for arg in action_args
if arg.get("type","string") == "domain"]
path_args = [arg["name"] for arg in action_args
if arg.get("type","string") == "path"]
if len(domain_args) == 1 and len(path_args) == 1:
domain = args_dict[domain_args[0]]
path = args_dict[path_args[0]]
domain, path = _normalize_domain_path(domain, path)
# Check the url is available
if not domain_url_available(auth, domain, path):
raise MoulinetteError(errno.EINVAL,
m18n.n('app_location_unavailable'))
# (We save this normalized path so that the install script have a
# standard path format to deal with no matter what the user inputted)
args_dict[path_args[0]] = path
return args_dict return args_dict
def _make_environment_dict(args_dict): def _make_environment_dict(args_dict):