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

feat: reorder viewport setup at ssh handshake #292

Browse source
This commit is contained in:
Bill Church 2022-07-30 20:49:20 +00:00
parent 2289c6736b
commit 140e1e24b1
3 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/package-lock.json generated
View file

@ -1,12 +1,12 @@
{ {
"name": "webssh2", "name": "webssh2",
"version": "0.4.7-alpha.0", "version": "0.4.7-alpha.1",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "webssh2", "name": "webssh2",
"version": "0.4.7-alpha.0", "version": "0.4.7-alpha.1",
"license": "SEE LICENSE IN FILE - LICENSE", "license": "SEE LICENSE IN FILE - LICENSE",
"dependencies": { "dependencies": {
"basic-auth": "~2.0.1", "basic-auth": "~2.0.1",

2
app/package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "webssh2", "name": "webssh2",
"version": "0.4.7-alpha.0", "version": "0.4.7-alpha.1",
"ignore": [ "ignore": [
".gitignore" ".gitignore"
], ],

23
app/server/socket.js
View file

@ -105,16 +105,7 @@ module.exports = function appSocket(socket) {
socket.emit('data', data.replace(/\r?\n/g, '\r\n').toString('utf-8')); socket.emit('data', data.replace(/\r?\n/g, '\r\n').toString('utf-8'));
}); });
conn.on('ready', () => { conn.on('handshake', (data => {
webssh2debug(
socket,
`CONN READY: LOGIN: user=${socket.request.session.username} from=${socket.handshake.address} host=${socket.request.session.ssh.host} port=${socket.request.session.ssh.port} allowreplay=${socket.request.session.ssh.allowreplay} term=${socket.request.session.ssh.term}`
);
auditLog(
socket,
`LOGIN user=${socket.request.session.username} from=${socket.handshake.address} host=${socket.request.session.ssh.host}:${socket.request.session.ssh.port}`
);
login = true;
socket.emit('setTerminalOpts', socket.request.session.ssh.terminal); socket.emit('setTerminalOpts', socket.request.session.ssh.terminal);
socket.emit('menu'); socket.emit('menu');
socket.emit('allowreauth', socket.request.session.ssh.allowreauth); socket.emit('allowreauth', socket.request.session.ssh.allowreauth);
@ -127,6 +118,18 @@ module.exports = function appSocket(socket) {
'footer', 'footer',
`ssh://${socket.request.session.username}@${socket.request.session.ssh.host}:${socket.request.session.ssh.port}` `ssh://${socket.request.session.username}@${socket.request.session.ssh.host}:${socket.request.session.ssh.port}`
); );
}));
conn.on('ready', () => {
webssh2debug(
socket,
`CONN READY: LOGIN: user=${socket.request.session.username} from=${socket.handshake.address} host=${socket.request.session.ssh.host} port=${socket.request.session.ssh.port} allowreplay=${socket.request.session.ssh.allowreplay} term=${socket.request.session.ssh.term}`
);
auditLog(
socket,
`LOGIN user=${socket.request.session.username} from=${socket.handshake.address} host=${socket.request.session.ssh.host}:${socket.request.session.ssh.port}`
);
login = true;
socket.emit('status', 'SSH CONNECTION ESTABLISHED'); socket.emit('status', 'SSH CONNECTION ESTABLISHED');
socket.emit('statusBackground', 'green'); socket.emit('statusBackground', 'green');
socket.emit('allowreplay', socket.request.session.ssh.allowreplay); socket.emit('allowreplay', socket.request.session.ssh.allowreplay);