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 change url function

Browse source
This commit is contained in:
Josué Tille 2018-12-30 17:49:12 +01:00
parent 1c80e7242b
commit 9da00bd8b6
No known key found for this signature in database
GPG key ID: D5E068C6DFA8681D
2 changed files with 7 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/yunohost/app.py
View file

@ -445,6 +445,7 @@ def app_change_url(operation_logger, auth, app, domain, path):
""" """
from yunohost.hook import hook_exec, hook_callback from yunohost.hook import hook_exec, hook_callback
from yunohost.domain import _normalize_domain_path, _get_conflicting_apps
installed = _is_installed(app) installed = _is_installed(app)
if not installed: if not installed:
@ -457,18 +458,13 @@ def app_change_url(operation_logger, auth, app, domain, path):
old_path = app_setting(app, "path") old_path = app_setting(app, "path")
# Normalize path and domain format # Normalize path and domain format
domain = domain.strip().lower() old_domain, old_path = _normalize_domain_path(old_domain, old_path)
domain, path = _normalize_domain_path(domain, path)
old_path = normalize_url_path(old_path)
path = normalize_url_path(path)
if (domain, path) == (old_domain, old_path): if (domain, path) == (old_domain, old_path):
raise YunohostError("app_change_url_identical_domains", domain=domain, path=path) raise YunohostError("app_change_url_identical_domains", domain=domain, path=path)
# WARNING / FIXME : checkurl will modify the settings _get_conflicting_apps(auth, domain, path)
# (this is a non intuitive behavior that should be changed)
# (or checkurl renamed in reserve_url)
app_checkurl(auth, '%s%s' % (domain, path), app)
manifest = json.load(open(os.path.join(APPS_SETTING_PATH, app, "manifest.json"))) manifest = json.load(open(os.path.join(APPS_SETTING_PATH, app, "manifest.json")))
@ -486,9 +482,9 @@ def app_change_url(operation_logger, auth, app, domain, path):
env_dict["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb) env_dict["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb)
env_dict["YNH_APP_OLD_DOMAIN"] = old_domain env_dict["YNH_APP_OLD_DOMAIN"] = old_domain
env_dict["YNH_APP_OLD_PATH"] = old_path.rstrip("/") env_dict["YNH_APP_OLD_PATH"] = old_path
env_dict["YNH_APP_NEW_DOMAIN"] = domain env_dict["YNH_APP_NEW_DOMAIN"] = domain
env_dict["YNH_APP_NEW_PATH"] = path.rstrip("/") env_dict["YNH_APP_NEW_PATH"] = path
if domain != old_domain: if domain != old_domain:
operation_logger.related_to.append(('domain', old_domain)) operation_logger.related_to.append(('domain', old_domain))
@ -1251,7 +1247,6 @@ def app_register_url(auth, app, domain, path):
# We cannot change the url of an app already installed simply by changing # We cannot change the url of an app already installed simply by changing
# the settings... # the settings...
# FIXME should look into change_url once it's merged
installed = app in app_list(installed=True, raw=True).keys() installed = app in app_list(installed=True, raw=True).keys()
if installed: if installed:
@ -2529,13 +2524,6 @@ def random_password(length=8):
return ''.join([random.SystemRandom().choice(char_set) for x in range(length)]) return ''.join([random.SystemRandom().choice(char_set) for x in range(length)])
def normalize_url_path(url_path):
if url_path.strip("/").strip():
return '/' + url_path.strip("/").strip() + '/'
return "/"
def unstable_apps(): def unstable_apps():
raw_app_installed = app_list(installed=True, raw=True) raw_app_installed = app_list(installed=True, raw=True)

2
src/yunohost/domain.py
View file

@ -298,7 +298,7 @@ def _normalize_domain_path(domain, path):
domain = domain[len("http://"):] domain = domain[len("http://"):]
# Remove trailing slashes # Remove trailing slashes
domain = domain.rstrip("/") domain = domain.rstrip("/").lower()
path = "/" + path.strip("/") path = "/" + path.strip("/")
return domain, path return domain, path