moon
/
enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #415 from NuSkooler/ssh-server-updates-with-ssh2 

Ssh server updates with ssh2
This commit is contained in:
Bryan Ashby 2022-04-08 17:03:30 -06:00 committed by GitHub
parent 23d6f85500 8283971b53
commit 9ff0dfce1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UPGRADE.md
View File

@ -30,7 +30,7 @@ Report your issue on Xibalba BBS, hop in #enigma-bbs on FreeNode and chat, or
# 0.0.12-beta to 0.0.13-beta # 0.0.12-beta to 0.0.13-beta
* :exclamation: The SSH server's `ssh2` module has gone through a major upgrade. Existing users will need to comment out two SSH KEX algorithms from their `config.hjson` if present else clients such as NetRunner will not be able to connect over SSH. Comment out `diffie-hellman-group-exchange-sha256` and `diffie-hellman-group-exchange-sha1`
* All features and changes are backwards compatible. There are a few new configuration options in a new `term` section in the configuration. These are all optional, but include the following options in case you use them: * All features and changes are backwards compatible. There are a few new configuration options in a new `term` section in the configuration. These are all optional, but include the following options in case you use them:
```hjson ```hjson

5
core/config_default.js
View File

@ -184,10 +184,11 @@ module.exports = () => {
'ecdh-sha2-nistp256', 'ecdh-sha2-nistp256',
'ecdh-sha2-nistp384', 'ecdh-sha2-nistp384',
'ecdh-sha2-nistp521', 'ecdh-sha2-nistp521',
'diffie-hellman-group-exchange-sha256',
'diffie-hellman-group14-sha1', 'diffie-hellman-group14-sha1',
'diffie-hellman-group-exchange-sha1',
'diffie-hellman-group1-sha1', 'diffie-hellman-group1-sha1',
// Group exchange not currnetly supported
// 'diffie-hellman-group-exchange-sha256',
// 'diffie-hellman-group-exchange-sha1',
], ],
cipher : [ cipher : [
'aes128-ctr', 'aes128-ctr',

6
core/servers/login/ssh.js
View File

@ -357,9 +357,11 @@ exports.getModule = class SSHServerModule extends LoginServerModule {
// However, as of this writing, NetRunner and SyncTERM both // However, as of this writing, NetRunner and SyncTERM both
// fail to respond to OpenSSH keep-alive pings (keepalive@openssh.com) // fail to respond to OpenSSH keep-alive pings (keepalive@openssh.com)
// //
ssh2.Server.KEEPALIVE_INTERVAL = 0; // See also #399
//
ssh2.Server.KEEPALIVE_CLIENT_INTERVAL = 0;
this.server = ssh2.Server(serverConf); this.server = new ssh2.Server(serverConf);
this.server.on('connection', (conn, info) => { this.server.on('connection', (conn, info) => {
Log.info(info, 'New SSH connection'); Log.info(info, 'New SSH connection');
this.handleNewClient(new SSHClient(conn), conn._sock, ModuleInfo); this.handleNewClient(new SSHClient(conn), conn._sock, ModuleInfo);

2
package.json
View File

@ -52,7 +52,7 @@
"sanitize-filename": "^1.6.3", "sanitize-filename": "^1.6.3",
"sqlite3": "^4.2.0", "sqlite3": "^4.2.0",
"sqlite3-trans": "^1.2.2", "sqlite3-trans": "^1.2.2",
"ssh2": "0.8.9", "ssh2": "^1.9.0",
"telnet-socket": "^0.2.3", "telnet-socket": "^0.2.3",
"temptmp": "^1.1.0", "temptmp": "^1.1.0",
"uuid": "8.3.2", "uuid": "8.3.2",