-
Notifications
You must be signed in to change notification settings - Fork 896
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.
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
Add settings key to disable console proxy #12675
Conversation
@@ -93,8 +93,12 @@ def self.is_local?(originating_server) | |||
end | |||
|
|||
def self.launch_proxy_if_not_local(console_args, originating_server, host_address, host_port) | |||
proxy_disabled = ::Settings.server.try(:console_proxy_disabled) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No need for try. The server key will always exist because
Line 1035 in edb5ac0
:server: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed. Thx.
Using 'server.console_proxy_disabled' set to 'true' the proxying can be disabled even if the display ticket is being requested by a different server than the one that originated the request. This allows the server to behave the same as before Euwe. This is an addition to the 2 keys: 'server.proxy_port.start', defaults to 6000 'server.proxy_port.end', defaults to 7000 that allow setting of the port range for the console proxy.
555bcf2
to
b2ac616
Compare
Checked commits martinpovolny/manageiq@64e04b9~...b2ac616 with ruby 2.2.5, rubocop 0.37.2, and haml-lint 0.16.1 |
ping @Fryguy. Can we merge this one? |
cc @yrudman (not sure if you need to add this one to your spreadsheet as a "hidden" setting. Merging anyway. |
|
@yrudman Can you make the follow up PR? |
ok |
Add settings key to disable console proxy (cherry picked from commit 5271c91) https://bugzilla.redhat.com/show_bug.cgi?id=1399677
Euwe backport details:
|
https://bugzilla.redhat.com/show_bug.cgi?id=1399369
Using 'server.console_proxy_disabled' set to 'true' the proxying can be
disabled even if the display ticket is being requested by a different
server than the one that originated the request.
This allows the server to behave the same as before Euwe.
This is an addition to the 2 keys:
'server.proxy_port.start', defaults to 6000
'server.proxy_port.end', defaults to 7000
that allow setting of the port range for the console proxy.
ping @skateman