Fabio/webssh2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source 
# Conflicts:
#	index.js
This commit is contained in:
billchurch 2017-02-01 16:22:59 -05:00
commit 20f67a71d4
1 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
index.js
View file

@ -16,9 +16,30 @@ var ssh = require('ssh2');
var readConfig = require('read-config'), var readConfig = require('read-config'),
config = readConfig(__dirname + '/config.json'); config = readConfig(__dirname + '/config.json');
<<<<<<< HEAD
function logErrors(err, req, res, next) { function logErrors(err, req, res, next) {
console.error(err.stack); console.error(err.stack);
next(err); next(err);
=======
function checkParams(arr) {
return function(req, res, next) {
// Make sure each param listed in arr is present in req.query
var missing_params = [];
for (var i = 0; i < arr.length; i++) {
if (!eval("req.query." + arr[i])) {
missing_params.push(arr[i]);
}
}
if (missing_params.length === 0) {
next();
} else {
next(JSON.stringify({
"error": "query error",
"message": "Parameter(s) missing: " + missing_params.join(",")
}));
}
};
>>>>>>> origin/master
} }
server.listen({ server.listen({
@ -45,9 +66,15 @@ app.use(express.static(__dirname + '/public')).use(function(req, res, next) {
config.user.password = myAuth.pass; config.user.password = myAuth.pass;
next(); next();
} }
<<<<<<< HEAD
}).use(cookieParser()).get('/ssh/host/:host?', function(req, res) { }).use(cookieParser()).get('/ssh/host/:host?', function(req, res) {
res.sendFile(path.join(__dirname + '/public/client.htm')); res.sendFile(path.join(__dirname + '/public/client.htm'));
config.ssh.host = req.params.host; config.ssh.host = req.params.host;
=======
}).get('/', checkParams(["host"]), function(req, res) {
res.sendFile(path.join(__dirname + '/public/client.htm'));
config.ssh.host = req.query.host;
>>>>>>> origin/master
if (typeof req.query.port !== 'undefined' && req.query.port !== null){ config.host.port = req.query.port;} if (typeof req.query.port !== 'undefined' && req.query.port !== null){ config.host.port = req.query.port;}
if (typeof req.query.header !== 'undefined' && req.query.header !== null){ config.header.text = req.query.header;} if (typeof req.query.header !== 'undefined' && req.query.header !== null){ config.header.text = req.query.header;}
if (typeof req.query.headerBackground !== 'undefined' && req.query.headerBackground !== null){ config.header.background = req.query.headerBackground;} if (typeof req.query.headerBackground !== 'undefined' && req.query.headerBackground !== null){ config.header.background = req.query.headerBackground;}