From bd25ae95f900cef379214caa43c5b0bfc7705baf Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Tue, 10 May 2016 14:24:17 -0400 Subject: [PATCH] Re-fix the bug with multiple preceding '/' characters in the GIE proxy prefix --- lib/galaxy/web/base/interactive_environments.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/galaxy/web/base/interactive_environments.py b/lib/galaxy/web/base/interactive_environments.py index 199c0b276f20..235e70866686 100644 --- a/lib/galaxy/web/base/interactive_environments.py +++ b/lib/galaxy/web/base/interactive_environments.py @@ -71,6 +71,11 @@ def __init__(self, trans, plugin): ) else: self.attr.proxy_prefix = '' + # If cookie_path is unset (thus '/'), the proxy prefix ends up with + # multiple leading '/' characters, which will cause the client to + # request resources from http://dynamic_proxy_prefix + if self.attr.proxy_prefix.startswith('/'): + self.attr.proxy_prefix = '/' + self.attr.proxy_prefix.lstrip('/') def load_allowed_images(self): if os.path.exists(os.path.join(self.attr.our_config_dir, 'allowed_images.yml')):