Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for path-based proxying of interactive tools #15147

Merged
merged 1 commit into from
Dec 8, 2022
Merged

Support for path-based proxying of interactive tools #15147

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/galaxy/managers/interactivetool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,8 @@ def target_if_active(self, trans, entry_point):
rval = "{}/{}".format(rval.rstrip("/"), entry_point.entry_url.lstrip("/"))
else:
rval = self.get_entry_point_path(trans, entry_point)

if not self.app.config.interactivetools_upstream_proxy and self.app.config.interactivetools_proxy_host:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The PR is great, and this is totally an extra request, but could you use urljoin for this and the joins above ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Already merged, though... But could provide a new PR if I find the time in the beginning of next week

rval = f"{protocol}//{request_host}{rval}"
return rval

def get_entry_point_subdomain(self, trans, entry_point):
Expand Down