Skip to content

Commit

Permalink
Re-fix the bug with multiple preceding '/' characters in the GIE proxy
Browse files Browse the repository at this point in the history
prefix
  • Loading branch information
natefoo committed May 10, 2016
1 parent d0830e0 commit bd25ae9
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions lib/galaxy/web/base/interactive_environments.py
Expand Up @@ -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')):
Expand Down

0 comments on commit bd25ae9

Please sign in to comment.