shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-02-15 05:57:23 +03:00
Code Releases Wiki Activity

M #~: add '/fireedge' to fireedge URLs (#510)

Browse Source
This commit is contained in:
Frederick Borges 2020-12-01 14:50:08 +01:00 committed by GitHub
parent 3171092f3e
commit 7fec05f805
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/sunstone/etc/sunstone-server.conf
View File

@ -256,13 +256,6 @@
:threshold_low: 33
:threshold_high: 66
################################################################################
# Autorefresh websocket configuration
################################################################################
:zeromq_server: tcp://localhost:2101
:autorefresh_ip: 127.0.0.1
################################################################################
# Fireedge
################################################################################

3
src/sunstone/public/app/sunstone-config.js
View File

@ -180,9 +180,6 @@ define(function(require) {
},
"isExtendedVmInfo": _config["system_config"] && _config["system_config"]["get_extended_vm_info"] && _config["system_config"]["get_extended_vm_info"] === "true",
"isLogEnabled": _config["zone_id"] === _config["id_own_federation"] ? true : false,
"autorefreshWSS": _config["system_config"]["autorefresh_wss"],
"autorefreshIP": _config["system_config"]["autorefresh_ip"],
"autorefreshPort": _config["system_config"]["autorefresh_port"],
"fireedgeEndpoint": _config["system_config"]["fireedge_endpoint"],
"maxWaitingTries": _config["system_config"]["max_waiting_tries"],
};

2
src/sunstone/public/app/utils/gclient.js
View File

@ -71,7 +71,7 @@ define(function(require) {
var host = fireedge_host || 'localhost';
var wsprotocol = (fireedge_protocol == 'https:') ? 'wss:' : 'ws:';
var tunnel = new Guacamole.WebSocketTunnel(wsprotocol + '//' + host + ':' + port + '/guacamole')
var tunnel = new Guacamole.WebSocketTunnel(wsprotocol + '//' + host + ':' + port + '/fireedge/guacamole')
var guac = this._client = new Guacamole.Client(tunnel);
// Client display

4
src/sunstone/public/app/utils/vmrc.js
View File

@ -98,9 +98,9 @@ define(function (require) {
URL += "://" + fireedge_endpoint + "/";
var re = new RegExp("^(ws|wss):\\/\\/[\\w\\D]*?\\/", "gi");
var link = URL.replace(re, protocol + "//" + hostname + ":" + port + "/vmrc?");
var link = URL.replace(re, protocol + "//" + hostname + ":" + port + "/fireedge/vmrc?");
URL += "vmrc/" + ticket;
URL += "/fireedge/vmrc/" + ticket;
link += "host=" + fireedge_host;
link += "&port=" + fireedge_port;
link += "&ticket=" + ticket;

2
src/sunstone/public/app/utils/websocket.js
View File

@ -30,7 +30,7 @@ define(function (require) {
var _start = function () {
if (sessionStorage.getItem(FireedgeValidator.sessionVar) == "true"){
const socket = io(Config.fireedgeEndpoint, {
path: "/websocket",
path: "/fireedge/websocket",
query: {
token: fireedge_token
}

9
src/sunstone/sunstone-server.rb
View File

@ -471,9 +471,6 @@ helpers do
session[:default_view] = $views_config.available_views(session[:user], session[:user_gname]).first
end
autorefresh_wss = $conf[:autorefresh_support_wss]
session[:autorefresh_wss] = autorefresh_wss == 'yes'? 'wss' : 'ws'
# end user options
# secure cookies
@ -507,7 +504,7 @@ helpers do
# Fireedge running
begin
uri = URI($conf[:fireedge_endpoint]+'/api/auth')
uri = URI($conf[:fireedge_endpoint]+'/fireedge/api/auth')
user_pass = Base64.decode64(request.env['HTTP_AUTHORIZATION'].split(' ')[1])
username = user_pass.split(":")[0]
password = user_pass.split(":")[1]
@ -515,8 +512,8 @@ helpers do
res = Net::HTTP.post_form(uri, params)
session[:fireedge_token] = JSON.parse(res.body)['data']['token'] if res.is_a?(Net::HTTPSuccess)
rescue
logger.info("Fireedge server is not running.")
rescue StandardError => error
logger.info("Fireedge server is not running. Error: #{error}")
end
[204, ""]

3
src/sunstone/views/index.erb
View File

@ -55,9 +55,6 @@
'leases' : <%= $conf[:leases] ? $conf[:leases].to_json : "null" %>,
'mapped_ips' : '<%= $conf[:mapped_ips] ? $conf[:mapped_ips] : false %>',
'get_extended_vm_info': '<%= $conf[:get_extended_vm_info] ? $conf[:get_extended_vm_info] : false %>',
'autorefresh_wss': '<%= session[:autorefresh_wss] %>',
'autorefresh_ip': '<%= $conf[:autorefresh_ip] %>',
'autorefresh_port': '<%= $conf[:port] %>',
'fireedge_endpoint': '<%= $conf[:fireedge_endpoint] ? $conf[:fireedge_endpoint] : "http://localhost:2616" %>',
'max_waiting_tries': '<%= $conf[:max_waiting_tries] ? $conf[:max_waiting_tries] : 5 %>',
},