zydronium/enigma-bbs
1
0
Fork 0
mirror of https://github.com/NuSkooler/enigma-bbs.git synced 2025-06-10 06:34:41 +02:00
Code Issues Projects Releases Packages Wiki Activity

* Fix file transfer bug for WebSockets and SSH. Set/restore temp data handler belongs in base client.

Browse source 
* Lint some files
This commit is contained in:
Bryan Ashby 2018-05-12 09:33:41 -06:00
parent b2ae81c59e
commit 388e581b90
4 changed files with 57 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

18
core/servers/login/ssh.js
View file

@ -129,6 +129,10 @@ function SSHClient(clientConn) {
}
});
this.dataHandler = function(data) {
self.emit('data', data);
};
this.updateTermInfo = function(info) {
//
// From ssh2 docs:
@ -167,7 +171,7 @@ function SSHClient(clientConn) {
self.log.info('SSH authentication success');
clientConn.on('session', accept => {
const session = accept();
session.on('pty', function pty(accept, reject, info) {
@ -191,9 +195,7 @@ function SSHClient(clientConn) {
self.setInputOutput(channel.stdin, channel.stdout);
channel.stdin.on('data', data => {
self.emit('data', data);
});
channel.stdin.on('data', self.dataHandler);
if(self.cachedPtyInfo) {
self.updateTermInfo(self.cachedPtyInfo);
@ -207,7 +209,7 @@ function SSHClient(clientConn) {
session.on('window-change', (accept, reject, info) => {
self.log.debug(info, 'SSH window-change event');
self.updateTermInfo(info);
});
@ -237,13 +239,13 @@ exports.getModule = class SSHServerModule extends LoginServerModule {
hostKeys : [
{
key : fs.readFileSync(Config.loginServers.ssh.privateKeyPem),
passphrase : Config.loginServers.ssh.privateKeyPass,
passphrase : Config.loginServers.ssh.privateKeyPass,
}
],
ident : 'enigma-bbs-' + enigVersion + '-srv',
// Note that sending 'banner' breaks at least EtherTerm!
debug : (sshDebugLine) => {
debug : (sshDebugLine) => {
if(true === Config.loginServers.ssh.traceConnections) {
Log.trace(`SSH: ${sshDebugLine}`);
}