diff --git a/ReadMe.md b/ReadMe.md index aed1f5b..b1f3820 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -378,6 +378,41 @@ nohup ./server_linux_amd64 --port 6543 --http-port 9001 > yama.log 2>&1 & ## 更新日志 +### v1.4.2 (2026.10.31) + +**MCP 运维套件 & WebSocket 传输 & 抓屏健壮性** + +**新功能:** +- **MCP 工具集 27 → 60**:新增主机 / 连接 / 服务 / 计划任务管理(16 个,写操作执行前后复核,受 McpMachine / McpMachineDangerous 双开关)、远程交谈(4 个,McpChat)、文件系统写操作 delete_path / move_path / create_folder(McpFileWrite)、remote_block_input(带截止时间与看门狗)、copy_files_c2c(客户端间直传,服务端只中继)、search_file、get_server_status、get_keylog 扩展、mcp_list_sessions / mcp_cancel_session;离线主机查询、批量只读调用(ids ≤ 50)、列表过滤器与分页 +- **MCP 协议**:initialize instructions、能力上报(platform / remoteControl / fileTransferV2 / c2cPaths / registry 等)、工具注解(readOnly / destructive / idempotent / openWorld)、结构化结果二次文本块、通知取消(-32800)与 progress 进度、dry-run 预演、客户端结构化失败令牌(170–173:失败与空结果可区分)、错误码收敛(参数错误 -32012、写入失败 -32011)、超时经 `McpToolTimeoutMs` 可调 +- **MCP 端点**:内置 HTTPS(Schannel 同端口按首字节嗅探,RSA / ECDSA、支持 fullchain、不可用时 fail-closed)、请求体 2 MB 上限、Bearer 失败按源 IP 限流(1 分钟 10 次封 15 分钟)、`logs\mcp_audit.log` 审计 +- **WebSocket 传输**:新增 PROTO_WS(5) / PROTO_WSS(6),升级路径 `/api/ws`,仅放行 80/443 的网络也能接入;MFC 与 Go 服务端同一设备端口三路嗅探(明文 / TLS / WS);在线列表右键「协议切换」把已在线客户端在 直连 TCP / WS / WSS 之间远程切换(COMMAND_SET_PROTO 177,WSS 下发反代信任锚,5 分钟未登录自动回退) +- **Windows 抓屏健壮性**:旋转显示器按真实纹理描述分配并直立图像(原首屏与每帧全黑)、DXGI 无帧自动切 GDI(无头 / Session 0)、工作站锁定与断开会话直接选 GDI(避免初始化卡死)、探测帧保留以便静态桌面首帧即出图、发送尺寸改为长边 ≤1920 / 短边 ≤1080 等比缩放 +- **Web 控制台**:非控制模式显示真实远端光标(形状变化即时、位置 ≤50 ms/次);iOS 幽灵竖线(画布固定 + `ctx.setTransform` 绘制);竖屏输入法下指针与画面错位(覆盖层与画布同包含块、坐标用画布局部像素);输入条固定在画面下沿不再随键盘跳动;Go 端滚轮小数 delta 导致彻底失灵 +- **Linux / macOS 客户端能力补齐**:MCP 一级工具(kill_process / exec_command / 终端 / 远控 / 剪贴板)支持 Linux、文件上传下载与 C2C 目标支持 POSIX、Linux 远程升级(COMMAND_UPDATE 校验 + 原子替换 + execv 回滚)、TLS 切换立即生效、屏幕预览(服务端统一转 JPEG)、桌面 / 下载 / 主目录快捷方式按 `user-dirs.dirs` 展开、运行时长按北京时间换算 +- **客户端与主控**:在线列表右键「复制名称」、高级菜单与免责声明补 16×16 图标、SOCKS5 代理映射移除 HP-Socket 依赖并重写(阻塞 socket + select、仅绑回环、SOCKS5 握手按字节流解析、按主连接队列背压、30 秒握手看门狗) + +**改进:** +- 依赖清单扩充至 23 项 / LICENSE-THIRD-PARTY 至 657 行(10 类许可证、33 项组件),并更正 x264(GPL-2.0 静态链接)、FFmpeg(静态链接、仅解码)、FRP(本地修改)三处 +- `DISABLE_X264_FOR_TEST` 真正生效(此前既没前置 config.h 也仍引用 x264 类型),libyuv 从该开关解绑 +- `build.ps1` 按 `atlmfc` 库存在与否挑选 MSBuild 实例(修复挑到无 ATL 的 BuildTools 时 `LNK1104 atls.lib`) +- 协议切换、SOCKS5 会话日志、复制名称、MCP 新开关等字符串补齐 en_US / zh_TW / de_DE + +**Bug 修复:** +- 主控重启后客户端重连空转(一秒 919 行重复日志刷爆环形缓冲) +- 右键菜单作用于错误主机(虚拟列表行号在菜单模态循环期间被排序 / 下线挪动) +- 构建对话框默认协议错位(`CBS_SORT` + `AddString` 致 `SetCurSel(0)` 落在 HTTP) +- 在线列表表头偶发闪烁(缺 `WS_CLIPCHILDREN`,改为只擦最后一列右侧空带) +- 加壳客户端收不到即时消息 / 远程交谈对话框创建失败(资源段为空,改内嵌模板)、非 936 系统标题与正文乱码、多显示器居中偏移、窗口与线程泄漏 +- 键盘记录饿死快捷键转发(钩子线程不泵消息被系统摘除) +- 锁定聊天时 Win 键不转发(未 `CallNextHookEx` 挡住后续钩子) +- 聊天消息以 e 开头被丢弃(首个字节 101 被心跳守卫吞掉) +- 文件搜索栈溢出(`wsprintf` 无界拼 MAX_PATH,深目录必崩) +- 空目录下载超时;文件传输会话子连接悬空指针(超时后 `CancelIO` 到已回收连接) +- 连接列表地址反序(`192.168.0.55` → `55.0.168.192`)与宽窄字符格式化塌缩 +- macOS 合盖外接屏鼠标偏移(取被抓显示器的 `CGDisplayBounds`,另加按主机保存的校准) +- 任务与机器管理一批缺陷(计划任务命令组装、解冻只恢复一个线程、窗口列表空指针、服务枚举句柄泄漏、删除进程 PID 判断与句柄、IE 历史时间戳翻转等) + ### v1.4.1 (2026.10.20) **Web 运维控制台 & 安全加固 & 单向 TLS** diff --git a/ReadMe_EN.md b/ReadMe_EN.md index 5557d0d..604b38f 100644 --- a/ReadMe_EN.md +++ b/ReadMe_EN.md @@ -378,6 +378,41 @@ Valid : 2026-02-01 to 2028-02-01 ## Changelog +### v1.4.2 (2026.10.31) + +**MCP operations suite & WebSocket transport & capture robustness** + +**New features:** +- **MCP tool count grew from 27 to 60**: host / connection / service / scheduled-task management (16 tools, writes re-read state before and re-verify after, gated by both McpMachine and McpMachineDangerous), remote chat (4 tools, McpChat), filesystem writes delete_path / move_path / create_folder (McpFileWrite), remote_block_input (with a deadline and a watchdog), copy_files_c2c (client-to-client delivery relayed without touching server disk), search_file, an extended get_keylog, get_server_status, mcp_list_sessions / mcp_cancel_session; offline-host queries, batched read-only calls (ids up to 50), list filters and paging +- **MCP protocol**: initialize instructions, capability reporting (platform / remoteControl / fileTransferV2 / c2cPaths / registry and more), tool annotations (readOnly / destructive / idempotent / openWorld), a second text block carrying the structured result, notification-based cancellation (-32800) and progress, dry-run previews, structured client failure tokens (170-173, so failure is distinguishable from an empty result), consolidated error codes (parameter errors -32012, write failures -32011), and a tunable timeout via `McpToolTimeoutMs` +- **MCP endpoint**: built-in HTTPS (Schannel sniffing on the same port, RSA / ECDSA, fullchain support, fail-closed when the certificate is unusable), a 2 MB request-body cap, per-source-IP rate limiting of Bearer failures (10 in a minute blocks for 15 minutes), and an audit trail in `logs\mcp_audit.log` +- **WebSocket transport**: new PROTO_WS(5) / PROTO_WSS(6) with upgrade path `/api/ws`, so clients on networks that only allow 80/443 can connect; both MFC and Go servers sniff plaintext / TLS / WS on the same device port; a new "Protocol switch" context-menu action moves an already-online client between direct TCP / WS / WSS (COMMAND_SET_PROTO 177, WSS carries the reverse-proxy trust anchor, automatic rollback if login does not succeed within 5 minutes) +- **Windows capture robustness**: rotated displays allocate by the real texture description and orient the image (previously fully black first and every frame), DXGI falls back to GDI when no frame arrives (headless / Session 0), locked workstations and disconnected sessions select GDI up front (avoiding a stuck initialisation), the probe frame is kept so a static desktop paints on first connect, and the send size is scaled proportionally to long edge <= 1920 / short edge <= 1080 +- **Web console**: the real remote cursor is shown outside control mode (shape changes immediately, position at most every 50 ms); iOS ghost vertical lines (canvas pinned, drawn with `ctx.setTransform`); pointer misalignment with the IME open in portrait (overlay shares the canvas containing block and uses canvas-local pixels); the input bar sits at the bottom of the picture instead of following the keyboard; fractional wheel deltas on the Go server no longer break scrolling entirely +- **Linux / macOS client parity**: MCP tier-one tools (kill_process / exec_command / terminal / remote control / clipboard) now accept Linux hosts; upload, download and C2C targets support POSIX paths; Linux remote upgrade (COMMAND_UPDATE with verification, atomic replace and execv rollback); TLS switches take effect immediately; screen preview (the server converts to JPEG in one place); Desktop / Downloads / Home shortcuts expand through `user-dirs.dirs`; uptime is converted from Beijing time +- **Client and master**: "Copy name" in the online-list context menu; 16x16 icons for the advanced menu and the disclaimer item; the SOCKS5 proxy mapping drops the HP-Socket dependency and is rewritten (blocking socket + select, byte-level SOCKS5 parsing, back-pressure against the master send queue, 30-second handshake watchdog) + +**Improvements:** +- The dependency inventory grew to 23 items and LICENSE-THIRD-PARTY to 657 lines (10 license classes, 33 components), with corrections for x264 (GPL-2.0, statically linked), FFmpeg (static, decoders only) and FRP (locally modified) +- `DISABLE_X264_FOR_TEST` now actually works (config.h was not included first and the class still referenced x264 types), and libyuv is no longer tied to that switch +- `build.ps1` picks the MSBuild instance that has the `atlmfc` libraries, fixing `LNK1104 atls.lib` when a BuildTools install without ATL was chosen first +- Strings added by protocol switching, SOCKS5 session logging, "Copy name" and the new MCP switches are translated in en_US / zh_TW / de_DE + +**Bug fixes:** +- Clients spun in a reconnect loop after a master restart (919 identical log lines per second flushed the 1000-line ring buffer) +- The context menu could act on the wrong host (virtual-list row indices shift while the menu's modal loop keeps dispatching timers) +- The build dialog defaulted to the wrong protocol (`CBS_SORT` plus `AddString` made `SetCurSel(0)` land on HTTP) +- Occasional header flicker in the online list (missing `WS_CLIPCHILDREN`; erasure now limited to the empty band right of the last column) +- Packed clients never showed instant messages / could not create the chat dialog (empty resource section, now an embedded template), with garbled titles and text on non-936 systems, off-centre placement on multi-monitor hosts, and window and thread leaks +- The keylogger hook starved hotkey forwarding (its thread never pumped messages and Windows removed the hook) +- Win-key forwarding stopped while chat was locked (`CallNextHookEx` was skipped, shadowing later hooks) +- Chat messages starting with "e" were dropped (byte 101 was swallowed by the heartbeat guard) +- Stack overflow in recursive file search (`wsprintf` into a `MAX_PATH` buffer with no bound) +- Downloading an empty directory timed out; file-transfer sessions kept dangling sub-connection pointers (`CancelIO` against a recycled connection after a timeout) +- Connection-list addresses were byte-reversed (`192.168.0.55` shown as `55.0.168.192`) and collapsed by a mixed wide/narrow format string +- macOS mouse offset in clamshell mode (now uses the captured display's `CGDisplayBounds`, plus a per-host calibration) +- A batch of machine and task-management defects (scheduled-task command assembly, thawing only one thread, a null dereference on an empty window list, leaked service-enumeration handles, PID truncation and handle leaks when deleting processes, flipped IE history timestamps) + ### v1.4.1 (2026.10.20) **Web operations console & security hardening & one-way TLS** diff --git a/ReadMe_TW.md b/ReadMe_TW.md index 608aecd..908d1bf 100644 --- a/ReadMe_TW.md +++ b/ReadMe_TW.md @@ -378,6 +378,41 @@ nohup ./server_linux_amd64 --port 6543 --http-port 9001 > yama.log 2>&1 & ## 更新日誌 +### v1.4.2 (2026.10.31) + +**MCP 維運套件 & WebSocket 傳輸 & 擷取畫面健壯性** + +**新功能:** +- **MCP 工具集 27 → 60**:新增主機 / 連線 / 服務 / 排程工作管理(16 個,寫入操作執行前後複核,受 McpMachine / McpMachineDangerous 雙開關)、遠端交談(4 個,McpChat)、檔案系統寫入 delete_path / move_path / create_folder(McpFileWrite)、remote_block_input(帶截止時間與看門狗)、copy_files_c2c(用戶端間直傳,伺服端只中繼不落地)、search_file、get_keylog 擴充、get_server_status、mcp_list_sessions / mcp_cancel_session;離線主機查詢、批次唯讀呼叫(ids ≤ 50)、列表過濾與分頁 +- **MCP 協定**:initialize instructions、能力上報(platform / remoteControl / fileTransferV2 / c2cPaths / registry 等)、工具註解(readOnly / destructive / idempotent / openWorld)、結構化結果二次文字區塊、通知取消(-32800)與 progress 進度、dry-run 預演、用戶端結構化失敗權杖(170–173,失敗與空結果可區分)、錯誤碼收斂(參數錯誤 -32012、寫入失敗 -32011)、逾時可經 `McpToolTimeoutMs` 調整 +- **MCP 端點**:內建 HTTPS(Schannel 同連接埠依首位元組嗅探,RSA / ECDSA、支援 fullchain、不可用時 fail-closed)、請求本文 2 MB 上限、Bearer 失敗依來源 IP 限流(1 分鐘 10 次封 15 分鐘)、`logs\mcp_audit.log` 稽核 +- **WebSocket 傳輸**:新增 PROTO_WS(5) / PROTO_WSS(6),升級路徑 `/api/ws`,只放行 80/443 的網路也能接入;MFC 與 Go 伺服端同一裝置連接埠三路嗅探(明文 / TLS / WS);線上列表右鍵「協定切換」把已線上用戶端在 直連 TCP / WS / WSS 之間遠端切換(COMMAND_SET_PROTO 177,WSS 下發反代信任錨,5 分鐘未登入自動回退) +- **Windows 擷取畫面健壯性**:旋轉顯示器依真實紋理描述配置並直立影像(原首屏與每幀全黑)、DXGI 無幀自動切 GDI(無頭 / Session 0)、工作站鎖定與中斷工作階段直接選 GDI(避免初始化卡死)、保留探測幀讓靜態桌面首幀即出圖、傳送尺寸改為長邊 ≤1920 / 短邊 ≤1080 等比縮放 +- **Web 控制台**:非控制模式顯示真實遠端游標(形狀變化即時、位置 ≤50 ms/次);iOS 幽靈豎線(畫布固定 + `ctx.setTransform` 繪製);豎屏輸入法下指標與畫面錯位(覆蓋層與畫布同包含區塊、座標用畫布局部像素);輸入列固定在畫面下緣不再隨鍵盤跳動;Go 端滾輪小數 delta 導致徹底失靈 +- **Linux / macOS 用戶端能力補齊**:MCP 一級工具(kill_process / exec_command / 終端 / 遠控 / 剪貼簿)支援 Linux、檔案上傳下載與 C2C 目標支援 POSIX、Linux 遠端升級(COMMAND_UPDATE 校驗 + 原子替換 + execv 回退)、TLS 切換立即生效、螢幕預覽(伺服端統一轉 JPEG)、桌面 / 下載 / 主目錄捷徑依 `user-dirs.dirs` 展開、執行時間依北京時間換算 +- **用戶端與主控**:線上列表右鍵「複製名稱」、進階選單與免責聲明補 16×16 圖示、SOCKS5 代理映射移除 HP-Socket 依賴並重寫(阻塞 socket + select、位元組級 SOCKS5 解析、依主連線佇列背壓、30 秒握手看門狗) + +**改進:** +- 依賴清單擴充至 23 項 / LICENSE-THIRD-PARTY 至 657 行(10 類授權、33 項元件),並更正 x264(GPL-2.0 靜態連結)、FFmpeg(靜態連結、僅解碼)、FRP(本機修改)三處 +- `DISABLE_X264_FOR_TEST` 真正生效(先前既未前置 config.h 也仍引用 x264 型別),libyuv 從該開關解綁 +- `build.ps1` 依 `atlmfc` 函式庫存在與否挑選 MSBuild 實例(修復挑到無 ATL 的 BuildTools 時 `LNK1104 atls.lib`) +- 協定切換、SOCKS5 工作階段日誌、複製名稱、MCP 新開關等字串補齊 en_US / zh_TW / de_DE + +**Bug 修復:** +- 主控重啟後用戶端重連空轉(一秒 919 行重複日誌刷爆環形緩衝) +- 右鍵選單作用於錯誤主機(虛擬列表列號在選單模態迴圈期間被排序 / 離線挪動) +- 建置對話框預設協定錯位(`CBS_SORT` + `AddString` 致 `SetCurSel(0)` 落在 HTTP) +- 線上列表表頭偶發閃爍(缺 `WS_CLIPCHILDREN`,改為只擦最後一欄右側空帶) +- 加殼用戶端收不到即時訊息 / 遠端交談對話框建立失敗(資源區段為空,改內嵌模板)、非 936 系統標題與本文亂碼、多螢幕居中偏移、視窗與執行緒洩漏 +- 鍵盤記錄餓死快速鍵轉發(掛鉤執行緒不泵訊息被系統摘除) +- 鎖定聊天時 Win 鍵不轉發(未 `CallNextHookEx` 擋住後續掛鉤) +- 聊天訊息以 e 開頭被丟棄(首位元組 101 被心跳守衛吞掉) +- 檔案搜尋堆疊溢位(`wsprintf` 無界拼 MAX_PATH,深目錄必崩) +- 空目錄下載逾時;檔案傳輸工作階段子連線懸空指標(逾時後 `CancelIO` 到已回收連線) +- 連線列表位址反序(`192.168.0.55` → `55.0.168.192`)與寬窄字元格式化塌縮 +- macOS 合蓋外接螢幕滑鼠偏移(取被抓螢幕的 `CGDisplayBounds`,另加依主機儲存的校準) +- 工作與機器管理一批缺陷(排程工作命令組裝、解凍只恢復一個執行緒、視窗列表空指標、服務列舉控制代碼洩漏、刪除處理程序 PID 判斷與控制代碼、IE 歷程時間戳翻轉等) + ### v1.4.1 (2026.10.20) **Web 維運控制台 & 安全加固 & 單向 TLS** diff --git a/client/Script.rc b/client/Script.rc index 3954d8c..f034b9a 100644 --- a/client/Script.rc +++ b/client/Script.rc @@ -103,7 +103,7 @@ IDR_WAVE WAVE "Res\\msg.wav" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,4,1 + FILEVERSION 1,0,4,2 PRODUCTVERSION 1,0,0,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -121,7 +121,7 @@ BEGIN BEGIN VALUE "CompanyName", "FUCK THE UNIVERSE" VALUE "FileDescription", "A GHOST" - VALUE "FileVersion", "1.0.4.1" + VALUE "FileVersion", "1.0.4.2" VALUE "InternalName", "ServerDll.dll" VALUE "LegalCopyright", "Copyright (C) 2019-2026" VALUE "OriginalFilename", "ServerDll.dll" diff --git a/client/TestRun.rc b/client/TestRun.rc index 01fb326..849cc7d 100644 Binary files a/client/TestRun.rc and b/client/TestRun.rc differ diff --git a/linux/ghost b/linux/ghost index 8d85ccc..1be9fa7 100644 Binary files a/linux/ghost and b/linux/ghost differ diff --git a/server/2015Remote/2015Remote.rc b/server/2015Remote/2015Remote.rc index a742ce4..61c3929 100644 Binary files a/server/2015Remote/2015Remote.rc and b/server/2015Remote/2015Remote.rc differ diff --git a/server/2015Remote/2015Remote_vs2015.vcxproj b/server/2015Remote/2015Remote_vs2015.vcxproj index 671ae92..e321af9 100644 --- a/server/2015Remote/2015Remote_vs2015.vcxproj +++ b/server/2015Remote/2015Remote_vs2015.vcxproj @@ -537,8 +537,12 @@ + + + + @@ -574,6 +578,7 @@ + diff --git a/server/2015Remote/2015Remote_vs2015.vcxproj.filters b/server/2015Remote/2015Remote_vs2015.vcxproj.filters index d71107a..fe8deb9 100644 --- a/server/2015Remote/2015Remote_vs2015.vcxproj.filters +++ b/server/2015Remote/2015Remote_vs2015.vcxproj.filters @@ -368,5 +368,10 @@ + + + + + \ No newline at end of file diff --git a/server/2015Remote/UIBranding.h b/server/2015Remote/UIBranding.h index 8cd5adc..e720743 100644 --- a/server/2015Remote/UIBranding.h +++ b/server/2015Remote/UIBranding.h @@ -46,7 +46,7 @@ // 程序版本号 [建议格式: X.Y.Z] // 影响:关于对话框、标题栏 -#define BRAND_VERSION "1.4.1" +#define BRAND_VERSION "1.4.2" // 启动画面名称 [建议大写,更有 Logo 感] // 影响:启动画面 Logo 文字(大号艺术字体渲染)