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

fix: obey host ssh.host in config fixes #190

Browse source
This commit is contained in:
Bill Church 2020-09-17 07:55:52 -04:00
parent 8598183b2f
commit 7b7e8e7533
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/server/app.js
View file

@ -118,7 +118,7 @@ var validator = require('validator')
var io = require('socket.io')(server, { serveClient: false, path: '/ssh/socket.io' }) var io = require('socket.io')(server, { serveClient: false, path: '/ssh/socket.io' })
var socket = require('./socket') var socket = require('./socket')
var expressOptions = require('./expressOptions') var expressOptions = require('./expressOptions')
var favicon = require('serve-favicon'); var favicon = require('serve-favicon')
// express // express
app.use(safeShutdownGuard) app.use(safeShutdownGuard)
@ -143,10 +143,10 @@ app.get('/ssh/host/:host?', function (req, res, next) {
res.sendFile(path.join(path.join(publicPath, 'client.htm'))) res.sendFile(path.join(path.join(publicPath, 'client.htm')))
// capture, assign, and validated variables // capture, assign, and validated variables
req.session.ssh = { req.session.ssh = {
host: (validator.isIP(req.params.host + '') && req.params.host) || host: config.ssh.host || (validator.isIP(req.params.host + '') && req.params.host) ||
(validator.isFQDN(req.params.host) && req.params.host) || (validator.isFQDN(req.params.host) && req.params.host) ||
(/^(([a-z]|[A-Z]|[0-9]|[!^(){}\-_~])+)?\w$/.test(req.params.host) && (/^(([a-z]|[A-Z]|[0-9]|[!^(){}\-_~])+)?\w$/.test(req.params.host) &&
req.params.host) || config.ssh.host, req.params.host),
port: (validator.isInt(req.query.port + '', { min: 1, max: 65535 }) && port: (validator.isInt(req.query.port + '', { min: 1, max: 65535 }) &&
req.query.port) || config.ssh.port, req.query.port) || config.ssh.port,
localAddress: config.ssh.localAddress, localAddress: config.ssh.localAddress,