yuangs 5.2.0 → 5.4.0
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/dist/commands/ssh/index.js +21 -10
- package/dist/commands/ssh/index.js.map +1 -1
- package/dist/ssh/GovernedExecutor.d.ts +5 -1
- package/dist/ssh/GovernedExecutor.js +31 -6
- package/dist/ssh/GovernedExecutor.js.map +1 -1
- package/dist/ssh/InputBuffer.d.ts +5 -0
- package/dist/ssh/InputBuffer.js +22 -3
- package/dist/ssh/InputBuffer.js.map +1 -1
- package/package.json +1 -1
|
@@ -200,6 +200,8 @@ function registerSSHCommand(program) {
|
|
|
200
200
|
const executor = new GovernedExecutor_1.SSHGovernedExecutor(session, governance, recorder);
|
|
201
201
|
// 创建输入缓冲区
|
|
202
202
|
const inputBuffer = new InputBuffer_1.InputBuffer();
|
|
203
|
+
// 追踪当前行已发送给服务器的字符
|
|
204
|
+
let lineBuffer = '';
|
|
203
205
|
// 处理终端 resize
|
|
204
206
|
// 关键: 同时更新 SSH PTY 和 录像机
|
|
205
207
|
process.stdout.on('resize', () => {
|
|
@@ -219,25 +221,34 @@ function registerSSHCommand(program) {
|
|
|
219
221
|
const input = chunk.toString();
|
|
220
222
|
// 检查是否是完整命令
|
|
221
223
|
const cmd = inputBuffer.push(input);
|
|
222
|
-
if (cmd) {
|
|
223
|
-
//
|
|
224
|
-
//
|
|
225
|
-
|
|
226
|
-
|
|
224
|
+
if (cmd !== null) {
|
|
225
|
+
// 检测到完整命令
|
|
226
|
+
// 对已发送缓冲区进行 Backspace 处理，以匹配 cmd 的格式
|
|
227
|
+
const processedLineBuffer = InputBuffer_1.InputBuffer.processBackspace(lineBuffer);
|
|
228
|
+
// 计算 unsentCommand
|
|
229
|
+
let unsent = '';
|
|
230
|
+
if (cmd.startsWith(processedLineBuffer)) {
|
|
231
|
+
unsent = cmd.slice(processedLineBuffer.length);
|
|
227
232
|
}
|
|
228
|
-
|
|
233
|
+
else {
|
|
234
|
+
// 如果 buffer 不匹配 (极其罕见), 全量重发以防万一
|
|
235
|
+
unsent = cmd;
|
|
236
|
+
}
|
|
237
|
+
// 完整命令: 进入治理流程
|
|
238
|
+
await executor.handleCommand(cmd, config.host, config.username, unsent);
|
|
239
|
+
// 清空已发送缓冲区
|
|
240
|
+
lineBuffer = '';
|
|
229
241
|
}
|
|
230
242
|
else {
|
|
231
|
-
// 非完整命令:
|
|
243
|
+
// 非完整命令: 直接透传 (打字体验)
|
|
232
244
|
// 也要记录输入! 否则回放时看不到打字过程
|
|
233
245
|
// 注意: 这里记录的是原始按键 (比如 'l', 's', Backspace 等)
|
|
234
246
|
// 只有当 GovernedExecutor.isSensitive() 为 false 时才记录
|
|
235
247
|
if (!executor.isSensitive()) {
|
|
236
248
|
recorder.recordInput(input);
|
|
237
249
|
}
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
process.stdout.write(input);
|
|
250
|
+
session.write(chunk);
|
|
251
|
+
lineBuffer += input;
|
|
241
252
|
}
|
|
242
253
|
});
|
|
243
254
|
// 处理会话关闭
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/ssh/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA+HA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/ssh/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -86,7 +86,11 @@ export declare class SSHGovernedExecutor {
|
|
|
86
86
|
/**
|
|
87
87
|
* 处理命令 (Enter 键触发)
|
|
88
88
|
*/
|
|
89
|
-
|
|
89
|
+
/**
|
|
90
|
+
* 处理命令 (Enter 键触发)
|
|
91
|
+
* @param unsentCommand 尚未发送给服务器的命令部分 (用于解决打字回显重复问题)
|
|
92
|
+
*/
|
|
93
|
+
handleCommand(cmd: string, host?: string, user?: string, unsentCommand?: string): Promise<void>;
|
|
90
94
|
/**
|
|
91
95
|
* 处理提权请求 (sudo/su)
|
|
92
96
|
*/
|
|
@@ -66,18 +66,24 @@ class SSHGovernedExecutor {
|
|
|
66
66
|
/**
|
|
67
67
|
* 处理命令 (Enter 键触发)
|
|
68
68
|
*/
|
|
69
|
-
|
|
69
|
+
/**
|
|
70
|
+
* 处理命令 (Enter 键触发)
|
|
71
|
+
* @param unsentCommand 尚未发送给服务器的命令部分 (用于解决打字回显重复问题)
|
|
72
|
+
*/
|
|
73
|
+
async handleCommand(cmd, host, user, unsentCommand = cmd) {
|
|
70
74
|
// 密码输入阶段: 绝不治理,直接透传
|
|
71
75
|
if (this.elevation === ElevationState.PENDING_PWD) {
|
|
72
76
|
// 密码也不记录到审计日志
|
|
73
|
-
|
|
77
|
+
// 注意：这里我们只发送 unsent 部分 + 回车
|
|
78
|
+
this.session.write(unsentCommand + '\n');
|
|
74
79
|
return;
|
|
75
80
|
}
|
|
76
81
|
const isSudo = cmd.trim().startsWith('sudo ');
|
|
77
82
|
const isSu = cmd.trim().startsWith('su ');
|
|
78
83
|
// sudo 命令处理
|
|
79
84
|
if ((isSudo || isSu) && this.elevation === ElevationState.USER) {
|
|
80
|
-
|
|
85
|
+
// 透传 unsentCommand 给 sudo 处理逻辑
|
|
86
|
+
await this.handleElevationRequest(cmd, host, user, unsentCommand);
|
|
81
87
|
return;
|
|
82
88
|
}
|
|
83
89
|
// 普通命令: 调用治理服务
|
|
@@ -97,6 +103,8 @@ class SSHGovernedExecutor {
|
|
|
97
103
|
risk: decision.riskLevel
|
|
98
104
|
});
|
|
99
105
|
}
|
|
106
|
+
// 发送 Ctrl+C (\x03) 给服务器以清除已输入的缓冲字符
|
|
107
|
+
this.session.write('\x03');
|
|
100
108
|
return;
|
|
101
109
|
}
|
|
102
110
|
// 记录审计 (如果不在敏感阶段)
|
|
@@ -114,12 +122,26 @@ class SSHGovernedExecutor {
|
|
|
114
122
|
});
|
|
115
123
|
}
|
|
116
124
|
// 执行命令
|
|
117
|
-
|
|
125
|
+
// 智能补发: 如果命令没有被治理层修改，我们只需要发送未发送的部分 + 回车
|
|
126
|
+
if (decision.normalizedCmd === cmd) {
|
|
127
|
+
if (unsentCommand) {
|
|
128
|
+
this.session.write(unsentCommand + '\r');
|
|
129
|
+
}
|
|
130
|
+
else {
|
|
131
|
+
// 如果没有未发送部分，只发回车
|
|
132
|
+
this.session.write('\r');
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
else {
|
|
136
|
+
// 如果命令被修改了 (例如自动纠错)，我们需要先清除已有输入
|
|
137
|
+
// 发送 Ctrl+C (清除行) + 新命令 + 回车
|
|
138
|
+
this.session.write('\x03' + decision.normalizedCmd + '\r');
|
|
139
|
+
}
|
|
118
140
|
}
|
|
119
141
|
/**
|
|
120
142
|
* 处理提权请求 (sudo/su)
|
|
121
143
|
*/
|
|
122
|
-
async handleElevationRequest(cmd, host, user) {
|
|
144
|
+
async handleElevationRequest(cmd, host, user, unsentCommand = cmd) {
|
|
123
145
|
this.elevation = ElevationState.AWAITING_APPROVAL;
|
|
124
146
|
const decision = await this.governance.evaluate({
|
|
125
147
|
kind: 'ssh_cmd',
|
|
@@ -137,6 +159,8 @@ class SSHGovernedExecutor {
|
|
|
137
159
|
reason: decision.reason
|
|
138
160
|
});
|
|
139
161
|
}
|
|
162
|
+
// 清除已输入的 sudo 命令
|
|
163
|
+
this.session.write('\x03');
|
|
140
164
|
return;
|
|
141
165
|
}
|
|
142
166
|
// 审批通过,允许进入密码阶段
|
|
@@ -148,7 +172,8 @@ class SSHGovernedExecutor {
|
|
|
148
172
|
command: cmd
|
|
149
173
|
});
|
|
150
174
|
}
|
|
151
|
-
|
|
175
|
+
// 只发送 unsent 部分 + 回车
|
|
176
|
+
this.session.write(unsentCommand + '\r');
|
|
152
177
|
}
|
|
153
178
|
/**
|
|
154
179
|
* 处理 PTY 输出 (状态跃迁)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GovernedExecutor.js","sourceRoot":"","sources":["../../src/ssh/GovernedExecutor.ts"],"names":[],"mappings":";;;AAwCA;;GAEG;AACH,IAAY,cAKX;AALD,WAAY,cAAc;IACxB,+BAAa,CAAA;IACb,yDAAuC,CAAA;IACvC,6CAA2B,CAAA;IAC3B,+BAAa,CAAA,CAAsB,cAAc;AACnD,CAAC,EALW,cAAc,8BAAd,cAAc,QAKzB;AAED;;GAEG;AACH,MAAa,0BAA0B;IAC7B,MAAM,GAAG,KAAK,CAAC;IAEvB,KAAK;QACH,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACrB,CAAC;IAED,IAAI;QACF,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACtB,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED;;OAEG;IACH,YAAY;QACV,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;IACtB,CAAC;CACF;AArBD,gEAqBC;AAED;;;;;;;;;;GAUG;AACH,MAAa,mBAAmB;IAUpB;IACA;IACA;IAXF,SAAS,GAAG,cAAc,CAAC,IAAI,CAAC;IAChC,SAAS,GAAG,IAAI,0BAA0B,EAAE,CAAC;IAErD,cAAc;IACN,MAAM,CAAU,oBAAoB,GAAG,wCAAwC,CAAC;IAChF,MAAM,CAAU,YAAY,GAAG,4CAA4C,CAAC;IAC5E,MAAM,CAAU,WAAW,GAAG,eAAe,CAAC;IAEtD,YACU,OAAmB,EACnB,UAA6B,EAC7B,QAAmB;QAFnB,YAAO,GAAP,OAAO,CAAY;QACnB,eAAU,GAAV,UAAU,CAAmB;QAC7B,aAAQ,GAAR,QAAQ,CAAW;QAE3B,mBAAmB;QACnB,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,GAAW,EAAE,EAAE;YACtC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,aAAa,CAAC,GAAW,EAAE,IAAa,EAAE,IAAa;
|
|
1
|
+
{"version":3,"file":"GovernedExecutor.js","sourceRoot":"","sources":["../../src/ssh/GovernedExecutor.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,11 @@ export declare class InputBuffer {
|
|
|
19
19
|
* @returns 如果检测到完整命令,返回命令字符串;否则返回 null
|
|
20
20
|
*/
|
|
21
21
|
push(chunk: string): string | null;
|
|
22
|
+
/**
|
|
23
|
+
* 处理控制字符 (如 Backspace)
|
|
24
|
+
* 模拟终端行为: \x7f (DEL) 或 \b (BS) 删除前一个字符
|
|
25
|
+
*/
|
|
26
|
+
static processBackspace(input: string): string;
|
|
22
27
|
/**
|
|
23
28
|
* 清空缓冲区
|
|
24
29
|
*/
|
package/dist/ssh/InputBuffer.js
CHANGED
|
@@ -25,13 +25,32 @@ class InputBuffer {
|
|
|
25
25
|
this.buffer += chunk;
|
|
26
26
|
// 唯一治理触发点: 检测到换行符
|
|
27
27
|
if (chunk.includes('\n') || chunk.includes('\r')) {
|
|
28
|
-
|
|
28
|
+
// 保留原始命令 (包括空格和可能的控制字符), 只去掉末尾的换行符
|
|
29
|
+
const rawCmd = this.buffer.replace(/[\r\n]+$/, '');
|
|
30
|
+
const cmd = InputBuffer.processBackspace(rawCmd);
|
|
29
31
|
this.buffer = '';
|
|
30
|
-
|
|
31
|
-
return cmd.length > 0 ? cmd : null;
|
|
32
|
+
return cmd;
|
|
32
33
|
}
|
|
33
34
|
return null;
|
|
34
35
|
}
|
|
36
|
+
/**
|
|
37
|
+
* 处理控制字符 (如 Backspace)
|
|
38
|
+
* 模拟终端行为: \x7f (DEL) 或 \b (BS) 删除前一个字符
|
|
39
|
+
*/
|
|
40
|
+
static processBackspace(input) {
|
|
41
|
+
const chars = [];
|
|
42
|
+
for (const char of input) {
|
|
43
|
+
if (char === '\x7f' || char === '\b') {
|
|
44
|
+
if (chars.length > 0) {
|
|
45
|
+
chars.pop();
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
chars.push(char);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
return chars.join('');
|
|
53
|
+
}
|
|
35
54
|
/**
|
|
36
55
|
* 清空缓冲区
|
|
37
56
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InputBuffer.js","sourceRoot":"","sources":["../../src/ssh/InputBuffer.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;GAWG;AACH,MAAa,WAAW;IACd,MAAM,GAAG,EAAE,CAAC;IAEpB;;;;;OAKG;IACH,IAAI,CAAC,KAAa;QAChB,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC;QAErB,kBAAkB;QAClB,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YACjD,MAAM,
|
|
1
|
+
{"version":3,"file":"InputBuffer.js","sourceRoot":"","sources":["../../src/ssh/InputBuffer.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;GAWG;AACH,MAAa,WAAW;IACd,MAAM,GAAG,EAAE,CAAC;IAEpB;;;;;OAKG;IACH,IAAI,CAAC,KAAa;QAChB,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC;QAErB,kBAAkB;QAClB,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YACjD,mCAAmC;YACnC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YACnD,MAAM,GAAG,GAAG,WAAW,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;YACjD,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;YAEjB,OAAO,GAAG,CAAC;QACb,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,gBAAgB,CAAC,KAAa;QACnC,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;gBACrC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACrB,KAAK,CAAC,GAAG,EAAE,CAAC;gBACd,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACnB,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACxB,CAAC;IAED;;OAEG;IACH,KAAK;QACH,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;IACnB,CAAC;IAED;;OAEG;IACH,IAAI;QACF,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED;;OAEG;IACH,UAAU;QACR,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;IAChC,CAAC;CACF;AA/DD,kCA+DC"}
|