From f45b5bfd5ee0b74c270e9ad32d25ae3211ccf5bb Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 18 Jan 2021 00:49:30 -0500 Subject: [PATCH] fix: strip trailing slashes in hostname from web installer The web installer needs work to add proper validation of input, but for now, this change will ensure folks don't accidentally add an extra slash to the global domain. Closes #4106 [ci skip] --- contrib/dokku-installer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/dokku-installer.py b/contrib/dokku-installer.py index 8e76655f4..c503d2e3c 100755 --- a/contrib/dokku-installer.py +++ b/contrib/dokku-installer.py @@ -154,7 +154,7 @@ class GetHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): if 'vhost' in params and params['vhost'].value == 'true': vhost_enable = 'true' with open(vhost_filename, 'w') as f: - f.write(params['hostname'].value) + f.write(params['hostname'].value.strip("/")) shutil.chown(vhost_filename, dokku_user, dokku_group) else: try: @@ -165,7 +165,7 @@ class GetHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): hostname_filename = '{0}/HOSTNAME'.format(dokku_root) with open(hostname_filename, 'w') as f: - f.write(params['hostname'].value) + f.write(params['hostname'].value.strip("/")) shutil.chown(hostname_filename, dokku_user, dokku_group)