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:<listen port>, 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
This commit is contained in:
yuanyuanxianganddeepseek-flash committed 2026-11-06 17:17:18 +01:00
1 parent cc9ce35c4d
commit f77b18aa68
18 files changed
+268 -11

No files matched your search

+149
View File
@@ -118,6 +118,13 @@ struct OfflineInfo {
uint64_t clientId; // 用于通知 UI 关闭循环快照窗口
};
// 「高级→运行测试程序」工作线程的入参:窗口句柄只用于结束时 PostMessage,
// 模块句柄只用于调导出函数——都不碰对话框对象,避免主控退出时访问已销毁的 this。
struct LocalTestCtx {
HWND hWnd;
HMEMORYMODULE mod;
};
// DLL 请求限流配置 (缓存,避免频繁读取注册表)
static struct {
int limitSeconds = 3600;
@@ -782,6 +789,7 @@ CMy2015RemoteDlg::CMy2015RemoteDlg(CWnd* pParent): CDialogLangEx(CMy2015RemoteDl
m_bmOnline[73].LoadBitmap(IDB_BITMAP_FILE_SPEED); // 高级→文件传输速度
m_bmOnline[74].LoadBitmap(IDB_BITMAP_DISCLAIMER); // 其他→免责声明
m_bmOnline[75].LoadBitmap(IDB_BITMAP_COPYNAME); // 右键→复制名称
m_bmOnline[76].LoadBitmap(IDB_BITMAP_RUN_TEST); // 高级→运行测试程序
for (int i = 0; i < PAYLOAD_MAXTYPE; i++) {
m_ServerDLL[i] = nullptr;
m_ServerBin[i] = nullptr;
@@ -822,6 +830,23 @@ CMy2015RemoteDlg::~CMy2015RemoteDlg()
MemoryFreeLibrary(m_tinyDLL);
m_tinyDLL = NULL;
}
// 高级→运行测试程序:还在跑就先让进程内的测试客户端退出,等工作线程收尾后再卸模块。
if (m_hLocalTestDll) {
HMEMORYMODULE mod = m_hLocalTestDll;
m_hLocalTestDll = NULL;
if (auto StopRun = (void (*)())MemoryGetProcAddress(mod, "StopRun"))
StopRun();
// 已经连上的测试客户端要等连接断开才会走完收尾,StopRun 拦不住它;进程正在退出时
// 没必要为它干等(实测要耗满 10 秒超时),模块交给系统随进程一起回收。
if (!g_bAppExiting) {
DWORD waited = m_hLocalTestThread ?
WaitForSingleObject(m_hLocalTestThread, 10000) : WAIT_OBJECT_0;
SAFE_CLOSE_HANDLE(m_hLocalTestThread);
// 等待超时说明客户端卡住了,此时不卸模块——进程马上结束,交给系统回收更安全。
if (waited != WAIT_TIMEOUT)
MemoryFreeLibrary(mod);
}
}
if (m_pSearchBar) {
m_pSearchBar->DestroyWindow();
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<BYTE> 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<LocalTestCtx> 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()