From 3237f49700430ccc87e64eb05f5456a9ea975d52 Mon Sep 17 00:00:00 2001 From: Oleg Kurapov Date: Wed, 7 Nov 2018 16:09:56 +0300 Subject: [PATCH] Use SSH wrapper only if no username is known otherwise --- wetty.mjs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wetty.mjs b/wetty.mjs index b5181e1..3981ed0 100644 --- a/wetty.mjs +++ b/wetty.mjs @@ -40,13 +40,14 @@ function getCommand(socket, sshuser, sshhost, sshport, sshauth) { const { request } = socket; const match = request.headers.referer.match('.+/ssh/.+$'); const sshAddress = sshuser ? `${sshuser}@${sshhost}` : sshhost; + const sshPath = sshuser || match ? 'ssh' : path.join(__dirname, 'bin/ssh'); const ssh = match ? `${match[0].split('/ssh/').pop()}@${sshhost}` : sshAddress; return [ process.getuid() === 0 && sshhost === 'localhost' ? ['login', '-h', socket.client.conn.remoteAddress.split(':')[3]] : [ - path.join(__dirname, 'bin/ssh'), + sshPath, ssh, '-p', sshport,