pybind/mgr/dashboard: fix reverse proxy support #19758
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nrdmn
changed the title
tchaikov
reviewed
Jan 15, 2018
src/pybind/mgr/dashboard/module.py
Outdated
| @@ -65,12 +65,24 @@ def recurse_refs(root, path): | |||
| def get_prefixed_url(url): | |||
| return global_instance().url_prefix + url | |||
|
|
|||
| def prepare_url_prefix(url_prefix): | |||
| if url_prefix == None: | |||
There was a problem hiding this comment.
nit, might want to prefer is over ==, see http://legacy.python.org/dev/peps/pep-0008/#programming-recommendations
src/pybind/mgr/dashboard/module.py
Outdated
| else: | ||
| if len(url_prefix) != 0: | ||
| if url_prefix[0] != '/': | ||
| url_prefix = '/'+url_prefix |
There was a problem hiding this comment.
could use
url_prefix = urlparse.urljoin('/', url_prefix)
src/pybind/mgr/dashboard/module.py
Outdated
| if len(url_prefix) != 0: | ||
| if url_prefix[0] != '/': | ||
| url_prefix = '/'+url_prefix | ||
| if url_prefix[-1] == '/': |
There was a problem hiding this comment.
could just put:
url_prefix = url_prefix.rstrip('/')
src/pybind/mgr/dashboard/module.py
Outdated
| @@ -65,12 +65,24 @@ def recurse_refs(root, path): | |||
| def get_prefixed_url(url): | |||
| return global_instance().url_prefix + url | |||
|
|
|||
| def prepare_url_prefix(url_prefix): | |||
| if url_prefix == None: | |||
| url_prefix = '' | |||
|
Thank you for your feedback! I added most of your suggestions, see my other comment. |
jcsp
approved these changes
Jan 22, 2018
This fixes http redirection for reverse http proxies Fixes: http://tracker.ceph.com/issues/22557 Signed-off-by: Nick Erdmann <n@nirf.de>
Signed-off-by: Nick Erdmann <n@nirf.de>
@tchaikov @nrdmn yeah, that looks like it was broken by this PR -- the call to set_uri on an active mgr should be setting something that matches what the standby redirects to (i.e. both should to have the trailing slash, or neither should) |
|
👍 👍 👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes in 4f7007d break support for reverse http proxies by always redirecting to / on standby MGRs. This patch should fix it.
Fixes: http://tracker.ceph.com/issues/22557
Signed-off-by: Nick Erdmann n@nirf.de