bdy 1.22.65-stage → 1.22.67-master

package/distTs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.22.65-stage",
+  "version": "1.22.67-master",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {

package/distTs/src/tunnel/server/ssh.js

@@ -33,6 +33,7 @@ class ServerSsh extends events_1.default {
     login;
     password;
     server;
+    injected = 0;
     constructor(agent, login, password, hostKey) {
         super();
         this.agent = agent;
@@ -82,8 +83,14 @@ class ServerSsh extends events_1.default {
         this.server = null;
     }
     handleSshTunnel(stream) {
-        if (this.server)
+        if (this.server) {
+            this.injected += 1;
+            logger_1.default.debug(`injectSocket: ${this.injected} concurrent injected connection(s)`);
+            stream.once('close', () => {
+                this.injected -= 1;
+            });
             this.server.injectSocket(stream);
+        }
     }
     checkValueSafe(input, allowed) {
         const autoReject = input.length !== allowed.length;
@@ -95,28 +102,16 @@ class ServerSsh extends events_1.default {
     async verifyKey(ctx, keys) {
         try {
             for (let i = 0; i < keys.length; i += 1) {
-                const key = keys[i];
-                const content = key.content ? key.content : key;
-                const publicKey = ssh2_1.default.utils.parseKey(content);
-                if (publicKey instanceof Error) {
+                const publicKey = ssh2_1.default.utils.parseKey(keys[i]);
+                if (publicKey instanceof Error)
                     continue;
-                }
-                if (ctx.key.algo !== publicKey.type) {
+                if (ctx.key.algo !== publicKey.type)
                     continue;
-                }
-                if (!this.checkValueSafe(ctx.key.data, publicKey.getPublicSSH())) {
+                if (!this.checkValueSafe(ctx.key.data, publicKey.getPublicSSH()))
                     continue;
-                }
                 if (ctx.signature &&
-                    !publicKey.verify(ctx.blob || '', ctx.signature, ctx.hashAlgo)) {
+                    !publicKey.verify(ctx.blob || '', ctx.signature, ctx.hashAlgo))
                     continue;
-                }
-                if (key.name && key.email) {
-                    return {
-                        name: key.name,
-                        email: key.email
-                    };
-                }
                 return true;
             }
         }
@@ -170,7 +165,7 @@ class ServerSsh extends events_1.default {
             try {
                 const resp = await buddy_1.default.fetchAgentKeys(this.agent.id, this.agent.host, this.agent.token);
                 logger_1.default.debug(resp);
-                keys = resp.userKeys || resp.keys;
+                keys = resp.keys;
                 privateKey = resp.privateKey;
                 user = resp.user || 'root';
             }
@@ -189,17 +184,7 @@ class ServerSsh extends events_1.default {
                 const proxyClient = await this.createProxyConnection(privateKey, user);
                 logger_1.default.debug('proxy connected');
                 ctx.accept();
-                const env = {};
-                if (typeof verified === 'object' && verified.name && verified.email) {
-                    env.GIT_AUTHOR_NAME = verified.name;
-                    env.GIT_AUTHOR_EMAIL = verified.email;
-                    env.GIT_COMMITTER_NAME = verified.name;
-                    env.GIT_COMMITTER_EMAIL = verified.email;
-                }
-                return {
-                    proxyClient,
-                    env
-                };
+                return proxyClient;
             }
             catch (err) {
                 logger_1.default.debug('proxy not connected');
@@ -266,8 +251,8 @@ class ServerSsh extends events_1.default {
             stream.end();
         }
     }
-    clientSession(session, client, proxyClient, globalEnv) {
-        let env = globalEnv ? { ...globalEnv } : {};
+    clientSession(session, client, proxyClient) {
+        let env = {};
         let sftp;
         let channel;
         let pty;
@@ -470,14 +455,11 @@ class ServerSsh extends events_1.default {
     processClient(client) {
         logger_1.default.debug('new ssh client');
         let proxyClient;
-        let globalEnv = {};
         client.setNoDelay();
         client.on('authentication', async (ctx) => {
             logger_1.default.debug('ssh authentication');
-            const ac = await this.authenticateClient(ctx);
-            if (ac) {
-                proxyClient = ac.proxyClient;
-                globalEnv = ac.env;
+            proxyClient = await this.authenticateClient(ctx);
+            if (proxyClient) {
                 proxyClient.on('tcp connection', (details, accept, reject) => {
                     logger_1.default.debug('new ssh client forward connection');
                     logger_1.default.debug(details);
@@ -581,7 +563,7 @@ class ServerSsh extends events_1.default {
         });
         client.on('session', (accept) => {
             logger_1.default.debug('ssh session');
-            this.clientSession(accept(), client, proxyClient, globalEnv);
+            this.clientSession(accept(), client, proxyClient);
         });
     }
 }

package/distTs/src/tunnel/ssh/client.js

@@ -15,6 +15,7 @@ class SshClient extends events_1.default {
     password;
     keepalive;
     client;
+    lastError;
     constructor(ip, port, username, password) {
         super();
         this.ip = ip;
@@ -30,9 +31,13 @@ class SshClient extends events_1.default {
             this.client = new ssh2_1.Client();
             this.client.setNoDelay();
             this.client.on('ready', () => {
+                this.lastError = null;
                 if (this.client) {
                     this.client.removeAllListeners();
-                    this.client.on('error', () => { });
+                    this.client.on('error', (err) => {
+                        this.lastError = err;
+                        logger_1.default.debug(`SSH client transport error: ${err?.message}`);
+                    });
                 }
                 resolve();
             });
@@ -51,6 +56,7 @@ class SshClient extends events_1.default {
                         kex: ['ecdh-sha2-nistp256'],
                     },
                     keepaliveInterval: 10000,
+                    keepaliveCountMax: 6,
                     host: this.ip,
                     port: this.port,
                     username: this.username,
@@ -67,16 +73,19 @@ class SshClient extends events_1.default {
             s.once('readable', resolve);
         });
     }
-    async readStreamBytes(s, toRead) {
+    async readStreamBytes(s, toRead, reads = 0) {
         await this.waitForStreamReadable(s);
         const data = s.read(toRead) ?? s.read();
         if (data === null) {
-            return this.readStreamBytes(s, toRead);
+            return this.readStreamBytes(s, toRead, reads + 1);
         }
         const newToRead = toRead - data.length;
-        if (newToRead <= 0)
+        if (newToRead <= 0) {
+            if (reads > 0)
+                logger_1.default.debug(`handshake read took ${reads + 1} reads`);
             return data;
-        const newData = await this.readStreamBytes(s, newToRead);
+        }
+        const newData = await this.readStreamBytes(s, newToRead, reads + 1);
         return Buffer.concat([data, newData]);
     }
     async processStream(stream, info) {
@@ -144,6 +153,7 @@ class SshClient extends events_1.default {
         }
         if (type === tunnel_1.TUNNEL_SOCKET_TYPE.SSH) {
             logger_1.default.debug((0, texts_1.LOG_DETECTED_STREAM)('SSH'));
+            logger_1.default.debug(`SSH handoff: ${stream.readableLength} leftover bytes buffered at injectSocket`);
             triggerStream(tunnel_1.TUNNEL_SSH_EVENT.STREAM_SSH, ip);
             return;
         }
@@ -179,7 +189,7 @@ class SshClient extends events_1.default {
             this.emit(tunnel_1.TUNNEL_SSH_EVENT.CONNECTED);
             if (this.client) {
                 this.client.on('close', () => {
-                    logger_1.default.debug(`SSH client closed`);
+                    logger_1.default.debug(`SSH client closed (reason: ${this.lastError?.message || 'clean close / no transport error'})`);
                     if (this.keepalive)
                         this.openKeepAlive();
                 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.22.65-stage",
+  "version": "1.22.67-master",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {