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

fixed error message status overwriting

Browse source 
Fixed issue where error message would be overwritten in status bar as
websocket connection is closed. Added additional logging elements in
some events.
This commit is contained in:
billchurch 2017-02-10 10:56:11 -05:00
parent e06d2570ae
commit 9ebd56ddb9
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
index.js
View file

@ -15,6 +15,7 @@ var basicAuth = require('basic-auth');
var ssh = require('ssh2');
var readConfig = require('read-config'),
config = readConfig(__dirname + '/config.json');
var myError = " - ";
function logErrors(err, req, res, next) {
console.error(err.stack);
@ -76,7 +77,11 @@ io.on('connection', function(socket) {
socket.emit('statusBackground', 'green');
socket.emit('allowreplay', config.options.allowreplay)
conn.shell(function(err, stream) {
if (err) return socket.emit('status', 'SSH EXEC ERROR: ' + err.message).emit('statusBackground', 'red');
if (err) {
console.log (err.message);
myError = myError + err.message
return socket.emit('status', 'SSH EXEC ERROR: ' + err.message).emit('statusBackground', 'red');
}
socket.on('data', function(data) {
stream.write(data);
});
@ -90,19 +95,24 @@ io.on('connection', function(socket) {
});
stream.on('data', function(d) {
socket.emit('data', d.toString('binary'));
}).on('close', function() {
}).on('close', function(code, signal) {
console.log('Stream :: close :: code: ' + code + ', signal: ' + signal);
conn.end();
}).stderr.on('data', function(data) {
console.log('STDERR: ' + data);
});
});
}).on('end', function() {
socket.emit('status', 'SSH CONNECTION CLOSED BY HOST');
socket.emit('status', 'SSH CONNECTION CLOSED BY HOST' + myError);
socket.emit('statusBackground', 'red');
}).on('close', function() {
socket.emit('status', 'SSH CONNECTION CLOSED');
socket.emit('status', 'SSH CONNECTION CLOSE' + myError);
socket.emit('statusBackground', 'red');
}).on('error', function(error) {
socket.emit('status', 'SSH CONNECTION ERROR - ' + error);
}).on('error', function(err) {
myError = myError + err
socket.emit('status', 'SSH CONNECTION ERROR' + myError);
socket.emit('statusBackground', 'red');
console.log('on.error' + myError);
}).on('keyboard-interactive', function(name, instructions, instructionsLang, prompts, finish) {
console.log('Connection :: keyboard-interactive');
finish([config.user.password]);