From 315a0855dc829b79295149e7a704736b0076d6a9 Mon Sep 17 00:00:00 2001 From: yuanyuanxiang <962914132@qq.com> Date: Sun, 25 Oct 2026 17:59:17 +0100 Subject: [PATCH] Feature: Let the client report structured failures for MCP tools Four new client-to-server tokens carry a win32/LSTATUS code when a command fails instead of returning empty data: TOKEN_SERVICE_ERROR (170), TOKEN_FILE_LIST_ERROR (171), TOKEN_REG_ERROR (172) and TOKEN_DOWNLOAD_ERROR (173). They sit on byte values that were unused, so existing numbering is untouched. The three data paths that used to collapse "failed" and "empty" into the same packet now distinguish them: OpenSCManager failures, directory enumeration failures and RegOpenKeyEx failures all report the code that was actually returned, and UploadToRemoteV2 reports why it found no file to transfer before the transfer sub-connection is ever created. Every failure branch still sends the packet the old server expects (TOKEN_FILE_LIST, the empty TOKEN_REG_PATH/KEY pair, the ClientMsg popup), so a new client talking to an old server degrades to exactly today's behaviour instead of timing out. Success paths are byte-for- byte unchanged. Co-Authored-By: deepseek-flash --- client/FileManager.cpp | 42 ++++++++++++++++++++++++++++++------ client/FileManager.h | 2 ++ client/RegisterManager.cpp | 16 ++++++++++++++ client/RegisterOperation.cpp | 7 ++++-- client/RegisterOperation.h | 5 +++++ client/ServicesManager.cpp | 21 ++++++++++++++---- client/ServicesManager.h | 2 +- common/commands.h | 7 ++++++ 8 files changed, 89 insertions(+), 13 deletions(-) diff --git a/client/FileManager.cpp b/client/FileManager.cpp index 96267e9..e2fd425 100644 --- a/client/FileManager.cpp +++ b/client/FileManager.cpp @@ -438,8 +438,7 @@ UINT CFileManager::SendFilesList(LPCTSTR lpszDirectory) // 展开失败 / 目录 + "\*.*" + NUL 装不下:按空目录回(放在分配缓冲之前,免得多一条泄漏路径) if (szExpandedDir[0] == '\0' || lstrlenA(szExpandedDir) + 5 > MAX_PATH) { - BYTE bToken = TOKEN_FILE_LIST; - return Send(&bToken, 1); + return SendListError(ERROR_INVALID_NAME); } UINT nRet = 0; @@ -461,8 +460,8 @@ UINT CFileManager::SendFilesList(LPCTSTR lpszDirectory) hFile = FindFirstFile(strPath, &FindFileData); if (hFile == INVALID_HANDLE_VALUE) { - BYTE bToken = TOKEN_FILE_LIST; - return Send(&bToken, 1); + // 路径不存在/不可访问:回结构化失败(TOKEN_FILE_LIST_ERROR),不再和「空目录」混为一包。 + return SendListError(GetLastError()); } *lpList = TOKEN_FILE_LIST; @@ -850,6 +849,32 @@ int CFileManager::SendToken(BYTE bToken) return Send(&bToken, 1); } +// 列目录失败的结构化回报:[TOKEN_FILE_LIST_ERROR:1][win32err:4 LE]。 +// 服务端(MCP list_files)据此返回「路径不存在/权限不足」,而不是一个空列表。 +// 随后再补一个老的 1 字节 TOKEN_FILE_LIST:老服务端不认识新 token,仍按「空目录」处理, +// 行为与改动前完全一致。 +UINT CFileManager::SendListError(DWORD dwErr) +{ + if (dwErr == 0) dwErr = ERROR_GEN_FAILURE; + BYTE pkt[1 + sizeof(DWORD)] = { 0 }; + pkt[0] = TOKEN_FILE_LIST_ERROR; + memcpy(pkt + 1, &dwErr, sizeof(DWORD)); + int n = Send(pkt, (UINT)sizeof(pkt)); + SendToken(TOKEN_FILE_LIST); + return n > 0 ? (UINT)n : 0; +} + +// 下载请求无可用文件的结构化回报:[TOKEN_DOWNLOAD_ERROR:1][win32err:4 LE]。 +// 走文件管理器子连接(传输子连接此时尚未建立),服务端立即失败而不是等停滞看门狗。 +void CFileManager::SendDownloadError(DWORD dwErr) +{ + if (dwErr == 0) dwErr = ERROR_FILE_NOT_FOUND; + BYTE pkt[1 + sizeof(DWORD)] = { 0 }; + pkt[0] = TOKEN_DOWNLOAD_ERROR; + memcpy(pkt + 1, &dwErr, sizeof(DWORD)); + m_ClientObject->Send2Server((char*)pkt, (UINT)sizeof(pkt)); +} + bool CFileManager::UploadToRemote(LPBYTE lpBuffer) { if (lpBuffer[lstrlen((char *)lpBuffer) - 1] == '\\') { @@ -1144,19 +1169,23 @@ void CFileManager::UploadToRemoteV2(LPBYTE lpBuffer, UINT nSize) if (remotePaths.empty()) { Mprintf("[V2] 没有要传输的文件\n"); + SendDownloadError(ERROR_INVALID_PARAMETER); return; } // 收集所有文件(展开目录) std::vector allFiles; std::vector rootCandidates; // 用于计算公共根目录 + DWORD dwFirstErr = 0; // 首个失败的 win32 码(全部不存在时回传) for (const auto& remotePath : remotePaths) { std::string localPath = ExpandPath(remotePath.c_str()); DWORD attrs = GetFileAttributesA(localPath.c_str()); - if (attrs == INVALID_FILE_ATTRIBUTES) + if (attrs == INVALID_FILE_ATTRIBUTES) { + if (dwFirstErr == 0) dwFirstErr = GetLastError(); continue; + } if (attrs & FILE_ATTRIBUTE_DIRECTORY) { // 目录:递归收集 @@ -1175,7 +1204,8 @@ void CFileManager::UploadToRemoteV2(LPBYTE lpBuffer, UINT nSize) } if (allFiles.empty()) { - Mprintf("[V2] 没有找到可传输的文件\n"); + Mprintf("[V2] 没有找到可传输的文件 (win32=%lu)\n", dwFirstErr); + SendDownloadError(dwFirstErr); return; } diff --git a/client/FileManager.h b/client/FileManager.h index 1edf8f6..852f263 100644 --- a/client/FileManager.h +++ b/client/FileManager.h @@ -55,6 +55,8 @@ private: void CreateFolder(LPBYTE lpBuffer); void Rename(LPBYTE lpBuffer); int SendToken(BYTE bToken); + UINT SendListError(DWORD dwErr); // 列目录失败的结构化回报(TOKEN_FILE_LIST_ERROR + win32 码) + void SendDownloadError(DWORD dwErr); // 下载无可用文件的结构化回报(TOKEN_DOWNLOAD_ERROR + win32 码) void CreateLocalRecvFile(LPBYTE lpBuffer); void SetTransferMode(LPBYTE lpBuffer); diff --git a/client/RegisterManager.cpp b/client/RegisterManager.cpp index 594f50e..72ebee6 100644 --- a/client/RegisterManager.cpp +++ b/client/RegisterManager.cpp @@ -57,6 +57,22 @@ VOID CRegisterManager::Find(char bToken, char *szPath) // 子键包(TOKEN_REG_PATH):无子键时也回传空包,保证服务端(含 MCP 无头查询) // 能确定性收齐 PATH+KEY 两包,无需靠超时猜测是否有第二包。 char *szBuffer= Opt.FindPath(); + // 键打不开(不存在 / 路径不存在 / 拒绝访问 …):回结构化错误包。此前这种情况与 + // 「空键」同为 NULL,服务端只能回一个空列表,调用方无法区分。 + LSTATUS st = Opt.GetLastOpenStatus(); + if (st != ERROR_SUCCESS) { + BYTE pkt[1 + sizeof(LSTATUS)] = { 0 }; + pkt[0] = TOKEN_REG_ERROR; + memcpy(pkt + 1, &st, sizeof(LSTATUS)); + m_ClientObject->Send2Server((char*)pkt, sizeof(pkt)); + // 老服务端不认识 TOKEN_REG_ERROR:补上原来的两个空包,仍按「空键」处理,行为不变。 + char empty[1 + sizeof(REGMSG)] = { 0 }; + empty[0] = TOKEN_REG_PATH; + m_ClientObject->Send2Server(empty, sizeof(empty)); + empty[0] = TOKEN_REG_KEY; + m_ClientObject->Send2Server(empty, sizeof(empty)); + return; + } if(szBuffer!=NULL) { m_ClientObject->Send2Server((char*)szBuffer, LocalSize(szBuffer)); //目录下的目录 diff --git a/client/RegisterOperation.cpp b/client/RegisterOperation.cpp index fbb1a94..939ab2c 100644 --- a/client/RegisterOperation.cpp +++ b/client/RegisterOperation.cpp @@ -60,6 +60,7 @@ RegisterOperation::RegisterOperation(char bToken) } ZeroMemory(KeyPath,MAX_PATH); + m_lastOpenStatus = ERROR_SUCCESS; } RegisterOperation::~RegisterOperation() @@ -73,7 +74,8 @@ char* RegisterOperation::FindPath() char *szBuffer=NULL; HKEY hKey; //注册表返回句柄 /*打开注册表 User kdjfjkf\kdjfkdjf\ */ - if(RegOpenKeyEx(MKEY,KeyPath,0,KEY_READ,&hKey)==ERROR_SUCCESS) { //打开 + m_lastOpenStatus = RegOpenKeyEx(MKEY,KeyPath,0,KEY_READ,&hKey); + if(m_lastOpenStatus==ERROR_SUCCESS) { //打开 DWORD dwIndex=0,NameCount,NameMaxLen; DWORD KeySize,KeyCount,KeyMaxLen,MaxDataLen; //这就是枚举了 @@ -127,7 +129,8 @@ char* RegisterOperation::FindKey() char *szBuffer=NULL; HKEY hKey; //注册表返回句柄 - if(RegOpenKeyEx(MKEY,KeyPath,0,KEY_READ,&hKey)==ERROR_SUCCESS) { //打开 + m_lastOpenStatus = RegOpenKeyEx(MKEY,KeyPath,0,KEY_READ,&hKey); + if(m_lastOpenStatus==ERROR_SUCCESS) { //打开 DWORD dwIndex=0,NameSize,NameCount,NameMaxLen,Type; DWORD KeyCount,KeyMaxLen,DataSize,MaxDataLen; //这就是枚举了 diff --git a/client/RegisterOperation.h b/client/RegisterOperation.h index de4a940..adc2d04 100644 --- a/client/RegisterOperation.h +++ b/client/RegisterOperation.h @@ -19,6 +19,11 @@ public: char KeyPath[MAX_PATH]; void SetPath(char *szPath); char* FindKey(); + // 最近一次 RegOpenKeyEx 的状态:区分「键打不开」(不存在/拒绝访问)与「键为空」 + // (后者返回 NULL 但状态是 ERROR_SUCCESS)。 + LSTATUS GetLastOpenStatus() const { return m_lastOpenStatus; } +private: + LSTATUS m_lastOpenStatus; }; #endif // !defined(AFX_REGISTEROPERATION_H__BB4F3ED1_FA98_4BA4_97D6_A78E683131CC__INCLUDED_) diff --git a/client/ServicesManager.cpp b/client/ServicesManager.cpp index 6fd3677..286c391 100644 --- a/client/ServicesManager.cpp +++ b/client/ServicesManager.cpp @@ -24,11 +24,20 @@ CServicesManager::~CServicesManager() VOID CServicesManager::SendServicesList() { - LPBYTE szBuffer = GetServicesList(); + DWORD dwErr = 0; + LPBYTE szBuffer = GetServicesList(&dwErr); if (szBuffer == NULL) { + if (dwErr == 0) dwErr = ERROR_GEN_FAILURE; + Mprintf("Get service list failed[IP: %s][win32=%lu]\n", m_ClientObject->GetPublicIP().c_str(), dwErr); + // 结构化失败回报:MCP 端据此立即返回「权限不足/SCM 打不开」,不必等 20s 超时。 + // 老服务端不认识 TOKEN_SERVICE_ERROR,走 default 分支丢弃,随后仍按原样收到 ClientMsg。 + BYTE pkt[1 + sizeof(DWORD)] = { 0 }; + pkt[0] = TOKEN_SERVICE_ERROR; + memcpy(pkt + 1, &dwErr, sizeof(DWORD)); + m_ClientObject->Send2Server((char*)pkt, sizeof(pkt)); + // 保留原有弹窗消息:老服务端与 MFC 服务管理器(新 token 由对话框忽略)行为不变。 char buf[128]; sprintf_s(buf, "Get service list failed[IP: %s]", m_ClientObject->GetPublicIP().c_str()); - Mprintf("%s\n", buf); ClientMsg msg("服务管理", buf); m_ClientObject->Send2Server((char*)&msg, sizeof(msg)); return; @@ -42,7 +51,7 @@ VOID CServicesManager::SendServicesList() #define skCrypt(p) p #endif -LPBYTE CServicesManager::GetServicesList() +LPBYTE CServicesManager::GetServicesList(DWORD* err) { LPENUM_SERVICE_STATUS ServicesStatus = NULL; LPQUERY_SERVICE_CONFIG ServicesInfor = NULL; @@ -52,12 +61,14 @@ LPBYTE CServicesManager::GetServicesList() DWORD dwLength = 0; DWORD dwOffset = 0; if((m_hscManager=OpenSCManager(NULL,NULL,SC_MANAGER_ALL_ACCESS))==NULL) { + if (err) *err = GetLastError(); // 典型 5=拒绝访问(未提权) return NULL; } ServicesStatus = (LPENUM_SERVICE_STATUS) LocalAlloc(LPTR,64*1024); if (ServicesStatus==NULL) { + if (err) *err = ERROR_NOT_ENOUGH_MEMORY; CloseServiceHandle(m_hscManager); return NULL; } @@ -75,8 +86,10 @@ LPBYTE CServicesManager::GetServicesList() &dwResumeHandle); szBuffer = (LPBYTE)LocalAlloc(LPTR, MAX_PATH); - if (szBuffer == NULL) + if (szBuffer == NULL) { + if (err) *err = ERROR_NOT_ENOUGH_MEMORY; return NULL; + } szBuffer[0] = TOKEN_SERVERLIST; dwOffset = 1; for (unsigned long i = 0; i < dwServicesCount; ++i) { // Display The Services,显示所有的服务 diff --git a/client/ServicesManager.h b/client/ServicesManager.h index e3d4e21..bae3e02 100644 --- a/client/ServicesManager.h +++ b/client/ServicesManager.h @@ -20,7 +20,7 @@ public: CServicesManager(IOCPClient* ClientObject, int n, void* user = nullptr); virtual ~CServicesManager(); VOID SendServicesList(); - LPBYTE GetServicesList(); + LPBYTE GetServicesList(DWORD* err = NULL); VOID OnReceive(PBYTE szBuffer, ULONG ulLength); void ServicesConfig(PBYTE szBuffer, ULONG ulLength); SC_HANDLE m_hscManager; diff --git a/common/commands.h b/common/commands.h index 59c2310..cea897b 100644 --- a/common/commands.h +++ b/common/commands.h @@ -330,6 +330,13 @@ enum { COMMAND_REGEN_CLIENT_ID = 168, // 服务端 → 客户端:撞 ID 的克隆机重生成 client_id(掺随机 UUID)后重连 COMMAND_SCREEN_KEYFRAME_REQ = 169, // 服务端 → 客户端:下一次屏幕编码强制输出 IDR(Web 屏幕墙恢复用) + // MCP 结构化失败回报(客户端 → 服务端,仅失败分支发送;成功路径报文不变)。 + // 170-198 是当前未占用的字节值,显式赋值避免后续插入重编号。 + TOKEN_SERVICE_ERROR = 170, // [token:1][win32err:4 LE] 服务枚举失败(典型:OpenSCManager 权限不足) + TOKEN_FILE_LIST_ERROR = 171, // [token:1][win32err:4 LE] 文件列表失败(典型:路径不存在/非法) + TOKEN_REG_ERROR = 172, // [token:1][lstatus:4 LE] 注册表打开失败(键不存在/拒绝访问) + TOKEN_DOWNLOAD_ERROR = 173, // [token:1][win32err:4 LE] 下载请求无可用文件(路径全部不存在) + TOKEN_DECRYPT = 199, TOKEN_REGEDIT = 200, // 注册表 COMMAND_REG_FIND, // 注册表 管理标识