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

M #~: Clean install.sh & gitignore (#770)

Browse Source
This commit is contained in:
Sergio Betanzos 2021-02-08 17:35:58 +01:00 committed by GitHub
parent bd814db697
commit d4d133b882
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 6 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@ -45,13 +45,6 @@ src/sunstone/public/css/app.min.css
src/sunstone/public/dist/
src/sunstone/public/locale/languages/*.js
src/sunstone/public/package-lock.json
src/sunstone/guac/node_modules
src/sunstone/guac/dist
src/sunstone/guac/package-lock.json
src/sunstone/vmrc/node_modules
src/sunstone/vmrc/dist
src/sunstone/vmrc/package-lock.json
src/sunstone/vmrc/v8-compile-cache-0/
.tx/config
src/fireedge/node_modules

6
install.sh
View File

@ -2521,12 +2521,12 @@ SUNSTONE_PUBLIC_JS_FILES="src/sunstone/public/dist/login.js \
src/sunstone/public/dist/main.js.map \
src/sunstone/public/dist/main-dist.js"
SUNSTONE_PUBLIC_JS_GUAC_FILES="src/sunstone/guac/dist/guac.js"
SUNSTONE_PUBLIC_JS_CONSOLE_FILES="src/sunstone/public/dist/console/vnc.js \
src/sunstone/public/dist/console/vnc.js.map \
src/sunstone/public/dist/console/spice.js \
src/sunstone/public/dist/console/spice.js.map"
src/sunstone/public/dist/console/spice.js.map \
src/sunstone/public/dist/console/vmrc.js \
src/sunstone/public/dist/console/vmrc.js.map"
SUNSTONE_PUBLIC_DEV_DIR="src/sunstone/public"

35
src/sunstone/guac/app.js
View File

@ -1,35 +0,0 @@
// Guacamole Client
//// Application Variables ////
var helmet = require('helmet');
var app = require('express')();
var http = require('http').Server(app);
var GuacamoleLite = require('guacamole-lite');
var { clientOptions, clientCallbacks } = require('./options');
/**
* CONSTANTS
* */
GUAC_PORT = process.env.PORT || 29877
GUACD_PORT = process.env.GUACD || 4822
/**
* Spinup the Guac websocket proxy on port 29877 if guacd is running
* */
var guacServer = new GuacamoleLite(
{ server: http, path: '/guacamole' },
{ host: '127.0.0.1', port: GUACD_PORT },
clientOptions,
clientCallbacks
);
/**
* Helmet helps you secure your Express apps
* */
app.use(helmet());
// Spin up application on port 29877
http.listen(GUAC_PORT, function(){
console.log('listening on *:' + GUAC_PORT);
});

60
src/sunstone/guac/options.js
View File

@ -1,60 +0,0 @@
/**
* CLIENT OPTIONS
*/
var clientOptions = {
crypt: {
cypher: 'AES-256-CBC',
key: 'LSIOGCKYLSIOGCKYLSIOGCKYLSIOGCKY'
},
allowedUnencryptedConnectionSettings: {
rdp: [
'width',
'height',
'dpi'
],
vnc: [
'width',
'height',
'dpi'
],
ssh: [
'color-scheme',
'font-name',
'font-size',
'width',
'height',
'dpi'
],
telnet: [
'color-scheme',
'font-name',
'font-size',
'width',
'height',
'dpi'
]
},
log: { verbose: false }
};
/**
* CALLBACKS
*/
var callbacks = {
processConnectionSettings: function (settings, callback) {
if (settings.expiration && settings.expiration < Date.now()) {
return callback(new Error('Token expired'));
}
//settings.connection['drive-path'] = '/tmp/guacamole_'
//settings.connection['enable-drive'] = false
//settings.connection['create-drive-path'] = false
callback(null, settings);
}
};
module.exports = {
clientOptions,
callbacks
}

21
src/sunstone/guac/package.json
View File

@ -1,21 +0,0 @@
{
"name": "one-guac",
"version": "1.0.0",
"description": "OpenNebula Guacamole Client",
"main": "app.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
"build": "webpack --mode=production app.js"
},
"author": "Sergio Betanzos",
"license": "ISC",
"dependencies": {
"express": "^4.17.1",
"guacamole-lite": "^0.6.2",
"helmet": "^3.23.1"
},
"devDependencies": {
"webpack": "^4.43.0",
"webpack-cli": "^3.3.12"
}
}

13
src/sunstone/guac/webpack.config.js
View File

@ -1,13 +0,0 @@
var path = require('path');
module.exports = {
entry: './app.js',
target: 'node',
output: {
path: path.resolve(__dirname, 'dist'),
filename: 'guac.js'
},
stats: {
warningsFilter: /^(?!CriticalDependenciesWarning$)/
}
};

2
src/sunstone/models/SunstoneServer.rb
View File

@ -309,7 +309,7 @@ class SunstoneServer < CloudServer
return vnc.proxy(resource)
end
########################################################################
########################################################################
# Guacamole
########################################################################
def startguac(id, type_connection, guac)

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

@ -260,10 +260,10 @@ end
#start VNC proxy
$vnc = SunstoneVNC.new($conf, logger)
#init Guacamole server
#init Guacamole proxy
$guac = SunstoneGuac.new(logger)
#init VMRC server
#init VMRC proxy
$vmrc = SunstoneVMRC.new(logger)
configure do