mirror of
https://github.com/YunoHost/yunohost.git
synced 2024-09-03 20:06:10 +02:00
Detect and warn early about unavailable full domain requirement...
This commit is contained in:
parent
6aebec4a34
commit
2642b64af5
2 changed files with 32 additions and 6 deletions
|
@ -19,6 +19,7 @@
|
||||||
"app_change_url_no_script": "This application '{app_name:s}' doesn't support URL modification yet. Maybe you should upgrade it.",
|
"app_change_url_no_script": "This application '{app_name:s}' doesn't support URL modification yet. Maybe you should upgrade it.",
|
||||||
"app_change_url_success": "{app:s} URL is now {domain:s}{path:s}",
|
"app_change_url_success": "{app:s} URL is now {domain:s}{path:s}",
|
||||||
"app_extraction_failed": "Could not extract the installation files",
|
"app_extraction_failed": "Could not extract the installation files",
|
||||||
|
"app_full_domain_unavailable": "Sorry, this application requires a full domain to be installed on, but some other apps are already installed on {domain}. One possible solution is to add a subdomain dedicated to this application.",
|
||||||
"app_id_invalid": "Invalid app ID",
|
"app_id_invalid": "Invalid app ID",
|
||||||
"app_incompatible": "The app {app} is incompatible with your YunoHost version",
|
"app_incompatible": "The app {app} is incompatible with your YunoHost version",
|
||||||
"app_install_files_invalid": "These files cannot be installed",
|
"app_install_files_invalid": "These files cannot be installed",
|
||||||
|
|
|
@ -847,6 +847,9 @@ def app_install(operation_logger, app, label=None, args=None, no_remove_on_failu
|
||||||
args_list = [ value[0] for value in args_odict.values() ]
|
args_list = [ value[0] for value in args_odict.values() ]
|
||||||
args_list.append(app_instance_name)
|
args_list.append(app_instance_name)
|
||||||
|
|
||||||
|
# Validate domain / path availability for webapps
|
||||||
|
_validate_and_normalize_webpath(manifest, args_odict, extracted_app_folder)
|
||||||
|
|
||||||
# Prepare env. var. to pass to script
|
# Prepare env. var. to pass to script
|
||||||
env_dict = _make_environment_dict(args_odict)
|
env_dict = _make_environment_dict(args_odict)
|
||||||
env_dict["YNH_APP_ID"] = app_id
|
env_dict["YNH_APP_ID"] = app_id
|
||||||
|
@ -2547,8 +2550,7 @@ def _parse_args_for_action(action, args={}):
|
||||||
def _parse_args_in_yunohost_format(args, action_args):
|
def _parse_args_in_yunohost_format(args, action_args):
|
||||||
"""Parse arguments store in either manifest.json or actions.json
|
"""Parse arguments store in either manifest.json or actions.json
|
||||||
"""
|
"""
|
||||||
from yunohost.domain import (domain_list, _get_maindomain,
|
from yunohost.domain import domain_list, _get_maindomain
|
||||||
_get_conflicting_apps, _normalize_domain_path)
|
|
||||||
from yunohost.user import user_info, user_list
|
from yunohost.user import user_info, user_list
|
||||||
|
|
||||||
args_dict = OrderedDict()
|
args_dict = OrderedDict()
|
||||||
|
@ -2666,7 +2668,12 @@ def _parse_args_in_yunohost_format(args, action_args):
|
||||||
assert_password_is_strong_enough('user', arg_value)
|
assert_password_is_strong_enough('user', arg_value)
|
||||||
args_dict[arg_name] = (arg_value, arg_type)
|
args_dict[arg_name] = (arg_value, arg_type)
|
||||||
|
|
||||||
# END loop over action_args...
|
return args_dict
|
||||||
|
|
||||||
|
|
||||||
|
def _validate_and_normalize_webpath(manifest, args_dict, app_folder):
|
||||||
|
|
||||||
|
from yunohost.domain import _get_conflicting_apps, _normalize_domain_path
|
||||||
|
|
||||||
# If there's only one "domain" and "path", validate that domain/path
|
# If there's only one "domain" and "path", validate that domain/path
|
||||||
# is an available url and normalize the path.
|
# is an available url and normalize the path.
|
||||||
|
@ -2698,7 +2705,25 @@ def _parse_args_in_yunohost_format(args, action_args):
|
||||||
# standard path format to deal with no matter what the user inputted)
|
# standard path format to deal with no matter what the user inputted)
|
||||||
args_dict[path_args[0][0]] = (path, "path")
|
args_dict[path_args[0][0]] = (path, "path")
|
||||||
|
|
||||||
return args_dict
|
# This is likely to be a full-domain app...
|
||||||
|
elif len(domain_args) == 1 and len(path_args) == 0:
|
||||||
|
|
||||||
|
# Confirm that this is a full-domain app This should cover most cases
|
||||||
|
# ... though anyway the proper solution is to implement some mechanism
|
||||||
|
# in the manifest for app to declare that they require a full domain
|
||||||
|
# (among other thing) so that we can dynamically check/display this
|
||||||
|
# requirement on the webadmin form and not miserably fail at submit time
|
||||||
|
|
||||||
|
# Full-domain apps typically declare something like path_url="/" or path=/
|
||||||
|
# and use ynh_webpath_register or yunohost_app_checkurl inside the install script
|
||||||
|
install_script_content = open(os.path.join(app_folder, 'scripts/install')).read()
|
||||||
|
if re.search(r"\npath(_url)?=[\"']?/[\"']?\n", install_script_content) \
|
||||||
|
and re.search(r"(ynh_webpath_register|yunohost app checkurl)"):
|
||||||
|
|
||||||
|
domain = domain_args[0][1]
|
||||||
|
conflicts = _get_conflicting_apps(domain, "/")
|
||||||
|
|
||||||
|
raise YunohostError('app_full_domain_unavailable', domain)
|
||||||
|
|
||||||
|
|
||||||
def _make_environment_dict(args_dict, prefix="APP_ARG_"):
|
def _make_environment_dict(args_dict, prefix="APP_ARG_"):
|
||||||
|
|
Loading…
Add table
Reference in a new issue