[#42] Follow doSecure approach for SSH connections

pull/42/head
Manuel de la Peña 2015-02-23 20:03:25 +01:00
parent 3909011c1c
commit 1d8fb184c3
2 changed files with 12 additions and 11 deletions

View File

@ -26,25 +26,17 @@ if (program.args.length === 0) {
*/
var doAuthorization = !!(program.user && program.password);
var doSecure = !!(program.key && program.certificate);
var doSSH = (program.remoteHost);
var sessionSecret = String(+new Date()) + Math.random();
var sessionKey = 'sid';
var files = program.args.join(' ');
var filesNamespace = crypto.createHash('md5').update(files).digest('hex');
/**
* When connected send starting data
*/
var sshOptions = {
remoteHost: program.remoteHost,
remoteUser: program.remoteUser,
remotePort: program.remotePort
};
if (program.daemonize) {
daemonize(__filename, program, {
doAuthorization: doAuthorization,
doSecure: doSecure,
sshOptions: sshOptions
doSSH: doSSH
});
} else {
/**
@ -98,6 +90,15 @@ if (program.daemonize) {
highlightConfig = require(path.resolve(configPath));
}
/**
* When connected send starting data
*/
var sshOptions = {
remoteHost: program.remoteHost,
remoteUser: program.remoteUser,
remotePort: program.remotePort
};
var tailer = tail(program.args, {buffer: program.number, sshOptions:sshOptions});
var filesSocket = io.of('/' + filesNamespace).on('connection', function (socket) {
socket.emit('options:lines', program.lines);

View File

@ -35,7 +35,7 @@ module.exports = function (script, params, options) {
);
}
if (options.sshOptions) {
if (options.doSSH) {
args.push(
'--remote-host', params.remoteHost,
'--remote-user', params.remoteUser,