From 7b7e8e753358ed48f52eb9aa2fc359bf758f304b Mon Sep 17 00:00:00 2001 From: Bill Church Date: Thu, 17 Sep 2020 07:55:52 -0400 Subject: [PATCH] fix: obey host ssh.host in config fixes #190 --- app/server/app.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/server/app.js b/app/server/app.js index 3e76f38..1aad6f9 100644 --- a/app/server/app.js +++ b/app/server/app.js @@ -118,7 +118,7 @@ var validator = require('validator') var io = require('socket.io')(server, { serveClient: false, path: '/ssh/socket.io' }) var socket = require('./socket') var expressOptions = require('./expressOptions') -var favicon = require('serve-favicon'); +var favicon = require('serve-favicon') // express 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'))) // capture, assign, and validated variables 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) || (/^(([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 }) && req.query.port) || config.ssh.port, localAddress: config.ssh.localAddress,