bdy 1.9.59-dev → 1.9.60-dev
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/distTs/package.json +1 -1
- package/distTs/src/server/ssh.js +9 -2
- package/package.json +1 -1
package/distTs/package.json
CHANGED
package/distTs/src/server/ssh.js
CHANGED
|
@@ -91,6 +91,7 @@ class ServerSsh extends events_1.default {
|
|
|
91
91
|
}
|
|
92
92
|
async authenticateClient(ctx) {
|
|
93
93
|
const allowed = ['publickey', 'password'];
|
|
94
|
+
logger_js_1.default.debug(`auth method: ${ctx.method}`);
|
|
94
95
|
if (!allowed.includes(ctx.method)) {
|
|
95
96
|
ctx.reject(allowed);
|
|
96
97
|
return null;
|
|
@@ -112,6 +113,7 @@ class ServerSsh extends events_1.default {
|
|
|
112
113
|
let privateKey;
|
|
113
114
|
try {
|
|
114
115
|
const resp = await buddy_1.default.fetchAgentKeys(this.agent.id, this.agent.host, this.agent.token);
|
|
116
|
+
logger_js_1.default.debug(resp);
|
|
115
117
|
keys = resp.keys;
|
|
116
118
|
privateKey = resp.privateKey;
|
|
117
119
|
}
|
|
@@ -121,15 +123,20 @@ class ServerSsh extends events_1.default {
|
|
|
121
123
|
}
|
|
122
124
|
const verified = await this.verifyKey(ctx, keys);
|
|
123
125
|
if (!verified) {
|
|
126
|
+
logger_js_1.default.debug('not verified');
|
|
124
127
|
ctx.reject(allowed);
|
|
125
128
|
return null;
|
|
126
129
|
}
|
|
130
|
+
logger_js_1.default.debug('verified');
|
|
127
131
|
try {
|
|
128
132
|
const proxyClient = await this.createProxyConnection(privateKey);
|
|
133
|
+
logger_js_1.default.debug('proxy connected');
|
|
129
134
|
ctx.accept();
|
|
130
135
|
return proxyClient;
|
|
131
136
|
}
|
|
132
|
-
catch {
|
|
137
|
+
catch (err) {
|
|
138
|
+
logger_js_1.default.debug('proxy not connected');
|
|
139
|
+
logger_js_1.default.debug(err);
|
|
133
140
|
ctx.reject(allowed);
|
|
134
141
|
return null;
|
|
135
142
|
}
|
|
@@ -326,6 +333,7 @@ class ServerSsh extends events_1.default {
|
|
|
326
333
|
let proxyClient;
|
|
327
334
|
client.setNoDelay();
|
|
328
335
|
client.on('authentication', async (ctx) => {
|
|
336
|
+
logger_js_1.default.debug('ssh authentication');
|
|
329
337
|
proxyClient = await this.authenticateClient(ctx);
|
|
330
338
|
if (proxyClient) {
|
|
331
339
|
proxyClient.on('tcp connection', (details, accept, reject) => {
|
|
@@ -344,7 +352,6 @@ class ServerSsh extends events_1.default {
|
|
|
344
352
|
});
|
|
345
353
|
});
|
|
346
354
|
}
|
|
347
|
-
logger_js_1.default.debug('ssh authentication', !!proxyClient);
|
|
348
355
|
});
|
|
349
356
|
client.on('close', () => {
|
|
350
357
|
logger_js_1.default.debug('ssh close');
|