bdy 1.9.60-dev → 1.9.61
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 +2 -9
- package/package.json +1 -1
package/distTs/package.json
CHANGED
package/distTs/src/server/ssh.js
CHANGED
|
@@ -91,7 +91,6 @@ 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}`);
|
|
95
94
|
if (!allowed.includes(ctx.method)) {
|
|
96
95
|
ctx.reject(allowed);
|
|
97
96
|
return null;
|
|
@@ -113,7 +112,6 @@ class ServerSsh extends events_1.default {
|
|
|
113
112
|
let privateKey;
|
|
114
113
|
try {
|
|
115
114
|
const resp = await buddy_1.default.fetchAgentKeys(this.agent.id, this.agent.host, this.agent.token);
|
|
116
|
-
logger_js_1.default.debug(resp);
|
|
117
115
|
keys = resp.keys;
|
|
118
116
|
privateKey = resp.privateKey;
|
|
119
117
|
}
|
|
@@ -123,20 +121,15 @@ class ServerSsh extends events_1.default {
|
|
|
123
121
|
}
|
|
124
122
|
const verified = await this.verifyKey(ctx, keys);
|
|
125
123
|
if (!verified) {
|
|
126
|
-
logger_js_1.default.debug('not verified');
|
|
127
124
|
ctx.reject(allowed);
|
|
128
125
|
return null;
|
|
129
126
|
}
|
|
130
|
-
logger_js_1.default.debug('verified');
|
|
131
127
|
try {
|
|
132
128
|
const proxyClient = await this.createProxyConnection(privateKey);
|
|
133
|
-
logger_js_1.default.debug('proxy connected');
|
|
134
129
|
ctx.accept();
|
|
135
130
|
return proxyClient;
|
|
136
131
|
}
|
|
137
|
-
catch
|
|
138
|
-
logger_js_1.default.debug('proxy not connected');
|
|
139
|
-
logger_js_1.default.debug(err);
|
|
132
|
+
catch {
|
|
140
133
|
ctx.reject(allowed);
|
|
141
134
|
return null;
|
|
142
135
|
}
|
|
@@ -333,7 +326,6 @@ class ServerSsh extends events_1.default {
|
|
|
333
326
|
let proxyClient;
|
|
334
327
|
client.setNoDelay();
|
|
335
328
|
client.on('authentication', async (ctx) => {
|
|
336
|
-
logger_js_1.default.debug('ssh authentication');
|
|
337
329
|
proxyClient = await this.authenticateClient(ctx);
|
|
338
330
|
if (proxyClient) {
|
|
339
331
|
proxyClient.on('tcp connection', (details, accept, reject) => {
|
|
@@ -352,6 +344,7 @@ class ServerSsh extends events_1.default {
|
|
|
352
344
|
});
|
|
353
345
|
});
|
|
354
346
|
}
|
|
347
|
+
logger_js_1.default.debug('ssh authentication', !!proxyClient);
|
|
355
348
|
});
|
|
356
349
|
client.on('close', () => {
|
|
357
350
|
logger_js_1.default.debug('ssh close');
|