bdy 1.9.22-dev → 1.9.24-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 +29 -11
- package/package.json +1 -1
package/distTs/package.json
CHANGED
package/distTs/src/server/ssh.js
CHANGED
|
@@ -41,29 +41,21 @@ class ServerSsh extends events_1.default {
|
|
|
41
41
|
}
|
|
42
42
|
async verifyKey(ctx) {
|
|
43
43
|
try {
|
|
44
|
-
logger_js_1.default.info('1');
|
|
45
44
|
const { keys } = await buddy_1.default.fetchAgentKeys(this.agent.id, this.agent.host, this.agent.token);
|
|
46
45
|
for (let i = 0; i < keys.length; i += 1) {
|
|
47
|
-
logger_js_1.default.info('2');
|
|
48
46
|
const publicKey = ssh2_1.default.utils.parseKey(keys[i]);
|
|
49
47
|
if (ctx.key.algo !== publicKey.type)
|
|
50
48
|
continue;
|
|
51
|
-
logger_js_1.default.info('3');
|
|
52
49
|
if (!this.checkValueSafe(ctx.key.data, publicKey.getPublicSSH()))
|
|
53
50
|
continue;
|
|
54
|
-
|
|
55
|
-
if (ctx.signature && !publicKey.verify(ctx.blob, ctx.signature))
|
|
51
|
+
if (ctx.signature && !publicKey.verify(ctx.blob, ctx.signature, ctx.hashAlgo))
|
|
56
52
|
continue;
|
|
57
|
-
logger_js_1.default.info('5');
|
|
58
53
|
return true;
|
|
59
54
|
}
|
|
60
55
|
}
|
|
61
|
-
catch
|
|
62
|
-
logger_js_1.default.info('6');
|
|
63
|
-
logger_js_1.default.info(err);
|
|
56
|
+
catch {
|
|
64
57
|
// do nothing
|
|
65
58
|
}
|
|
66
|
-
logger_js_1.default.info('7');
|
|
67
59
|
return false;
|
|
68
60
|
}
|
|
69
61
|
processClient(client) {
|
|
@@ -88,7 +80,6 @@ class ServerSsh extends events_1.default {
|
|
|
88
80
|
}
|
|
89
81
|
if (ctx.method === 'publickey') {
|
|
90
82
|
const verified = await this.verifyKey(ctx);
|
|
91
|
-
logger_js_1.default.info(`verified: ${verified}`);
|
|
92
83
|
if (!verified) {
|
|
93
84
|
ctx.reject();
|
|
94
85
|
return;
|
|
@@ -122,6 +113,33 @@ class ServerSsh extends events_1.default {
|
|
|
122
113
|
};
|
|
123
114
|
session.on('close', closeSession);
|
|
124
115
|
session.on('end', closeSession);
|
|
116
|
+
// session.on('pty', (accept, reject, info) => {
|
|
117
|
+
// reject();
|
|
118
|
+
// const { term, cols, height, modes, rows, width } = info;
|
|
119
|
+
// });
|
|
120
|
+
// session.on('window-change', (accept, reject, info) => {
|
|
121
|
+
// const { cols, height, rows, width } = info;
|
|
122
|
+
// });
|
|
123
|
+
session.on('shell', (accept) => {
|
|
124
|
+
logger_js_1.default.info('s1');
|
|
125
|
+
if (!accept)
|
|
126
|
+
return;
|
|
127
|
+
const stream = accept();
|
|
128
|
+
logger_js_1.default.info('s2');
|
|
129
|
+
const proc = (0, child_process_1.spawn)('/bin/bash', {
|
|
130
|
+
env: session.env,
|
|
131
|
+
});
|
|
132
|
+
logger_js_1.default.info('s3');
|
|
133
|
+
proc.stdout.pipe(stream);
|
|
134
|
+
proc.stderr.pipe(stream.stderr);
|
|
135
|
+
stream.pipe(proc.stdin);
|
|
136
|
+
proc.on('close', (code) => {
|
|
137
|
+
logger_js_1.default.info('s5');
|
|
138
|
+
stream.exit(code);
|
|
139
|
+
stream.end();
|
|
140
|
+
});
|
|
141
|
+
logger_js_1.default.info('s4');
|
|
142
|
+
});
|
|
125
143
|
session.on('exec', (accept, reject, info) => {
|
|
126
144
|
logger_js_1.default.debug('sftp exec');
|
|
127
145
|
const s = process.hrtime();
|