bdy 1.22.73-dev → 1.22.74-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
CHANGED
|
@@ -164,13 +164,15 @@ class ServerSsh extends events_1.default {
|
|
|
164
164
|
return;
|
|
165
165
|
}
|
|
166
166
|
if (ctx.method === 'publickey') {
|
|
167
|
-
let
|
|
167
|
+
let allKeys;
|
|
168
168
|
let privateKey;
|
|
169
169
|
let user;
|
|
170
170
|
try {
|
|
171
171
|
const resp = await buddy_1.default.fetchAgentKeys(this.agent.id, this.agent.host, this.agent.token);
|
|
172
172
|
logger_1.default.debug(resp);
|
|
173
|
-
keys = resp.
|
|
173
|
+
const keys = resp.keys || [];
|
|
174
|
+
const userKeys = resp.userKeys || [];
|
|
175
|
+
allKeys = [...userKeys, ...keys];
|
|
174
176
|
privateKey = resp.privateKey;
|
|
175
177
|
user = resp.user || 'root';
|
|
176
178
|
}
|
|
@@ -178,7 +180,7 @@ class ServerSsh extends events_1.default {
|
|
|
178
180
|
ctx.reject(allowed);
|
|
179
181
|
return null;
|
|
180
182
|
}
|
|
181
|
-
const verified = await this.verifyKey(ctx,
|
|
183
|
+
const verified = await this.verifyKey(ctx, allKeys);
|
|
182
184
|
if (!verified) {
|
|
183
185
|
logger_1.default.debug('not verified');
|
|
184
186
|
ctx.reject(allowed);
|