feat: 修复 SFTP 删除文件夹权限问题,添加兼容模式

This commit is contained in:
Baobhan Sith
2025-05-12 08:40:29 +08:00
parent 869d2b137c
commit 88508ea472
+25 -6
View File
@@ -460,13 +460,15 @@ export class SftpService {
async rmdir(sessionId: string, path: string, requestId: string): Promise<void> { async rmdir(sessionId: string, path: string, requestId: string): Promise<void> {
const state = this.clientStates.get(sessionId); const state = this.clientStates.get(sessionId);
// 检查 SSH 客户端是否存在,而不是 SFTP 实例 // 检查 SSH 客户端是否存在,而不是 SFTP 实例
if (!state || !state.sshClient) { if (!state || !state.sshClient || !state.sftp) {
console.warn(`[SSH Exec] SSH 客户端未准备好,无法在 ${sessionId} 上执行 rmdir (ID: ${requestId})`); console.warn(`[SSH Exec] SSH 客户端或 SFTP 未准备好,无法在 ${sessionId} 上执行 rmdir (ID: ${requestId})`);
state?.ws.send(JSON.stringify({ type: 'sftp:rmdir:error', path: path, payload: 'SSH 会话未就绪', requestId: requestId })); state?.ws.send(JSON.stringify({ type: 'sftp:rmdir:error', path: path, payload: 'SSH 或 SFTP 会话未就绪', requestId: requestId }));
return; return;
} }
console.debug(`[SSH Exec ${sessionId}] Received rmdir (force) request for ${path} (ID: ${requestId})`); console.debug(`[SSH Exec ${sessionId}] Received rmdir (force) request for ${path} (ID: ${requestId})`);
// 首先尝试使用 rm -rf 命令
const tryRmRfCommand = async () => {
// 构建 rm -rf 命令,确保路径被正确引用 // 构建 rm -rf 命令,确保路径被正确引用
const command = `rm -rf "${path.replace(/"/g, '\\"')}"`; // Basic quoting for paths with spaces/quotes const command = `rm -rf "${path.replace(/"/g, '\\"')}"`; // Basic quoting for paths with spaces/quotes
console.log(`[SSH Exec ${sessionId}] Executing command: ${command} (ID: ${requestId})`); console.log(`[SSH Exec ${sessionId}] Executing command: ${command} (ID: ${requestId})`);
@@ -475,7 +477,7 @@ export class SftpService {
state.sshClient.exec(command, (err, stream) => { state.sshClient.exec(command, (err, stream) => {
if (err) { if (err) {
console.error(`[SSH Exec ${sessionId}] Failed to start exec for rmdir ${path} (ID: ${requestId}):`, err); console.error(`[SSH Exec ${sessionId}] Failed to start exec for rmdir ${path} (ID: ${requestId}):`, err);
state.ws.send(JSON.stringify({ type: 'sftp:rmdir:error', path: path, payload: `执行删除命令失败: ${err.message}`, requestId: requestId })); trySftpRmdir(`执行删除命令失败: ${err.message}`);
return; return;
} }
@@ -491,7 +493,7 @@ export class SftpService {
} else { } else {
const errorMessage = stderrOutput.trim() || `命令退出,代码: ${code ?? 'N/A'}${signal ? `, 信号: ${signal}` : ''}`; const errorMessage = stderrOutput.trim() || `命令退出,代码: ${code ?? 'N/A'}${signal ? `, 信号: ${signal}` : ''}`;
console.error(`[SSH Exec ${sessionId}] rmdir ${path} command failed (ID: ${requestId}). Code: ${code}, Signal: ${signal}, Stderr: ${stderrOutput}`); console.error(`[SSH Exec ${sessionId}] rmdir ${path} command failed (ID: ${requestId}). Code: ${code}, Signal: ${signal}, Stderr: ${stderrOutput}`);
state.ws.send(JSON.stringify({ type: 'sftp:rmdir:error', path: path, payload: `删除目录失败: ${errorMessage}`, requestId: requestId })); trySftpRmdir(`删除目录失败: ${errorMessage}`);
} }
}); });
@@ -502,8 +504,25 @@ export class SftpService {
}); });
} catch (error: any) { } catch (error: any) {
console.error(`[SSH Exec ${sessionId}] rmdir ${path} caught unexpected error during exec setup (ID: ${requestId}):`, error); console.error(`[SSH Exec ${sessionId}] rmdir ${path} caught unexpected error during exec setup (ID: ${requestId}):`, error);
state.ws.send(JSON.stringify({ type: 'sftp:rmdir:error', path: path, payload: `执行删除时发生意外错误: ${error.message}`, requestId: requestId })); trySftpRmdir(`执行删除时发生意外错误: ${error.message}`);
} }
};
// 备用方案:使用 SFTP 的 rmdir 方法
const trySftpRmdir = (errorMessage: string) => {
console.log(`[SFTP ${sessionId}] rm -rf 命令失败,尝试使用 SFTP rmdir 方法删除 ${path} (ID: ${requestId})`);
state.sftp!.rmdir(path, (err) => {
if (err) {
console.error(`[SFTP ${sessionId}] SFTP rmdir ${path} 也失败 (ID: ${requestId}):`, err);
state.ws.send(JSON.stringify({ type: 'sftp:rmdir:error', path: path, payload: `删除目录失败: ${errorMessage}; SFTP 尝试也失败: ${err.message}`, requestId: requestId }));
} else {
console.log(`[SFTP ${sessionId}] SFTP rmdir ${path} 成功 (ID: ${requestId})`);
state.ws.send(JSON.stringify({ type: 'sftp:rmdir:success', path: path, requestId: requestId }));
}
});
};
tryRmRfCommand();
} }
/** 删除文件 */ /** 删除文件 */