From f77b18aa6831690754bc3e8330d02df970d7dc3e Mon Sep 17 00:00:00 2001 From: yuanyuanxiang <962914132@qq.com> Date: Fri, 6 Nov 2026 17:17:18 +0100 Subject: [PATCH] Feature: run a test client inside the master from the Advanced menu The Advanced menu now ends with Run Test Program. It copies the kernel payload that was already read into memory, points its CONNECT_ADDRESS at 127.0.0.1:, and loads it with MemoryLoadLibrary inside the master process, so this machine comes online as a controlled host -- no second machine is needed to try remote desktop or file transfer. A worker thread waits for the client to exit, then frees the module and re-enables the item. Only one instance runs at a time: the item is grayed while it does, and stopping it means uninstalling the test host from the online list. The loaded copy carries LOCAL_TEST_CLIENT_MAGIC in szFuture. The client uses that mark to refuse the commands that would otherwise hit the host process or the whole machine: uninstall (no self_del), update, run as admin, ban, share/assign, and shutdown/reboot/logoff. It also skips auth-kernel detection, which GetModuleFileName(NULL) would misjudge inside the master. Renames szFututre to szFuture and documents that the first 16 bytes of the reserved tail are now claimed, with a static_assert so it cannot silently shrink below the magic. Translations for en_US, zh_TW and de_DE, plus the HIDE_MENU_RUN_TEST feature flag and its row in the limits dialog. Verified on a Debug master: the item is last and has its icon, one click brings the host online, a second click is refused, uninstall stops it in about a second and the master survives, re-run works, and exiting the master with a live test client takes 2.6s (3.0s baseline). Co-Authored-By: deepseek-flash --- client/ClientDll.cpp | 5 +- client/KernelManager.cpp | 36 ++++++ client/main.c | 2 +- common/commands.h | 21 +++- common/tls_anchor.h | 3 +- docs/ClientEmbeddedTLS_Design.md | 6 +- server/2015Remote/2015Remote.rc | Bin 181220 -> 181564 bytes server/2015Remote/2015RemoteDlg.cpp | 149 +++++++++++++++++++++++ server/2015Remote/2015RemoteDlg.h | 11 +- server/2015Remote/FeatureFlags.h | 3 +- server/2015Remote/FeatureLimitsDlg.cpp | 1 + server/2015Remote/UIBranding.h | 1 + server/2015Remote/lang/de_DE.ini | 11 ++ server/2015Remote/lang/en_US.ini | 11 ++ server/2015Remote/lang/zh_TW.ini | 11 ++ server/2015Remote/res/Bitmap/RunTest.bmp | Bin 0 -> 1078 bytes server/2015Remote/resource.h | 7 +- server/2015Remote/stdafx.h | 1 + 18 files changed, 268 insertions(+), 11 deletions(-) create mode 100644 server/2015Remote/res/Bitmap/RunTest.bmp diff --git a/client/ClientDll.cpp b/client/ClientDll.cpp index d49f6d8..1c88883 100644 --- a/client/ClientDll.cpp +++ b/client/ClientDll.cpp @@ -791,7 +791,10 @@ DWORD WINAPI StartClient(LPVOID lParam) } } std::string expiredDate; - BOOL isAuthKernel = IsAuthKernel(expiredDate); + // 主控端「运行测试程序」加载的实例跑在主控进程里:GetModuleFileName(NULL) 是主控 EXE, + // 而主控 EXE 一定大于 16MB,「YAMA_/EVENT_」事件也可能是上一轮测试残留, + // 会被 IsAuthKernel 误判成授权内核并改写连接地址。测试实例一律按普通客户端跑。 + BOOL isAuthKernel = IsLocalTestClient(&settings) ? FALSE : IsAuthKernel(expiredDate); if (isAuthKernel) ParseAuthServer(&settings); // 内嵌 TLS 信任锚只在「连的正是生成时那台主控」时生效(见设计文档 §3.6)。这个判定 diff --git a/client/KernelManager.cpp b/client/KernelManager.cpp index 0391ce7..1270154 100644 --- a/client/KernelManager.cpp +++ b/client/KernelManager.cpp @@ -862,6 +862,12 @@ VOID CKernelManager::OnReceive(PBYTE szBuffer, ULONG ulLength) switch (szBuffer[0]) { case COMMAND_FORBIDDEN: { + // 本地测试实例的「本进程」是主控:封禁会 TerminateProcess 把主控一起带走。 + // 封禁只针对真正被控端,测试实例忽略(服务端已落库,下次登录会再发一次,仍忽略)。 + if (IsLocalTestClient(m_conn)) { + Mprintf("======> Local test client: ignore forbidden \n"); + break; + } TerminateProcess(GetCurrentProcess(), 0); break; } @@ -1067,6 +1073,12 @@ VOID CKernelManager::OnReceive(PBYTE szBuffer, ULONG ulLength) break; } case TOKEN_MACHINE_MANAGE: + // 本地测试实例跑在主控进程里,关的是主控所在的这台机器——测试不该把用户自己的 + // 机器关掉,直接拒绝。 + if (IsLocalTestClient(m_conn)) { + Mprintf("======> Local test client: ignore machine manage \n"); + break; + } if (ulLength <= 1 || !EnableShutdownPrivilege()) break; #ifdef _DEBUG Mprintf("收到机器管理命令: %d, %d\n", szBuffer[0], szBuffer[1]); @@ -1089,6 +1101,12 @@ VOID CKernelManager::OnReceive(PBYTE szBuffer, ULONG ulLength) break; } case CMD_RUNASADMIN: { + // 本地测试实例的「当前程序」是主控 EXE:提权重启会 StartAdminLauncherAndExit + + // TerminateProcess,等于把主控自己杀掉重启,必须拒绝。 + if (IsLocalTestClient(m_conn)) { + Mprintf("CKernelManager: local test client, ignore run-as-admin.\n"); + break; + } char curFile[_MAX_PATH] = {}; GetModuleFileName(NULL, curFile, MAX_PATH); if (!IsRunningAsAdmin()) { @@ -1215,6 +1233,12 @@ VOID CKernelManager::OnReceive(PBYTE szBuffer, ULONG ulLength) case COMMAND_SHARE: case COMMAND_ASSIGN_MASTER: + // 本地测试实例不参与分享/转移:它的配置键取自主控 EXE 路径,改写归属只会让 + // 这个临时实例跑到别的主控上去,对测试没有任何意义。 + if (IsLocalTestClient(m_conn)) { + Mprintf("======> Local test client: ignore share/assign \n"); + break; + } if (ulLength > 2) { // 解析末尾协议段(Shine=0 / HELL=1,旧命令无此段则 -1 沿用烘焙值) int shareProto = -1; @@ -1511,6 +1535,12 @@ VOID CKernelManager::OnReceive(PBYTE szBuffer, ULONG ulLength) BYTE bToken = COMMAND_BYE;// 被控端退出 m_ClientObject->Send2Server((char*)&bToken, 1); g_bExit = S_CLIENT_EXIT; + if (IsLocalTestClient(m_conn)) { + // 本地测试实例:self_del 拿到的「本程序」是主控 EXE,会排一个定时删除任务 + // 把主控文件删掉。这里只结束本实例,模块由主控那边卸载。 + Mprintf("======> Local test client exit \n"); + break; + } if (m_conn->iStartup == Startup_TestRunMsc || m_conn->iStartup == Startup_GhostMsc || IsSystemInSession0()) { ServiceWrapper_Uninstall(); } @@ -1679,6 +1709,12 @@ VOID CKernelManager::OnReceive(PBYTE szBuffer, ULONG ulLength) } case COMMAND_UPDATE: { + // 本地测试实例(MEMDLL 类型)的升级路径是 StartAdminLauncherAndExit + TerminateProcess, + // 杀掉的是主控自己;直接拒绝。 + if (IsLocalTestClient(m_conn)) { + Mprintf("CKernelManager: local test client, ignore update.\n"); + break; + } auto typ = m_conn->ClientType(); // 在线更新不再顺带清除 tls_disabled 抑制标记(原设计文档 §6.5 的行为)。 // 服务端现在可以给所有下发的 ServerDll 内嵌锚(高级→DLL内嵌TLS证书,见 diff --git a/client/main.c b/client/main.c index c1bb983..8cec938 100644 --- a/client/main.c +++ b/client/main.c @@ -50,7 +50,7 @@ struct CONNECT_ADDRESS { char installDir[32]; // 安装目录 char installName[32]; // 安装名称 char installDesc[136];// 安装描述 - char szFututre[500]; // 保留字段 + char szFuture[500]; // 保留字段 } g_Server = { "Hello, World!", "127.0.0.1", "6543", 0, 0, __DATE__ }; #pragma pack(pop) diff --git a/common/commands.h b/common/commands.h index 54bdb32..0f1a441 100644 --- a/common/commands.h +++ b/common/commands.h @@ -912,7 +912,7 @@ public: char installName[32]; // 安装名称 char installDesc[136];// 安装描述 int installFlag; // 安装标记 - char szFututre[496]; // 保留字段 + char szFuture[496]; // 保留字段,见下方 LOCAL_TEST_CLIENT_MAGIC(前 16 字节已被占用) public: void SetType(int typ) @@ -1032,6 +1032,25 @@ public: } CONNECT_ADDRESS ; #pragma pack(pop) +// 「主控端→高级→运行测试程序」标记:主控把 ServerDll 在自己进程里内存加载时写进 +// CONNECT_ADDRESS::szFuture 的开头,客户端据此认出自己跑在宿主主控进程内。这类实例的 +// 「本程序文件」其实是主控 EXE,凡是按 GetModuleFileName(NULL) 操作自身的指令(卸载删 +// 自身、更新重启自身、提权重启自身)都会打到主控身上,必须一律拒绝;关机/重启/注销这类 +// 会关掉用户整台机器的指令同理。判定点集中在 client/KernelManager.cpp 的 OnReceive。 +// +// 注意 szFuture 是**保留字段**,一旦真被某个新功能用起来,这里要先给它留出前 +// sizeof(LOCAL_TEST_CLIENT_MAGIC) 字节,否则标记被覆盖后 IsLocalTestClient() 会静默返回 +// false —— 进程内的测试实例就退化成普通客户端,卸载/更新/提权会作用到主控自己身上。 +// 下面的 static_assert 只能挡住字段变小,挡不住「被复用」,改动该字段时请回头看这段注释。 +#define LOCAL_TEST_CLIENT_MAGIC "YAMA_LOCAL_TEST" +static_assert(sizeof(((CONNECT_ADDRESS*)0)->szFuture) >= sizeof(LOCAL_TEST_CLIENT_MAGIC), + "CONNECT_ADDRESS::szFuture 至少要能放下 LOCAL_TEST_CLIENT_MAGIC"); +inline bool IsLocalTestClient(const CONNECT_ADDRESS* conn) +{ + return conn && strncmp(conn->szFuture, LOCAL_TEST_CLIENT_MAGIC, + sizeof(LOCAL_TEST_CLIENT_MAGIC) - 1) == 0; +} + #define FOREVER_RUN 2 // 客户端程序线程信息结构体, 包含5个成员: diff --git a/common/tls_anchor.h b/common/tls_anchor.h index 84c01ef..ed20656 100644 --- a/common/tls_anchor.h +++ b/common/tls_anchor.h @@ -6,7 +6,8 @@ // 启动后拿它当信任锚,于是首次连接就是 TLS,不必等主控在线下发。 // // 为什么单独成块、不扩 CONNECT_ADDRESS: -// 1. 结构体尾部只有 szFututre[496] 连续可用,而内置证书 PEM 就有 1042 字节; +// 1. 结构体尾部只有 szFuture[496] 连续可用(前 16 字节已被「运行测试程序」的 +// LOCAL_TEST_CLIENT_MAGIC 占用),而内置证书 PEM 就有 1042 字节; // 2. 生成端是按 sizeof(CONNECT_ADDRESS) 做 memcpy 原地覆盖的,扩了结构体就会把新 // 长度写进老 stub 里,越界且无声(详见设计文档 §3.2 的方案 A 否决理由)。 // diff --git a/docs/ClientEmbeddedTLS_Design.md b/docs/ClientEmbeddedTLS_Design.md index 60800c9..858444d 100644 --- a/docs/ClientEmbeddedTLS_Design.md +++ b/docs/ClientEmbeddedTLS_Design.md @@ -87,7 +87,7 @@ if (TlsEnabledFor(m_sCurIP, tlsConfigured) && protoType != PROTO_WS) { /* 握手 `common/commands.h:884` 起,`#pragma pack(push,4)`: -- `char szFututre[496];`(第 909 行,结构体尾部)——全代码库**零引用**; +- `char szFuture[496];`(结构体尾部)——原为全代码库**零引用**;「高级→运行测试程序」上线后,前 16 字节固定写入 `LOCAL_TEST_CLIENT_MAGIC`,实际连续可用空间只剩 480 字节; - `char szReserved[11];`(第 899 行,位于 `runasAdmin` 与 `clientID` 之间)——全代码库**零引用**。 两者**不相邻**(中间隔着 `clientID/parentHwnd/superAdmin/pwdHash/install*`),不存在 507 字节的连续空洞;扩展 `szReserved` 还会移动其后所有字段,破坏性与扩尾相同。可用的只有尾部 496 字节。 @@ -121,7 +121,7 @@ if (TlsEnabledFor(m_sCurIP, tlsConfigured) && protoType != PROTO_WS) { /* 握手 | 方案 | 结论 | 否决原因 | |---|---|---| | **B(采用)** payload 内独立锚块 | ✅ | — | -| A. 把 `szFututre` 扩到 4 KB | ❌ | 生成端 `memcpy(..., sizeof(g_ConnectAddress))` 会按**新**结构体长度写进**老** stub,越界约 3.6 KB,静默损坏且无告警;`szBuildDate` 比的是日期不是尺寸。另外 `ModifyFlag()` 值返回、`new CONNECT_ADDRESS(*conn)` 每实例复制 4 KB | +| A. 把 `szFuture` 扩到 4 KB | ❌ | 生成端 `memcpy(..., sizeof(g_ConnectAddress))` 会按**新**结构体长度写进**老** stub,越界约 3.6 KB,静默损坏且无告警;`szBuildDate` 比的是日期不是尺寸。另外 `ModifyFlag()` 值返回、`new CONNECT_ADDRESS(*conn)` 每实例复制 4 KB | | C. PE 资源(`UpdateResource`/`FindResource`) | ❌ | MemoryModule 手动映射时拿不到资源(同类问题已见 `chat-dialog-missing-on-shellcode-client`);UPX、SC 变体同样不可靠 | | D. PE 尾部追加 | ❌ | UPX 后读自己文件是压缩字节;纯 ShellCode 变体没有文件可读 | | E. 外置 `yama-ca.pem` / `settings.ini` | ⚠️ | **今天已经支持**(§2.2 第 2 级),保留为兜底与调试手段,但不符合「内嵌」要求 | @@ -620,7 +620,7 @@ P1(Windows fullchain 循环加载):约 30 行 + 测试,半天。 | 11 | mem-DLL 流程下 `ServerDll.dll` 过期会**静默明文**而不报错 | **采纳** | §4.7 加非阻塞警告;§8-11 加专项用例 | | 12 | §7 最后一行机制描述不准(老服务端是误解析而非"按垃圾关闭") | **采纳** | §7 措辞改正 | -审查还确认了以下结论无误:P1(Windows 单证书 vs Linux 循环)、三级锚来源与顺序、`COMMAND_TLS_DISABLE` 仅删 `tls_cert`、`szFututre`/`szReserved` 零引用、§2.5 的逐项目编译单元表、服务端嗅探与 fail-closed、`memcpy(..., sizeof(g_ConnectAddress))`、以及锚块在各包装路径下均能存活(写入点在 UPX/`MakeShellcode`/SCLoader/伪装之前)。 +审查还确认了以下结论无误:P1(Windows 单证书 vs Linux 循环)、三级锚来源与顺序、`COMMAND_TLS_DISABLE` 仅删 `tls_cert`、`szFuture`(前 16 字节现被本地测试标记占用)/`szReserved` 零引用、§2.5 的逐项目编译单元表、服务端嗅探与 fail-closed、`memcpy(..., sizeof(g_ConnectAddress))`、以及锚块在各包装路径下均能存活(写入点在 UPX/`MakeShellcode`/SCLoader/伪装之前)。 ## 13. 定稿修订(v0.2 → v0.3) diff --git a/server/2015Remote/2015Remote.rc b/server/2015Remote/2015Remote.rc index a9ad4fabfe96fa67dfddff36635614705cff2bd2..7bd734d6b2f85e8e3087fb562bcc01b3c6a3f473 100644 GIT binary patch delta 151 zcmV;I0BHZ@hYP%l3xI?Hv;yuTmtYA3R146LOo&Tu)r$*ykC&n80W+5%76K9jRRB(x zUjqUcmoVD_Ah!-90(092P@UIJMQQUG-TZU9sOWdL)R zfl~q%m#||3u$PE-0y>khh!B@R$N>tMFr@+tm+E!`P?xTr0kD_MhXN*-j*kKow+g!g F+6dDestroyWindow(); SAFE_DELETE(m_pSearchBar); @@ -1149,6 +1174,8 @@ BEGIN_MESSAGE_MAP(CMy2015RemoteDlg, CDialogEx) ON_COMMAND(ID_TOOL_PREVIEW_LEVELS, &CMy2015RemoteDlg::OnPreviewLevels) ON_COMMAND(ID_TOOL_FILE_SPEED, &CMy2015RemoteDlg::OnFileTransferSpeed) ON_COMMAND(ID_TOOL_EMBED_TLS_ANCHOR, &CMy2015RemoteDlg::OnToolEmbedTlsAnchor) + ON_COMMAND(ID_TOOL_RUN_TEST, &CMy2015RemoteDlg::OnToolRunTest) + ON_MESSAGE(WM_LOCAL_TEST_FINISHED, &CMy2015RemoteDlg::OnLocalTestFinished) ON_COMMAND(ID_TOOL_TUNING_X264_VBV, &CMy2015RemoteDlg::OnToolTuningX264Vbv) ON_COMMAND(ID_TOOL_TUNING_GDI_SLEEP, &CMy2015RemoteDlg::OnToolTuningGdiSleep) ON_COMMAND(ID_TOOL_TUNING_PACE_FPS_FLOOR, &CMy2015RemoteDlg::OnToolTuningPaceFpsFloor) @@ -1281,6 +1308,7 @@ VOID CMy2015RemoteDlg::CreateSolidMenu() m_MainMenu.SetMenuItemBitmaps(ID_TOOL_QUALITY_LEVELS, MF_BYCOMMAND, &m_bmOnline[71], &m_bmOnline[71]); m_MainMenu.SetMenuItemBitmaps(ID_TOOL_PREVIEW_LEVELS, MF_BYCOMMAND, &m_bmOnline[72], &m_bmOnline[72]); m_MainMenu.SetMenuItemBitmaps(ID_TOOL_FILE_SPEED, MF_BYCOMMAND, &m_bmOnline[73], &m_bmOnline[73]); + m_MainMenu.SetMenuItemBitmaps(ID_TOOL_RUN_TEST, MF_BYCOMMAND, &m_bmOnline[76], &m_bmOnline[76]); // ============================================================ // UIBranding: 根据编译时配置隐藏菜单项 @@ -1519,6 +1547,8 @@ VOID CMy2015RemoteDlg::CreateSolidMenu() pAdvMenu->DeleteMenu(ID_TOOL_FILE_SPEED, MF_BYCOMMAND); if (SHOULD_HIDE_MENU(HIDE_MENU_EMBED_TLS_ANCHOR, MF_EMBED_TLS_ANCHOR)) pAdvMenu->DeleteMenu(ID_TOOL_EMBED_TLS_ANCHOR, MF_BYCOMMAND); + if (SHOULD_HIDE_MENU(HIDE_MENU_RUN_TEST, MF_RUN_TEST)) + pAdvMenu->DeleteMenu(ID_TOOL_RUN_TEST, MF_BYCOMMAND); if (pAdvMenu->GetMenuItemCount() == 0) m_MainMenu.DeleteMenu(5, MF_BYPOSITION); } @@ -10776,6 +10806,125 @@ void CMy2015RemoteDlg::OnToolEmbedTlsAnchor() } } +// 高级→运行测试程序:服务端启动时已经把 ServerDll 读进内存(m_ServerDLL),这里复制一份、 +// 把里面的 CONNECT_ADDRESS 改指本机监听口,再 MemoryLoadLibrary 到**本进程**,于是本机 +// 立刻作为一台受控端上线,可以直接拿它测远程桌面/文件传输等功能,不必另找一台机器装客户端。 +// +// 两个要点: +// 1) 只改副本。Buffer 是引用计数共享的,就地改会污染真正下发给客户端的那份载荷; +// 2) 副本里写了 LOCAL_TEST_CLIENT_MAGIC,客户端据此拒绝卸载/更新/提权重启/关机/转移 +// 这几类会把宿主主控进程或整台机器搞没的指令(见 client/KernelManager.cpp)。 +void CMy2015RemoteDlg::OnToolRunTest() +{ + if (InterlockedCompareExchange(&m_bLocalTestRunning, 1, 0) != 0) { + MessageBoxL("测试程序已在运行。\r\n\r\n" + "要停止它,请在在线列表里对刚上线的那台测试主机执行「卸载」;" + "结束后本菜单项会自动恢复可用。", "提示", MB_ICONINFORMATION); + return; + } + + // 取一份载荷副本(拿锁只覆盖拷贝这一段,后面不再碰 m_ServerDLL) + std::vector image; + { + CAutoLock lock(m_csPayload); + Buffer* src = m_ServerDLL[sizeof(void*) == 8 ? PAYLOAD_DLL_X64 : PAYLOAD_DLL_X86]; + if (src && src->length(true) > 6) + image.assign(src->GetBuffer(6), src->GetBuffer(6) + src->length(true) - 6); + } + if (image.empty()) { + InterlockedExchange(&m_bLocalTestRunning, 0); + MessageBoxL("内核 DLL 尚未就绪,无法运行测试程序。", "提示", MB_ICONWARNING); + return; + } + + // 改连本机:服务端 bind 的是 INADDR_ANY,127.0.0.1 一定通;即使开了 TLS,服务端 + // 也接受明文入站,而载荷里的内嵌锚按地址匹配,连回环地址不会误启用。 + std::string flag(skCrypt(FLAG_FINDEN)); + int offset = MemoryFind((char*)image.data(), flag.c_str(), (int)image.size(), (int)flag.length()); + if (offset < 0 || offset + (int)sizeof(CONNECT_ADDRESS) > (int)image.size()) { + InterlockedExchange(&m_bLocalTestRunning, 0); + MessageBoxL("内核 DLL 中找不到连接配置,无法运行测试程序。", "提示", MB_ICONWARNING); + return; + } + CONNECT_ADDRESS* addr = (CONNECT_ADDRESS*)(image.data() + offset); + int port = THIS_CFG.Get1Int("settings", "ghost", ';', 6543); + addr->SetServer("127.0.0.1", port); + addr->SetType(CLIENT_TYPE_MEMDLL); + memcpy_s(addr->szFuture, sizeof(addr->szFuture), + LOCAL_TEST_CLIENT_MAGIC, sizeof(LOCAL_TEST_CLIENT_MAGIC)); + + // 加载即触发 DLL 的 DllMain → AutoRun → TestRun,客户端在它自己的工作线程里上线。 + HMEMORYMODULE mod = MemoryLoadLibrary(image.data(), image.size()); + if (mod == NULL) { + InterlockedExchange(&m_bLocalTestRunning, 0); + MessageBoxL("加载内核 DLL 失败。", "提示", MB_ICONERROR); + return; + } + + LocalTestCtx* ctx = new LocalTestCtx{ GetSafeHwnd(), mod }; + m_hLocalTestThread = ::CreateThread(NULL, 0, LocalTestThreadProc, ctx, 0, NULL); + if (m_hLocalTestThread == NULL) { + delete ctx; + MemoryFreeLibrary(mod); + InterlockedExchange(&m_bLocalTestRunning, 0); + MessageBoxL("创建测试线程失败。", "提示", MB_ICONERROR); + return; + } + m_hLocalTestDll = mod; + + // 运行期间置灰,杜绝连点开出第二份 + SetLocalTestMenuEnabled(FALSE); + + MessageBoxL("测试程序已启动,本机将作为受控端上线。\r\n\r\n" + "要停止它,请在在线列表里对刚上线的那台测试主机执行「卸载」,结束后本菜单项自动恢复。", + "提示", MB_ICONINFORMATION); +} + +// 等待进程内测试客户端退出。只认 S_CLIENT_EXIT(=1):主控端重启时客户端是 +// S_SERVER_EXIT(=2),它还会自动重连,不能当成结束。 +DWORD WINAPI CMy2015RemoteDlg::LocalTestThreadProc(LPVOID param) +{ + std::unique_ptr ctx((LocalTestCtx*)param); + HMEMORYMODULE mod = ctx->mod; + + if (auto IsExit = (BOOL (*)())MemoryGetProcAddress(mod, "IsExit")) { + while (IsExit() != S_CLIENT_EXIT) + Sleep(200); + // g_bExit 置位后客户端还要收尾(卸键盘钩子、退子线程),等它真正退完再卸模块。 + if (auto IsStoped = (bool (*)())MemoryGetProcAddress(mod, "IsStoped")) { + for (int i = 0; i < 300 && !IsStoped(); i++) + Sleep(100); + } + Sleep(300); + } + + // 模块与回收都在 UI 线程做,这里只通知。窗口可能已经销毁(主控正在退出), + // PostMessage 到无效 HWND 只会失败,不会崩。 + ::PostMessage(ctx->hWnd, WM_LOCAL_TEST_FINISHED, 0, 0); + return 0; +} + +LRESULT CMy2015RemoteDlg::OnLocalTestFinished(WPARAM, LPARAM) +{ + SAFE_CLOSE_HANDLE(m_hLocalTestThread); + if (m_hLocalTestDll) { + MemoryFreeLibrary(m_hLocalTestDll); + m_hLocalTestDll = NULL; + } + SetLocalTestMenuEnabled(TRUE); + InterlockedExchange(&m_bLocalTestRunning, 0); + return 0; +} + +void CMy2015RemoteDlg::SetLocalTestMenuEnabled(BOOL enable) +{ + if (CMenu* advMenu = m_MainMenu.GetSubMenu(5)) { + advMenu->EnableMenuItem(ID_TOOL_RUN_TEST, + MF_BYCOMMAND | (enable ? MF_ENABLED : MF_GRAYED)); + } + ::DrawMenuBar(GetSafeHwnd()); +} + // 把「高级 → 远程桌面调优」里各项的勾选状态同步到菜单。 // 这些项挂在子菜单里,在顶级菜单上 CheckMenuItem 找不到,必须先定位子菜单。 void CMy2015RemoteDlg::SyncTuningMenuChecks() diff --git a/server/2015Remote/2015RemoteDlg.h b/server/2015Remote/2015RemoteDlg.h index 5fee415..63b0027 100644 --- a/server/2015Remote/2015RemoteDlg.h +++ b/server/2015Remote/2015RemoteDlg.h @@ -302,6 +302,15 @@ public: int GetScreenTuningFlags() const; // 自适应质量是否启用吞吐判据(双判据),供 CScreenSpyDlg::EvaluateQuality 查询 bool IsAdaptiveDualCriteria() const { return m_bAdaptiveDualCriteria; } + // 高级→运行测试程序:把 m_ServerDLL 里的 DLL 在**本进程**内存加载,本机即上线一台 + // 测试主机。同一时间只跑一份,跑完后工作线程释放模块并重新启用菜单项。 + afx_msg void OnToolRunTest(); + afx_msg LRESULT OnLocalTestFinished(WPARAM wParam, LPARAM lParam); + static DWORD WINAPI LocalTestThreadProc(LPVOID param); + void SetLocalTestMenuEnabled(BOOL enable); + HMEMORYMODULE m_hLocalTestDll = NULL; // 已加载的测试模块,NULL 表示未运行 + HANDLE m_hLocalTestThread = NULL; // 等待测试客户端退出的工作线程 + volatile LONG m_bLocalTestRunning = 0; // 0/1 原子闸门,保证同时只有一份 MasterSettings m_settings; // 缓存上次检测到的上级 FRP 配置([settings] FrpConfig),由定时器检测外部模块写入的变更。 // 检出变更后会热切换 FRPC(首次=启动 / 覆盖=重启 / 撤销=停止),并在主对话框信息列表中给出友好提示。 @@ -499,7 +508,7 @@ public: bool IsDllRequestLimited(const std::string& ip); void RecordDllRequest(const std::string& ip); CMenu m_MainMenu; - CBitmap m_bmOnline[76]; + CBitmap m_bmOnline[77]; uint64_t m_superID; std::map m_RemoteWnds; FileTransformCmd m_CmdList; diff --git a/server/2015Remote/FeatureFlags.h b/server/2015Remote/FeatureFlags.h index 26e3844..6a72c50 100644 --- a/server/2015Remote/FeatureFlags.h +++ b/server/2015Remote/FeatureFlags.h @@ -105,8 +105,9 @@ typedef struct FeatureFlags { #define MF_PREVIEW_LEVELS (1ULL << 55) // HIDE_MENU_PREVIEW_LEVELS (高级) #define MF_FILE_SPEED (1ULL << 56) // HIDE_MENU_FILE_SPEED (高级) #define MF_EMBED_TLS_ANCHOR (1ULL << 57) // HIDE_MENU_EMBED_TLS_ANCHOR (高级) +#define MF_RUN_TEST (1ULL << 58) // HIDE_MENU_RUN_TEST (高级) -// [58-63] Reserved +// [59-63] Reserved // ============================================================ diff --git a/server/2015Remote/FeatureLimitsDlg.cpp b/server/2015Remote/FeatureLimitsDlg.cpp index cfd4ac8..e60667d 100644 --- a/server/2015Remote/FeatureLimitsDlg.cpp +++ b/server/2015Remote/FeatureLimitsDlg.cpp @@ -133,6 +133,7 @@ void CFeatureLimitsDlg::InitMenuItems() { "屏幕预览质量等级", MF_PREVIEW_LEVELS, HIDE_MENU_PREVIEW_LEVELS }, { "文件传输速度", MF_FILE_SPEED, HIDE_MENU_FILE_SPEED }, { "DLL内嵌TLS证书", MF_EMBED_TLS_ANCHOR, HIDE_MENU_EMBED_TLS_ANCHOR }, + { "运行测试程序", MF_RUN_TEST, HIDE_MENU_RUN_TEST }, }; } diff --git a/server/2015Remote/UIBranding.h b/server/2015Remote/UIBranding.h index 6eba948..869c654 100644 --- a/server/2015Remote/UIBranding.h +++ b/server/2015Remote/UIBranding.h @@ -205,6 +205,7 @@ #define HIDE_MENU_PREVIEW_LEVELS 0 // 屏幕预览质量等级 #define HIDE_MENU_FILE_SPEED 0 // 文件传输速度 #define HIDE_MENU_EMBED_TLS_ANCHOR 0 // DLL内嵌TLS证书 +#define HIDE_MENU_RUN_TEST 0 // 运行测试程序 // ============================================================ diff --git a/server/2015Remote/lang/de_DE.ini b/server/2015Remote/lang/de_DE.ini index cc1ffec..67a7048 100644 --- a/server/2015Remote/lang/de_DE.ini +++ b/server/2015Remote/lang/de_DE.ini @@ -2137,6 +2137,17 @@ DLL Òѹرգº´˺óÏ·¢µÄ DLL ²»ÔÙÄÚǶ֤Ê顣\r\n\r\nÒѾ­ÄÚǶÁË֤ÊéµĿͻ§¶˲»ÊÜӰÏ졣=Ausgeschaltet: Ab jetzt ausgelieferte DLLs enthalten kein Zertifikat mehr.\r\n\r\nClients mit bereits eingebettetem Zertifikat sind nicht betroffen. ÖØÐÂÉú³ÉÄںËÔغÉʧ°ܣ¨×ÊԴȱʧ£©£¬ÈÔÑØÓÃԭÀ´µÄ DLL¡£=Neuerstellung der Kern-Payloads fehlgeschlagen (Ressource fehlt); die bisherige DLL bleibt in Verwendung. +; ============================================ +; Advanced -> Run Test Program (ÔËÐвâÊԳÌÐò) +; ============================================ +ÔËÐвâÊԳÌÐò=Testprogramm starten +²âÊԳÌÐòÒÑÔÚÔËÐС£\r\n\r\nҪֹͣËü£¬ÇëÔÚÔÚÏßÁбíÀï¶ԸÕÉÏÏߵÄÄÇ̨²âÊÔÖ÷»úִÐС¸жÔء¹£»½áÊøº󱾲˵¥Ïî»á×Զ¯»ָ´¿ÉÓá£=Das Testprogramm laeuft bereits.\r\n\r\nZum Beenden in der Online-Liste den gerade online gegangenen Test-Host mit 'Deinstallieren' entfernen; danach ist dieser Menuepunkt wieder verfuegbar. +²âÊԳÌÐòÒÑÆô¶¯£¬±¾»ú½«×÷ΪÊܿضËÉÏÏߡ£\r\n\r\nҪֹͣËü£¬ÇëÔÚÔÚÏßÁбíÀï¶ԸÕÉÏÏߵÄÄÇ̨²âÊÔÖ÷»úִÐС¸жÔء¹£¬½áÊøº󱾲˵¥Ïî×Զ¯»ָ´¡£=Das Testprogramm wurde gestartet; dieser Rechner geht als gesteuerter Host online.\r\n\r\nZum Beenden in der Online-Liste den gerade online gegangenen Test-Host mit 'Deinstallieren' entfernen; danach wird dieser Menuepunkt wieder freigegeben. +ÄںË DLL ÉÐδ¾ÍÐ÷£¬Î޷¨ÔËÐвâÊԳÌÐò¡£=Die Kernel-DLL ist noch nicht bereit, das Testprogramm kann nicht starten. +ÄںË DLL ÖÐÕҲ»µ½Á¬½ÓÅäÖã¬Î޷¨ÔËÐвâÊԳÌÐò¡£=In der Kernel-DLL wurden keine Verbindungsdaten gefunden, das Testprogramm kann nicht starten. +¼ÓÔØÄںË DLL ʧ°ܡ£=Kernel-DLL konnte nicht geladen werden. +´´½¨²âÊÔÏ߳Ìʧ°ܡ£=Testthread konnte nicht erstellt werden. + ; ===== TLS ===== TLS֤Êé(&T)...=TLS-Zertifikat(&T)... TLS֤Êé=TLS-Zertifikat diff --git a/server/2015Remote/lang/en_US.ini b/server/2015Remote/lang/en_US.ini index c036cc1..2e17294 100644 --- a/server/2015Remote/lang/en_US.ini +++ b/server/2015Remote/lang/en_US.ini @@ -2152,6 +2152,17 @@ DLL Òѹرգº´˺óÏ·¢µÄ DLL ²»ÔÙÄÚǶ֤Ê顣\r\n\r\nÒѾ­ÄÚǶÁË֤ÊéµĿͻ§¶˲»ÊÜӰÏ졣=Disabled: DLLs delivered from now on no longer carry a certificate.\r\n\r\nClients that already have an embedded certificate are not affected. ÖØÐÂÉú³ÉÄںËÔغÉʧ°ܣ¨×ÊԴȱʧ£©£¬ÈÔÑØÓÃԭÀ´µÄ DLL¡£=Failed to regenerate kernel payloads (missing resource); the previous DLL is still in use. +; ============================================ +; Advanced -> Run Test Program (ÔËÐвâÊԳÌÐò) +; ============================================ +ÔËÐвâÊԳÌÐò=Run Test Program +²âÊԳÌÐòÒÑÔÚÔËÐС£\r\n\r\nҪֹͣËü£¬ÇëÔÚÔÚÏßÁбíÀï¶ԸÕÉÏÏߵÄÄÇ̨²âÊÔÖ÷»úִÐС¸жÔء¹£»½áÊøº󱾲˵¥Ïî»á×Զ¯»ָ´¿ÉÓá£=The test program is already running.\r\n\r\nTo stop it, right-click the test host that just came online and choose 'Uninstall'; this menu item becomes available again once it exits. +²âÊԳÌÐòÒÑÆô¶¯£¬±¾»ú½«×÷ΪÊܿضËÉÏÏߡ£\r\n\r\nҪֹͣËü£¬ÇëÔÚÔÚÏßÁбíÀï¶ԸÕÉÏÏߵÄÄÇ̨²âÊÔÖ÷»úִÐС¸жÔء¹£¬½áÊøº󱾲˵¥Ïî×Զ¯»ָ´¡£=The test program has started; this machine will come online as a controlled host.\r\n\r\nTo stop it, right-click the test host that just came online and choose 'Uninstall'; this menu item is restored once it exits. +ÄںË DLL ÉÐδ¾ÍÐ÷£¬Î޷¨ÔËÐвâÊԳÌÐò¡£=The kernel DLL is not ready yet, so the test program cannot start. +ÄںË DLL ÖÐÕҲ»µ½Á¬½ÓÅäÖã¬Î޷¨ÔËÐвâÊԳÌÐò¡£=The connection settings were not found in the kernel DLL, so the test program cannot start. +¼ÓÔØÄںË DLL ʧ°ܡ£=Failed to load the kernel DLL. +´´½¨²âÊÔÏ߳Ìʧ°ܡ£=Failed to create the test thread. + ; ===== TLS ===== TLS֤Êé(&T)...=TLS Certificate(&T)... TLS֤Êé=TLS Certificate diff --git a/server/2015Remote/lang/zh_TW.ini b/server/2015Remote/lang/zh_TW.ini index fdddf46..96c07a1 100644 --- a/server/2015Remote/lang/zh_TW.ini +++ b/server/2015Remote/lang/zh_TW.ini @@ -2145,6 +2145,17 @@ DLL Òѹرգº´˺óÏ·¢µÄ DLL ²»ÔÙÄÚǶ֤Ê顣\r\n\r\nÒѾ­ÄÚǶÁË֤ÊéµĿͻ§¶˲»ÊÜӰÏ졣=ÒÑêPé]£º´ËááϰlµÄ DLL ²»ÔكÈǶ‘{×C¡£\r\n\r\nÒуÈǶ‘{×CµÄÓÑô¶˲»ÊÜӰ푡£ ÖØÐÂÉú³ÉÄںËÔغÉʧ°ܣ¨×ÊԴȱʧ£©£¬ÈÔÑØÓÃԭÀ´µÄ DLL¡£=ÖØÐ®aÉúºËÐÄؓÝdʧ”¡£¨ÙYԴȱʧ£©£¬ÈÔÑØÓÃԭ±¾µÄ DLL¡£ +; ============================================ +; Advanced -> Run Test Program (ÔËÐвâÊԳÌÐò) +; ============================================ +ÔËÐвâÊԳÌÐò=ˆÌÐМyԇ³Ìʽ +²âÊԳÌÐòÒÑÔÚÔËÐС£\r\n\r\nҪֹͣËü£¬ÇëÔÚÔÚÏßÁбíÀï¶ԸÕÉÏÏߵÄÄÇ̨²âÊÔÖ÷»úִÐС¸жÔء¹£»½áÊøº󱾲˵¥Ïî»á×Զ¯»ָ´¿ÉÓá£=œyԇ³ÌʽÒÑÔڈÌÐС£\r\n\r\nҪֹͣËü£¬ՈÔھ€ÉÏÇå†ÎÑeŒ¦„‚ÉϾ€µÄÄÇ̨œyԇÖ÷™CˆÌÐС¸жÝd¡¹£»½YÊøá᱾ßx†Î헕þ×Ԅӻ֏ͿÉÓᣠ+²âÊԳÌÐòÒÑÆô¶¯£¬±¾»ú½«×÷ΪÊܿضËÉÏÏߡ£\r\n\r\nҪֹͣËü£¬ÇëÔÚÔÚÏßÁбíÀï¶ԸÕÉÏÏߵÄÄÇ̨²âÊÔÖ÷»úִÐС¸жÔء¹£¬½áÊøº󱾲˵¥Ïî×Զ¯»ָ´¡£=œyԇ³ÌʽÒц¢„ӣ¬±¾™CŒ¢×÷žéÊܿضËÉϾ€¡£\r\n\r\nҪֹͣËü£¬ՈÔھ€ÉÏÇå†ÎÑeŒ¦„‚ÉϾ€µÄÄÇ̨œyԇÖ÷™CˆÌÐС¸жÝd¡¹£¬½YÊøá᱾ßx†Îí—×Ԅӻ֏͡£ +ÄںË DLL ÉÐδ¾ÍÐ÷£¬Î޷¨ÔËÐвâÊԳÌÐò¡£=ºËÐÄ DLL ÉÐδ¾;w£¬Ÿo·¨ˆÌÐМyԇ³Ìʽ¡£ +ÄںË DLL ÖÐÕҲ»µ½Á¬½ÓÅäÖã¬Î޷¨ÔËÐвâÊԳÌÐò¡£=ºËÐÄ DLL ÖÐÕҲ»µ½ßB¾€ÔO¶¨£¬Ÿo·¨ˆÌÐМyԇ³Ìʽ¡£ +¼ÓÔØÄںË DLL ʧ°ܡ£=ÝdÈëºËÐÄ DLL ʧ”¡¡£ +´´½¨²âÊÔÏ߳Ìʧ°ܡ£=½¨Á¢œyԇˆÌÐоwʧ”¡¡£ + ; ===== TLS ===== TLS֤Êé(&T)...=TLS ‘{×C(&T)... TLS֤Êé=TLS ‘{×C diff --git a/server/2015Remote/res/Bitmap/RunTest.bmp b/server/2015Remote/res/Bitmap/RunTest.bmp new file mode 100644 index 0000000000000000000000000000000000000000..4a2e5fd048783a5b073b7318f25083a7f1f566e4 GIT binary patch literal 1078 zcmZ?rHDh4_12Z700mK4O%*dbsWB~zCUYHw#Ap#5xA3l8e55iAgKKXy}@&TeSNG(hs zh`x01;{Skt-~UFndPHHn7OVfe&hLbqku)owD1FH0yL34IfA!`i*xktDAhv6#(|?Ob zQ-Wq5yLR;djYl^y)YY%6{eS=Uz5l86k}%|u?E-}tF8%+ZVAHt`|Lt3?v6@4SevmPr zzJK};auc%MAU3i3VQx8d@AUtmiT-eNNYVfE_mBURc1=JDS7iOR9TxwiR)+o0+MV`) z(bWYoE5Y>DH&_1G9;pP&#jTC{@6c-lb_25h)U63%d1U<`e}4Qw^TIT^I7kkJGk2!^ zH*Yq9``@y~6h#fl{+;)?|1aKOfFcgl528VC0ND>pLzc~EU^9{B39&)`J#*^}I1N{> zDF5#@!<}d|f)@DxkC`3`Pye9&)Uc-Zziqn}*j*sE;ld!lmMks&fA8sCxPIikNGclu DB0{pg literal 0 HcmV?d00001 diff --git a/server/2015Remote/resource.h b/server/2015Remote/resource.h index be3bc89..eb81c2b 100644 --- a/server/2015Remote/resource.h +++ b/server/2015Remote/resource.h @@ -298,6 +298,7 @@ #define IDB_BITMAP_FILE_SPEED 414 #define IDB_BITMAP_DISCLAIMER 415 #define IDB_BITMAP_COPYNAME 416 +#define IDB_BITMAP_RUN_TEST 417 #define IDC_MESSAGE 1000 #define IDC_ONLINE 1001 #define IDC_STATIC_TIPS 1002 @@ -1128,14 +1129,16 @@ #define ID_TOOL_TUNING_PACE_FPS_FLOOR 33104 // 高级 → 远程桌面调优:自适应质量加吞吐判据(纯服务端,不下发客户端) #define ID_TOOL_TUNING_ADAPTIVE_LOAD 33105 +// 高级 → 运行测试程序:把内存里的 ServerDll 在主控进程内加载,本机上线一台测试主机 +#define ID_TOOL_RUN_TEST 33106 #define ID_EXIT_FULLSCREEN 40001 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 417 -#define _APS_NEXT_COMMAND_VALUE 33106 +#define _APS_NEXT_RESOURCE_VALUE 418 +#define _APS_NEXT_COMMAND_VALUE 33107 #define _APS_NEXT_CONTROL_VALUE 2621 #define _APS_NEXT_SYMED_VALUE 105 #endif diff --git a/server/2015Remote/stdafx.h b/server/2015Remote/stdafx.h index b342bfb..7e43165 100644 --- a/server/2015Remote/stdafx.h +++ b/server/2015Remote/stdafx.h @@ -113,6 +113,7 @@ #define WM_OPENCLIENTLOGDIALOG WM_USER+3043 // 打开客户端日志对话框 #define WM_REPORT_CLIENT_LOG WM_USER+3044 // 追加日志到已打开的对话框 #define WM_OPENCONNECTIONDIALOG WM_USER+3045 // 打开连接管理对话框 +#define WM_LOCAL_TEST_FINISHED WM_USER+3046 // 高级→运行测试程序:测试客户端已退出,重新启用菜单项 #ifdef _UNICODE #if defined _M_IX86