delinting
This commit is contained in:
parent
efb48ab711
commit
c4a78fb1d7
3 changed files with 25 additions and 27 deletions
11
index.js
11
index.js
|
@ -11,7 +11,6 @@ var path = require('path')
|
||||||
var SSH = require('ssh2').Client
|
var SSH = require('ssh2').Client
|
||||||
var config = require('read-config')(path.join(__dirname, 'config.json'))
|
var config = require('read-config')(path.join(__dirname, 'config.json'))
|
||||||
var debug = require('debug')
|
var debug = require('debug')
|
||||||
var dataBuffer = ''
|
|
||||||
var util = require('./util')
|
var util = require('./util')
|
||||||
var session = require('express-session')({
|
var session = require('express-session')({
|
||||||
secret: config.session.secret,
|
secret: config.session.secret,
|
||||||
|
@ -19,7 +18,9 @@ var session = require('express-session')({
|
||||||
resave: true,
|
resave: true,
|
||||||
saveUninitialized: false
|
saveUninitialized: false
|
||||||
})
|
})
|
||||||
var LogPrefix, termCols, termRows, myError
|
var termCols, termRows, myError
|
||||||
|
// var LogPrefix
|
||||||
|
// var dataBuffer = ''
|
||||||
|
|
||||||
var expressOptions = {
|
var expressOptions = {
|
||||||
dotfiles: 'ignore',
|
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.text = req.query.header || config.header.text
|
||||||
config.header.background = req.query.headerBackground || config.header.background
|
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)
|
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))
|
// console.log('Headers: ' + JSON.stringify(req.headers))
|
||||||
config.options.allowreplay = req.headers.allowreplay
|
config.options.allowreplay = req.headers.allowreplay
|
||||||
})
|
})
|
||||||
|
@ -111,7 +112,7 @@ io.on('connection', function (socket) {
|
||||||
socket.emit('status', 'SSH CONNECTION ESTABLISHED')
|
socket.emit('status', 'SSH CONNECTION ESTABLISHED')
|
||||||
socket.emit('statusBackground', config.header.background)
|
socket.emit('statusBackground', config.header.background)
|
||||||
socket.emit('allowreplay', config.options.allowreplay)
|
socket.emit('allowreplay', config.options.allowreplay)
|
||||||
|
|
||||||
conn.shell({
|
conn.shell({
|
||||||
term: config.ssh.term,
|
term: config.ssh.term,
|
||||||
cols: termCols,
|
cols: termCols,
|
||||||
|
@ -184,7 +185,7 @@ io.on('connection', function (socket) {
|
||||||
console.log('Connection :: keyboard-interactive')
|
console.log('Connection :: keyboard-interactive')
|
||||||
finish([socket.request.session.userpassword])
|
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({
|
conn.connect({
|
||||||
host: config.ssh.host,
|
host: config.ssh.host,
|
||||||
port: config.ssh.port,
|
port: config.ssh.port,
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
var sessionLog,
|
var sessionLogEnable = false
|
||||||
sessionLogEnable = false,
|
var sessionLog, sessionFooter, logDate, currentDate, myFile
|
||||||
sessionFooter,
|
|
||||||
logDate
|
|
||||||
|
|
||||||
// replay password to server, requires
|
// replay password to server, requires
|
||||||
function replayCredentials () {
|
function replayCredentials () {
|
||||||
|
@ -56,21 +54,20 @@ function downloadLog () {
|
||||||
document.getElementById('downloadLog').style.display = 'none'
|
document.getElementById('downloadLog').style.display = 'none'
|
||||||
document.getElementById('credentials').style.display = 'none'
|
document.getElementById('credentials').style.display = 'none'
|
||||||
|
|
||||||
var terminalContainer = document.getElementById('terminal-container'),
|
var terminalContainer = document.getElementById('terminal-container')
|
||||||
term = new Terminal({
|
var term = new Terminal({
|
||||||
cursorBlink: true
|
cursorBlink: true
|
||||||
}),
|
})
|
||||||
socket,
|
var socket, termid
|
||||||
termid
|
|
||||||
term.open(terminalContainer, {
|
term.open(terminalContainer, {
|
||||||
focus: true
|
focus: true
|
||||||
})
|
})
|
||||||
term.fit()
|
term.fit()
|
||||||
|
|
||||||
if (document.location.pathname) {
|
if (document.location.pathname) {
|
||||||
var parts = document.location.pathname.split('/'),
|
var parts = document.location.pathname.split('/')
|
||||||
base = parts.slice(0, parts.length - 1).join('/') + '/',
|
var base = parts.slice(0, parts.length - 1).join('/') + '/'
|
||||||
resource = base.substring(1) + 'socket.io'
|
var resource = base.substring(1) + 'socket.io'
|
||||||
socket = io.connect(null, {
|
socket = io.connect(null, {
|
||||||
resource: resource
|
resource: resource
|
||||||
})
|
})
|
||||||
|
|
|
@ -1,16 +1,16 @@
|
||||||
var colors = require('colors');
|
var colors = require('colors')
|
||||||
var Auth = require('basic-auth')
|
var Auth = require('basic-auth')
|
||||||
|
|
||||||
console.warn = makeColorConsole(console.warn, 'yellow')
|
console.warn = makeColorConsole(console.warn, 'yellow')
|
||||||
console.error = makeColorConsole(console.error, 'red')
|
console.error = makeColorConsole(console.error, 'red')
|
||||||
|
|
||||||
function makeColorConsole(fct, color){
|
function makeColorConsole (fct, color) {
|
||||||
return function(){
|
return function () {
|
||||||
for (var i in arguments)
|
for (var i in arguments) {
|
||||||
if (arguments[i] instanceof Object)
|
if (arguments[i] instanceof Object) { arguments[i] = sys.inspect(arguments[i]) }
|
||||||
arguments[i] = sys.inspect(arguments[i]);
|
}
|
||||||
fct(Array.prototype.join.call(arguments," ")[color]);
|
fct(Array.prototype.join.call(arguments, ' ')[color])
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
exports.basicAuth = function (req, res, next) {
|
exports.basicAuth = function (req, res, next) {
|
||||||
|
@ -24,4 +24,4 @@ exports.basicAuth = function (req, res, next) {
|
||||||
res.setHeader('WWW-Authenticate', 'Basic realm="WebSSH"')
|
res.setHeader('WWW-Authenticate', 'Basic realm="WebSSH"')
|
||||||
res.end('Username and password required for web SSH service.')
|
res.end('Username and password required for web SSH service.')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue