delinting

This commit is contained in:
billchurch 2017-05-19 21:19:41 -04:00
parent efb48ab711
commit c4a78fb1d7
3 changed files with 25 additions and 27 deletions

View file

@ -11,7 +11,6 @@ var path = require('path')
var SSH = require('ssh2').Client
var config = require('read-config')(path.join(__dirname, 'config.json'))
var debug = require('debug')
var dataBuffer = ''
var util = require('./util')
var session = require('express-session')({
secret: config.session.secret,
@ -19,7 +18,9 @@ var session = require('express-session')({
resave: true,
saveUninitialized: false
})
var LogPrefix, termCols, termRows, myError
var termCols, termRows, myError
// var LogPrefix
// var dataBuffer = ''
var expressOptions = {
dotfiles: 'ignore',
@ -73,7 +74,7 @@ app.get('/ssh/host/:host?', function (req, res, next) {
config.header.text = req.query.header || config.header.text
config.header.background = req.query.headerBackground || config.header.background
console.log('webssh2 Login: user=' + req.session.username + ' from=' + req.ip + ' host=' + config.ssh.host + ' port=' + config.ssh.port + ' sessionID=' + req.sessionID + ' allowreplay=' + req.headers.allowreplay)
LogPrefix = req.session.username + '@' + req.ip + ' ssh://' + config.ssh.host + ':' + config.ssh.port + '/' + req.sessionID
// LogPrefix = req.session.username + '@' + req.ip + ' ssh://' + config.ssh.host + ':' + config.ssh.port + '/' + req.sessionID
// console.log('Headers: ' + JSON.stringify(req.headers))
config.options.allowreplay = req.headers.allowreplay
})
@ -111,7 +112,7 @@ io.on('connection', function (socket) {
socket.emit('status', 'SSH CONNECTION ESTABLISHED')
socket.emit('statusBackground', config.header.background)
socket.emit('allowreplay', config.options.allowreplay)
conn.shell({
term: config.ssh.term,
cols: termCols,
@ -184,7 +185,7 @@ io.on('connection', function (socket) {
console.log('Connection :: keyboard-interactive')
finish([socket.request.session.userpassword])
})
if (socket.request.session.username && socket.request.session.userpassword) {
if (socket.request.session.username && socket.request.session.userpassword) {
conn.connect({
host: config.ssh.host,
port: config.ssh.port,

View file

@ -1,7 +1,5 @@
var sessionLog,
sessionLogEnable = false,
sessionFooter,
logDate
var sessionLogEnable = false
var sessionLog, sessionFooter, logDate, currentDate, myFile
// replay password to server, requires
function replayCredentials () {
@ -56,21 +54,20 @@ function downloadLog () {
document.getElementById('downloadLog').style.display = 'none'
document.getElementById('credentials').style.display = 'none'
var terminalContainer = document.getElementById('terminal-container'),
term = new Terminal({
cursorBlink: true
}),
socket,
termid
var terminalContainer = document.getElementById('terminal-container')
var term = new Terminal({
cursorBlink: true
})
var socket, termid
term.open(terminalContainer, {
focus: true
})
term.fit()
if (document.location.pathname) {
var parts = document.location.pathname.split('/'),
base = parts.slice(0, parts.length - 1).join('/') + '/',
resource = base.substring(1) + 'socket.io'
var parts = document.location.pathname.split('/')
var base = parts.slice(0, parts.length - 1).join('/') + '/'
var resource = base.substring(1) + 'socket.io'
socket = io.connect(null, {
resource: resource
})

View file

@ -1,16 +1,16 @@
var colors = require('colors');
var colors = require('colors')
var Auth = require('basic-auth')
console.warn = makeColorConsole(console.warn, 'yellow')
console.error = makeColorConsole(console.error, 'red')
function makeColorConsole(fct, color){
return function(){
for (var i in arguments)
if (arguments[i] instanceof Object)
arguments[i] = sys.inspect(arguments[i]);
fct(Array.prototype.join.call(arguments," ")[color]);
};
function makeColorConsole (fct, color) {
return function () {
for (var i in arguments) {
if (arguments[i] instanceof Object) { arguments[i] = sys.inspect(arguments[i]) }
}
fct(Array.prototype.join.call(arguments, ' ')[color])
}
}
exports.basicAuth = function (req, res, next) {
@ -24,4 +24,4 @@ exports.basicAuth = function (req, res, next) {
res.setHeader('WWW-Authenticate', 'Basic realm="WebSSH"')
res.end('Username and password required for web SSH service.')
}
}
}