Skip to content

Commit

Permalink
Merge pull request #368 from YunoHost/change_url_double_slash
Browse files Browse the repository at this point in the history
'/' was resulting in '//' in change_url
  • Loading branch information
Psycojoker committed Sep 15, 2017
2 parents 1086a50 + 85f0b02 commit 1aa34b7
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions src/yunohost/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -445,8 +445,9 @@ def app_change_url(auth, app, domain, path):

# Normalize path and domain format
domain = domain.strip().lower()
old_path = '/' + old_path.strip("/").strip() + '/'
path = '/' + path.strip("/").strip() + '/'

old_path = normalize_url_path(old_path)
path = normalize_url_path(path)

if (domain, path) == (old_domain, old_path):
raise MoulinetteError(errno.EINVAL, m18n.n("app_change_url_identical_domains", domain=domain, path=path))
Expand Down Expand Up @@ -2105,3 +2106,10 @@ def random_password(length=8):

char_set = string.ascii_uppercase + string.digits + string.ascii_lowercase
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 "/"

0 comments on commit 1aa34b7

Please sign in to comment.