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

chore: removed compression option code, standardjs

Browse source
This commit is contained in:
Bill Church 2020-03-14 13:13:42 -04:00
parent fcfa6874cd
commit 80c48055fe
3 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/server/app.js
View file

@ -110,17 +110,15 @@ var session = require('express-session')({
unset: 'destroy' unset: 'destroy'
}) })
var app = express() var app = express()
var compression = require('compression')
var server = require('http').Server(app) var server = require('http').Server(app)
var myutil = require('./util') var myutil = require('./util')
myutil.setDefaultCredentials(config.user.name, config.user.password, config.user.privatekey); myutil.setDefaultCredentials(config.user.name, config.user.password, config.user.privatekey)
var validator = require('validator') 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')
// express // express
app.use(compression({ level: 9 }))
app.use(session) app.use(session)
app.use(myutil.basicAuth) app.use(myutil.basicAuth)
if (config.accesslog) app.use(logger('common')) if (config.accesslog) app.use(logger('common'))

6
app/server/socket.js
View file

@ -7,7 +7,7 @@
var debug = require('debug') var debug = require('debug')
var debugWebSSH2 = require('debug')('WebSSH2') var debugWebSSH2 = require('debug')('WebSSH2')
var SSH = require('ssh2').Client var SSH = require('ssh2').Client
var CIDRMatcher = require('cidr-matcher'); var CIDRMatcher = require('cidr-matcher')
// var fs = require('fs') // var fs = require('fs')
// var hostkeys = JSON.parse(fs.readFileSync('./hostkeyhashes.json', 'utf8')) // var hostkeys = JSON.parse(fs.readFileSync('./hostkeyhashes.json', 'utf8'))
var termCols, termRows var termCols, termRows
@ -25,8 +25,8 @@ module.exports = function socket (socket) {
} }
// If configured, check that requsted host is in a permitted subnet // If configured, check that requsted host is in a permitted subnet
if ( (((socket.request.session || {}).ssh || {}).allowedSubnets || {}).length && ( socket.request.session.ssh.allowedSubnets.length > 0 ) ) { if ((((socket.request.session || {}).ssh || {}).allowedSubnets || {}).length && (socket.request.session.ssh.allowedSubnets.length > 0)) {
var matcher = new CIDRMatcher(socket.request.session.ssh.allowedSubnets); var matcher = new CIDRMatcher(socket.request.session.ssh.allowedSubnets)
if (!matcher.contains(socket.request.session.ssh.host)) { if (!matcher.contains(socket.request.session.ssh.host)) {
console.log('WebSSH2 ' + 'error: Requested host outside configured subnets / REJECTED'.red.bold + console.log('WebSSH2 ' + 'error: Requested host outside configured subnets / REJECTED'.red.bold +
' user=' + socket.request.session.username.yellow.bold.underline + ' user=' + socket.request.session.username.yellow.bold.underline +

16
app/server/util.js
View file

@ -7,12 +7,12 @@ require('colors') // allow for color property extensions in log messages
var debug = require('debug')('WebSSH2') var debug = require('debug')('WebSSH2')
var Auth = require('basic-auth') var Auth = require('basic-auth')
let defaultCredentials = {username: null, password: null, privatekey: null}; const defaultCredentials = { username: null, password: null, privatekey: null }
exports.setDefaultCredentials = function (username, password, privatekey) { exports.setDefaultCredentials = function (username, password, privatekey) {
defaultCredentials.username = username defaultCredentials.username = username
defaultCredentials.password = password defaultCredentials.password = password
defaultCredentials.privatekey = privatekey defaultCredentials.privatekey = privatekey
} }
exports.basicAuth = function basicAuth (req, res, next) { exports.basicAuth = function basicAuth (req, res, next) {
@ -24,11 +24,11 @@ exports.basicAuth = function basicAuth (req, res, next) {
' and password ' + ((myAuth.pass) ? 'exists'.yellow.bold.underline ' and password ' + ((myAuth.pass) ? 'exists'.yellow.bold.underline
: 'is blank'.underline.red.bold)) : 'is blank'.underline.red.bold))
} else { } else {
req.session.username = defaultCredentials.username; req.session.username = defaultCredentials.username
req.session.userpassword = defaultCredentials.password; req.session.userpassword = defaultCredentials.password
req.session.privatekey = defaultCredentials.privatekey; req.session.privatekey = defaultCredentials.privatekey
} }
if ( (!req.session.userpassword) && (!req.session.privatekey) ) { if ((!req.session.userpassword) && (!req.session.privatekey)) {
res.statusCode = 401 res.statusCode = 401
debug('basicAuth credential request (401)') debug('basicAuth credential request (401)')
res.setHeader('WWW-Authenticate', 'Basic realm="WebSSH"') res.setHeader('WWW-Authenticate', 'Basic realm="WebSSH"')