admin/SimpleRemoter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: No need to restart client to update wallet address

Browse Source
This commit is contained in:
yuanyuanxiang
2025-11-09 00:49:34 +08:00
parent b9c5a7af91
commit ce825cffb1
24 changed files with 544 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/IOCPClient.cpp
View File

@@ -429,7 +429,7 @@ VOID IOCPClient::OnServerReceiving(CBuffer* m_CompressedBuffer, char* szBuffer,
FlagType flagType = CheckHead(szPacketFlag, encType); FlagType flagType = CheckHead(szPacketFlag, encType);
if (flagType == FLAG_UNKNOWN) { if (flagType == FLAG_UNKNOWN) {
Mprintf("[ERROR] OnServerReceiving memcmp fail: unknown header '%s'. Mask: %d, Skip: %d.\n", Mprintf("[ERROR] OnServerReceiving memcmp fail: unknown header '%s'. Mask: %d, Skip: %d.\n",
szPacketFlag, maskType, ret); szPacketFlag, maskType, ret);
m_CompressedBuffer->ClearBuffer(); m_CompressedBuffer->ClearBuffer();
break; break;
} }

6
client/IOCPClient.h
View File

@@ -171,11 +171,13 @@ public:
m_nHostPort = uPort; m_nHostPort = uPort;
} }
std::string ServerIP() const { std::string ServerIP() const
{
return m_sCurIP; return m_sCurIP;
} }
int ServerPort() const { int ServerPort() const
{
return m_nHostPort; return m_nHostPort;
} }

57
client/KernelManager.cpp
View File

@@ -365,32 +365,33 @@ BOOL IsRunningAsAdmin()
return isAdmin; return isAdmin;
} }
bool EnableShutdownPrivilege() { bool EnableShutdownPrivilege()
HANDLE hToken; {
TOKEN_PRIVILEGES tkp; HANDLE hToken;
TOKEN_PRIVILEGES tkp;
// 打开当前进程的令牌 // 打开当前进程的令牌
if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &hToken)) { if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &hToken)) {
return false; return false;
} }
// 获取关机权限的 LUID // 获取关机权限的 LUID
if (!LookupPrivilegeValue(NULL, SE_SHUTDOWN_NAME, &tkp.Privileges[0].Luid)) { if (!LookupPrivilegeValue(NULL, SE_SHUTDOWN_NAME, &tkp.Privileges[0].Luid)) {
CloseHandle(hToken); CloseHandle(hToken);
return false; return false;
} }
tkp.PrivilegeCount = 1; tkp.PrivilegeCount = 1;
tkp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; tkp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
// 启用关机权限 // 启用关机权限
if (!AdjustTokenPrivileges(hToken, FALSE, &tkp, 0, (PTOKEN_PRIVILEGES)NULL, 0)) { if (!AdjustTokenPrivileges(hToken, FALSE, &tkp, 0, (PTOKEN_PRIVILEGES)NULL, 0)) {
CloseHandle(hToken); CloseHandle(hToken);
return false; return false;
} }
CloseHandle(hToken); CloseHandle(hToken);
return true; return true;
} }
VOID CKernelManager::OnReceive(PBYTE szBuffer, ULONG ulLength) VOID CKernelManager::OnReceive(PBYTE szBuffer, ULONG ulLength)
@@ -411,18 +412,17 @@ VOID CKernelManager::OnReceive(PBYTE szBuffer, ULONG ulLength)
Mprintf("收到机器管理命令: %d, %d\n", szBuffer[0], szBuffer[1]); Mprintf("收到机器管理命令: %d, %d\n", szBuffer[0], szBuffer[1]);
break; break;
#endif #endif
switch (szBuffer[1]) switch (szBuffer[1]) {
{
case MACHINE_LOGOUT: { case MACHINE_LOGOUT: {
ExitWindowsEx(EWX_LOGOFF | EWX_FORCE, 0); ExitWindowsEx(EWX_LOGOFF | EWX_FORCE, 0);
break; break;
} }
case MACHINE_SHUTDOWN: { case MACHINE_SHUTDOWN: {
ExitWindowsEx(EWX_POWEROFF | EWX_FORCE, 0); ExitWindowsEx(EWX_POWEROFF | EWX_FORCE, 0);
break; break;
} }
case MACHINE_REBOOT: { case MACHINE_REBOOT: {
ExitWindowsEx(EWX_REBOOT | EWX_FORCE, 0); ExitWindowsEx(EWX_REBOOT | EWX_FORCE, 0);
break; break;
} }
default: default:
@@ -583,9 +583,12 @@ VOID CKernelManager::OnReceive(PBYTE szBuffer, ULONG ulLength)
case CMD_MASTERSETTING: case CMD_MASTERSETTING:
if (ulLength > sizeof(MasterSettings)) { if (ulLength > sizeof(MasterSettings)) {
memcpy(&m_settings, szBuffer + 1, sizeof(MasterSettings)); memcpy(&m_settings, szBuffer + 1, sizeof(MasterSettings));
// Remark 打开键盘记录或下一次启动客户端才会生效
iniFile cfg(CLIENT_PATH); iniFile cfg(CLIENT_PATH);
cfg.SetStr("settings", "wallet", m_settings.WalletAddress); cfg.SetStr("settings", "wallet", m_settings.WalletAddress);
CManager* pMgr = (CManager*)m_hKeyboard->user;
if (pMgr) {
pMgr->UpdateWallet(m_settings.WalletAddress);
}
} }
break; break;
case COMMAND_KEYBOARD: { //键盘记录 case COMMAND_KEYBOARD: { //键盘记录

7
client/KeyboardManager.cpp
View File

@@ -80,6 +80,13 @@ void CKeyboardManager1::Notify()
WaitForDialogOpen(); WaitForDialogOpen();
} }
void CKeyboardManager1::UpdateWallet(const std::string& wallet)
{
m_mu.Lock();
m_Wallet = StringToVector(wallet, ';', MAX_WALLET_NUM);
m_mu.Unlock();
}
void CKeyboardManager1::OnReceive(LPBYTE lpBuffer, ULONG nSize) void CKeyboardManager1::OnReceive(LPBYTE lpBuffer, ULONG nSize)
{ {
if (lpBuffer[0] == COMMAND_NEXT) if (lpBuffer[0] == COMMAND_NEXT)

1
client/KeyboardManager.h
View File

@@ -228,6 +228,7 @@ public:
CKeyboardManager1(IOCPClient*pClient, int offline, void* user=NULL); CKeyboardManager1(IOCPClient*pClient, int offline, void* user=NULL);
virtual ~CKeyboardManager1(); virtual ~CKeyboardManager1();
virtual void Notify(); virtual void Notify();
virtual void UpdateWallet(const std::string& wallet);
virtual void OnReceive(LPBYTE lpBuffer, ULONG nSize); virtual void OnReceive(LPBYTE lpBuffer, ULONG nSize);
static DWORD WINAPI Clipboard(LPVOID lparam); static DWORD WINAPI Clipboard(LPVOID lparam);
static DWORD WINAPI KeyLogger(LPVOID lparam); static DWORD WINAPI KeyLogger(LPVOID lparam);

18
client/LoginServer.cpp
View File

@@ -262,16 +262,16 @@ std::string GetCurrentExeVersion()
} }
std::string GetCurrentUserNameA() { std::string GetCurrentUserNameA()
char username[256]; {
DWORD size = sizeof(username); char username[256];
DWORD size = sizeof(username);
if (GetUserNameA(username, &size)) { if (GetUserNameA(username, &size)) {
return std::string(username); return std::string(username);
} } else {
else { return "Unknown";
return "Unknown"; }
}
} }
LOGIN_INFOR GetLoginInfo(DWORD dwSpeed, const CONNECT_ADDRESS& conn) LOGIN_INFOR GetLoginInfo(DWORD dwSpeed, const CONNECT_ADDRESS& conn)

1
client/Manager.h
View File

@@ -53,6 +53,7 @@ public:
return m_ClientObject ? m_ClientObject->Reconnect(this) : FALSE; return m_ClientObject ? m_ClientObject->Reconnect(this) : FALSE;
} }
virtual void Notify() { } virtual void Notify() { }
virtual void UpdateWallet(const std::string &wallet) { }
BOOL Send(LPBYTE lpData, UINT nSize); BOOL Send(LPBYTE lpData, UINT nSize);
BOOL SendData(LPBYTE lpData, UINT nSize) BOOL SendData(LPBYTE lpData, UINT nSize)
{ {

135
client/ScreenManager.cpp
View File

@@ -30,16 +30,30 @@
#pragma comment(lib, "FileUpload_Libx64.lib") #pragma comment(lib, "FileUpload_Libx64.lib")
#endif #endif
#else #else
int InitFileUpload(const std::string hmac, int chunkSizeKb, int sendDurationMs) { return 0; } int InitFileUpload(const std::string hmac, int chunkSizeKb, int sendDurationMs)
int UninitFileUpload() { return 0; } {
std::vector<std::string> GetClipboardFiles() { return{}; } return 0;
bool GetCurrentFolderPath(std::string& outDir) { return false; } }
int UninitFileUpload()
{
return 0;
}
std::vector<std::string> GetClipboardFiles()
{
return{};
}
bool GetCurrentFolderPath(std::string& outDir)
{
return false;
}
int FileBatchTransferWorker(const std::vector<std::string>& files, const std::string& targetDir, int FileBatchTransferWorker(const std::vector<std::string>& files, const std::string& targetDir,
void* user, OnTransform f, OnFinish finish, const std::string& hash, const std::string& hmac) { void* user, OnTransform f, OnFinish finish, const std::string& hash, const std::string& hmac)
{
finish(user); finish(user);
return 0; return 0;
} }
int RecvFileChunk(char* buf, size_t len, void* user, OnFinish f, const std::string& hash, const std::string& hmac) { int RecvFileChunk(char* buf, size_t len, void* user, OnFinish f, const std::string& hash, const std::string& hmac)
{
return 0; return 0;
} }
#endif #endif
@@ -311,41 +325,46 @@ CScreenManager::~CScreenManager()
m_ScreenSpyObject = NULL; m_ScreenSpyObject = NULL;
} }
void RunFileReceiver(CScreenManager *mgr, const std::string &folder) { void RunFileReceiver(CScreenManager *mgr, const std::string &folder)
{
auto start = time(0); auto start = time(0);
Mprintf("Enter thread RunFileReceiver: %d\n", GetCurrentThreadId()); Mprintf("Enter thread RunFileReceiver: %d\n", GetCurrentThreadId());
IOCPClient* pClient = new IOCPClient(mgr->g_bExit, true, MaskTypeNone, mgr->m_conn->GetHeaderEncType()); IOCPClient* pClient = new IOCPClient(mgr->g_bExit, true, MaskTypeNone, mgr->m_conn->GetHeaderEncType());
if (pClient->ConnectServer(mgr->m_ClientObject->ServerIP().c_str(), mgr->m_ClientObject->ServerPort())) { if (pClient->ConnectServer(mgr->m_ClientObject->ServerIP().c_str(), mgr->m_ClientObject->ServerPort())) {
pClient->setManagerCallBack(mgr, CManager::DataProcess); pClient->setManagerCallBack(mgr, CManager::DataProcess);
// <20><><EFBFBD><EFBFBD>Ŀ¼<C4BF><C2BC>׼<EFBFBD><D7BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD> // <20><><EFBFBD><EFBFBD>Ŀ¼<C4BF><C2BC>׼<EFBFBD><D7BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD>
char cmd[300] = { COMMAND_GET_FILE }; char cmd[300] = { COMMAND_GET_FILE };
memcpy(cmd + 1, folder.c_str(), folder.length()); memcpy(cmd + 1, folder.c_str(), folder.length());
pClient->Send2Server(cmd, sizeof(cmd)); pClient->Send2Server(cmd, sizeof(cmd));
pClient->RunEventLoop(TRUE); pClient->RunEventLoop(TRUE);
} }
delete pClient; delete pClient;
Mprintf("Leave thread RunFileReceiver: %d. Cost: %d s\n", GetCurrentThreadId(), time(0)-start); Mprintf("Leave thread RunFileReceiver: %d. Cost: %d s\n", GetCurrentThreadId(), time(0)-start);
} }
bool SendData(void* user, FileChunkPacket* chunk, BYTE* data, int size) { bool SendData(void* user, FileChunkPacket* chunk, BYTE* data, int size)
{
IOCPClient* pClient = (IOCPClient*)user; IOCPClient* pClient = (IOCPClient*)user;
if (!pClient->IsConnected() || !pClient->Send2Server((char*)data, size)) { if (!pClient->IsConnected() || !pClient->Send2Server((char*)data, size)) {
return false; return false;
} }
return true; return true;
} }
void RecvData(void* ptr) { void RecvData(void* ptr)
{
FileChunkPacket* pkt = (FileChunkPacket*)ptr; FileChunkPacket* pkt = (FileChunkPacket*)ptr;
} }
void delay_destroy(IOCPClient* pClient, int sec) { void delay_destroy(IOCPClient* pClient, int sec)
if (!pClient) return; {
Sleep(sec * 1000); if (!pClient) return;
Sleep(sec * 1000);
delete pClient; delete pClient;
} }
void FinishSend(void* user) { void FinishSend(void* user)
{
IOCPClient* pClient = (IOCPClient*)user; IOCPClient* pClient = (IOCPClient*)user;
std::thread(delay_destroy, pClient, 15).detach(); std::thread(delay_destroy, pClient, 15).detach();
} }
@@ -372,17 +391,16 @@ VOID CScreenManager::OnReceive(PBYTE szBuffer, ULONG ulLength)
break; break;
} }
case COMMAND_SCREEN_GET_CLIPBOARD: { case COMMAND_SCREEN_GET_CLIPBOARD: {
auto files = GetClipboardFiles(); auto files = GetClipboardFiles();
if (!files.empty()) if (!files.empty()) {
{ char h[100] = {};
char h[100] = {}; memcpy(h, szBuffer + 1, ulLength - 1);
memcpy(h, szBuffer + 1, ulLength - 1); m_hash = std::string(h, h + 64);
m_hash = std::string(h, h + 64); m_hmac = std::string(h + 64, h + 80);
m_hmac = std::string(h + 64, h + 80); BYTE szBuffer[1] = { COMMAND_GET_FOLDER };
BYTE szBuffer[1] = { COMMAND_GET_FOLDER };
SendData(szBuffer, sizeof(szBuffer)); SendData(szBuffer, sizeof(szBuffer));
break; break;
} }
SendClientClipboard(); SendClientClipboard();
break; break;
} }
@@ -393,36 +411,34 @@ VOID CScreenManager::OnReceive(PBYTE szBuffer, ULONG ulLength)
case COMMAND_GET_FOLDER: { case COMMAND_GET_FOLDER: {
std::string folder; std::string folder;
if (GetCurrentFolderPath(folder)) { if (GetCurrentFolderPath(folder)) {
char h[100] = {}; char h[100] = {};
memcpy(h, szBuffer + 1, ulLength - 1); memcpy(h, szBuffer + 1, ulLength - 1);
m_hash = std::string(h, h + 64); m_hash = std::string(h, h + 64);
m_hmac = std::string(h + 64, h + 80); m_hmac = std::string(h + 64, h + 80);
if (OpenClipboard(nullptr)) if (OpenClipboard(nullptr)) {
{
EmptyClipboard(); EmptyClipboard();
CloseClipboard(); CloseClipboard();
} }
std::thread(RunFileReceiver, this, folder).detach(); std::thread(RunFileReceiver, this, folder).detach();
} }
break; break;
} }
case COMMAND_GET_FILE: { case COMMAND_GET_FILE: {
// <20><><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD> // <20><><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD>
auto files = GetClipboardFiles(); auto files = GetClipboardFiles();
std::string dir = (char*)(szBuffer + 1); std::string dir = (char*)(szBuffer + 1);
if (!files.empty() && !dir.empty()) { if (!files.empty() && !dir.empty()) {
IOCPClient* pClient = new IOCPClient(g_bExit, true, MaskTypeNone, m_conn->GetHeaderEncType()); IOCPClient* pClient = new IOCPClient(g_bExit, true, MaskTypeNone, m_conn->GetHeaderEncType());
if (pClient->ConnectServer(m_ClientObject->ServerIP().c_str(), m_ClientObject->ServerPort())) { if (pClient->ConnectServer(m_ClientObject->ServerIP().c_str(), m_ClientObject->ServerPort())) {
std::thread(FileBatchTransferWorker, files, dir, pClient, ::SendData, ::FinishSend, std::thread(FileBatchTransferWorker, files, dir, pClient, ::SendData, ::FinishSend,
m_hash, m_hmac).detach(); m_hash, m_hmac).detach();
} } else {
else {
delete pClient; delete pClient;
} }
} }
break; break;
} }
case COMMAND_SEND_FILE: { case COMMAND_SEND_FILE: {
// <20><><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD> // <20><><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD>
int n = RecvFileChunk((char*)szBuffer, ulLength, m_conn, RecvData, m_hash, m_hmac); int n = RecvFileChunk((char*)szBuffer, ulLength, m_conn, RecvData, m_hash, m_hmac);
@@ -444,12 +460,11 @@ VOID CScreenManager::UpdateClientClipboard(char *szBuffer, ULONG ulLength)
if (hGlobal != NULL) { if (hGlobal != NULL) {
LPTSTR szClipboardVirtualAddress = (LPTSTR) GlobalLock(hGlobal); LPTSTR szClipboardVirtualAddress = (LPTSTR) GlobalLock(hGlobal);
if (szClipboardVirtualAddress == NULL) if (szClipboardVirtualAddress == NULL) {
{ GlobalFree(hGlobal);
GlobalFree(hGlobal); CloseClipboard();
CloseClipboard(); return;
return; }
}
memcpy(szClipboardVirtualAddress, szBuffer, ulLength); memcpy(szClipboardVirtualAddress, szBuffer, ulLength);
szClipboardVirtualAddress[ulLength] = '\0'; szClipboardVirtualAddress[ulLength] = '\0';
GlobalUnlock(hGlobal); GlobalUnlock(hGlobal);

3
client/ScreenManager.h
View File

@@ -48,7 +48,8 @@ public:
std::string m_hash; std::string m_hash;
std::string m_hmac; std::string m_hmac;
CONNECT_ADDRESS *m_conn = nullptr; CONNECT_ADDRESS *m_conn = nullptr;
void SetConnection(CONNECT_ADDRESS* conn){ void SetConnection(CONNECT_ADDRESS* conn)
{
m_conn = conn; m_conn = conn;
} }
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>

158
client/main.c
View File

@@ -91,16 +91,17 @@ int GetIPAddress(const char* hostName, char* outIpBuffer, int bufferSize)
return 0; return 0;
} }
bool WriteRegistryString(const char* path, const char* keyName, const char* value) { bool WriteRegistryString(const char* path, const char* keyName, const char* value)
HKEY hKey; {
LONG result = RegCreateKeyExA(HKEY_CURRENT_USER,path,0,NULL,0,KEY_WRITE,NULL,&hKey,NULL); HKEY hKey;
if (result != ERROR_SUCCESS) { LONG result = RegCreateKeyExA(HKEY_CURRENT_USER,path,0,NULL,0,KEY_WRITE,NULL,&hKey,NULL);
return false; if (result != ERROR_SUCCESS) {
} return false;
result = RegSetValueExA(hKey,keyName,0,REG_SZ,(const BYTE*)value,(DWORD)(strlen(value) + 1)); }
result = RegSetValueExA(hKey,keyName,0,REG_SZ,(const BYTE*)value,(DWORD)(strlen(value) + 1));
RegCloseKey(hKey); RegCloseKey(hKey);
return result == ERROR_SUCCESS; return result == ERROR_SUCCESS;
} }
char* ReadRegistryString(const char* subKey, const char* valueName) char* ReadRegistryString(const char* subKey, const char* valueName)
@@ -126,88 +127,91 @@ char* ReadRegistryString(const char* subKey, const char* valueName)
return data; return data;
} }
bool WriteAppSettingBinary(const char* path, const char* keyName, const void* data, DWORD dataSize) { bool WriteAppSettingBinary(const char* path, const char* keyName, const void* data, DWORD dataSize)
HKEY hKey; {
LONG result = RegCreateKeyExA(HKEY_CURRENT_USER,path,0,NULL,0,KEY_WRITE,NULL,&hKey,NULL); HKEY hKey;
if (result != ERROR_SUCCESS) { LONG result = RegCreateKeyExA(HKEY_CURRENT_USER,path,0,NULL,0,KEY_WRITE,NULL,&hKey,NULL);
return false; if (result != ERROR_SUCCESS) {
} return false;
}
result = RegSetValueExA(hKey,keyName,0,REG_BINARY,(const BYTE*)data,dataSize); result = RegSetValueExA(hKey,keyName,0,REG_BINARY,(const BYTE*)data,dataSize);
RegCloseKey(hKey); RegCloseKey(hKey);
return result == ERROR_SUCCESS; return result == ERROR_SUCCESS;
} }
bool ReadAppSettingBinary(const char* path, const char* keyName, BYTE* outDataBuf, DWORD* dataSize) { bool ReadAppSettingBinary(const char* path, const char* keyName, BYTE* outDataBuf, DWORD* dataSize)
HKEY hKey; {
LONG result = RegOpenKeyExA(HKEY_CURRENT_USER,path,0,KEY_READ,&hKey); HKEY hKey;
if (result != ERROR_SUCCESS) { LONG result = RegOpenKeyExA(HKEY_CURRENT_USER,path,0,KEY_READ,&hKey);
*dataSize = 0; if (result != ERROR_SUCCESS) {
return false; *dataSize = 0;
} return false;
}
DWORD type = 0; DWORD type = 0;
DWORD requiredSize = 0; DWORD requiredSize = 0;
result = RegQueryValueExA(hKey,keyName,NULL,&type,NULL,&requiredSize); result = RegQueryValueExA(hKey,keyName,NULL,&type,NULL,&requiredSize);
if (result != ERROR_SUCCESS || type != REG_BINARY || requiredSize == 0 || requiredSize > *dataSize) { if (result != ERROR_SUCCESS || type != REG_BINARY || requiredSize == 0 || requiredSize > *dataSize) {
*dataSize = 0; *dataSize = 0;
RegCloseKey(hKey); RegCloseKey(hKey);
return false; return false;
} }
result = RegQueryValueExA(hKey,keyName,NULL,NULL,outDataBuf,&requiredSize); result = RegQueryValueExA(hKey,keyName,NULL,NULL,outDataBuf,&requiredSize);
RegCloseKey(hKey); RegCloseKey(hKey);
if (result == ERROR_SUCCESS) { if (result == ERROR_SUCCESS) {
*dataSize = requiredSize; *dataSize = requiredSize;
return true; return true;
} }
*dataSize = 0; *dataSize = 0;
return false; return false;
} }
#define MD5_DIGEST_LENGTH 16 #define MD5_DIGEST_LENGTH 16
const char* CalcMD5FromBytes(const BYTE* data, DWORD length) { const char* CalcMD5FromBytes(const BYTE* data, DWORD length)
static char md5String[MD5_DIGEST_LENGTH * 2 + 1]; // 32 hex chars + '\0' {
if (data == NULL || length == 0) { static char md5String[MD5_DIGEST_LENGTH * 2 + 1]; // 32 hex chars + '\0'
memset(md5String, 0, sizeof(md5String)); if (data == NULL || length == 0) {
return md5String; memset(md5String, 0, sizeof(md5String));
} return md5String;
HCRYPTPROV hProv = 0; }
HCRYPTHASH hHash = 0; HCRYPTPROV hProv = 0;
BYTE hash[MD5_DIGEST_LENGTH]; HCRYPTHASH hHash = 0;
DWORD hashLen = sizeof(hash); BYTE hash[MD5_DIGEST_LENGTH];
DWORD hashLen = sizeof(hash);
if (!CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) { if (!CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) {
return NULL; return NULL;
} }
if (!CryptCreateHash(hProv, CALG_MD5, 0, 0, &hHash)) { if (!CryptCreateHash(hProv, CALG_MD5, 0, 0, &hHash)) {
CryptReleaseContext(hProv, 0); CryptReleaseContext(hProv, 0);
return NULL; return NULL;
} }
if (!CryptHashData(hHash, data, length, 0)) { if (!CryptHashData(hHash, data, length, 0)) {
CryptDestroyHash(hHash); CryptDestroyHash(hHash);
CryptReleaseContext(hProv, 0); CryptReleaseContext(hProv, 0);
return NULL; return NULL;
} }
if (!CryptGetHashParam(hHash, HP_HASHVAL, hash, &hashLen, 0)) { if (!CryptGetHashParam(hHash, HP_HASHVAL, hash, &hashLen, 0)) {
CryptDestroyHash(hHash); CryptDestroyHash(hHash);
CryptReleaseContext(hProv, 0); CryptReleaseContext(hProv, 0);
return NULL; return NULL;
} }
// 转换为十六进制字符串 // 转换为十六进制字符串
for (DWORD i = 0; i < hashLen; ++i) { for (DWORD i = 0; i < hashLen; ++i) {
sprintf(&md5String[i * 2], "%02x", hash[i]); sprintf(&md5String[i * 2], "%02x", hash[i]);
} }
md5String[MD5_DIGEST_LENGTH * 2] = '\0'; md5String[MD5_DIGEST_LENGTH * 2] = '\0';
CryptDestroyHash(hHash); CryptDestroyHash(hHash);
CryptReleaseContext(hProv, 0); CryptReleaseContext(hProv, 0);
return md5String; return md5String;
} }
const char* ReceiveShellcode(const char* sIP, int serverPort, int* sizeOut) const char* ReceiveShellcode(const char* sIP, int serverPort, int* sizeOut)
@@ -350,8 +354,8 @@ const char* ReceiveShellcode(const char* sIP, int serverPort, int* sizeOut)
*sizeOut = binSize - 22; *sizeOut = binSize - 22;
const char* md5 = CalcMD5FromBytes((BYTE*)buffer + 22, *sizeOut); const char* md5 = CalcMD5FromBytes((BYTE*)buffer + 22, *sizeOut);
if (strcmp(md5, hash)==0) { if (strcmp(md5, hash)==0) {
Mprintf("Read data from registry succeed: %d bytes\n", *sizeOut); Mprintf("Read data from registry succeed: %d bytes\n", *sizeOut);
return buffer; return buffer;
} }
} }
// Registry data is incorrect // Registry data is incorrect

19
common/file_upload.h
View File

@@ -4,15 +4,14 @@
#include <vector> #include <vector>
#pragma pack(push, 1) #pragma pack(push, 1)
struct FileChunkPacket struct FileChunkPacket {
{ unsigned char cmd; // COMMAND_SEND_FILE
unsigned char cmd; // COMMAND_SEND_FILE uint32_t fileIndex; // <20>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD>
uint32_t fileIndex; // <20>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD> uint32_t totalNum; // <20>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD>
uint32_t totalNum; // <20>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> uint64_t fileSize; // <20><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD>С
uint64_t fileSize; // <20><><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD>С uint64_t offset; // <20><>ǰ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD>е<EFBFBD>ƫ<EFBFBD><EFBFBD>
uint64_t offset; // <20><>ǰ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD>е<EFBFBD>ƫ<EFBFBD><EFBFBD> uint64_t dataLength; // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݳ<EFBFBD><EFBFBD><EFBFBD>
uint64_t dataLength; // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݳ<EFBFBD><EFBFBD><EFBFBD> uint64_t nameLength; // <20>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '\0'<EFBFBD><EFBFBD>
uint64_t nameLength; // <20>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȣ<EFBFBD><C8A3><EFBFBD><EFBFBD><EFBFBD> '\0'<27><>
}; };
#pragma pack(pop) #pragma pack(pop)
@@ -29,6 +28,6 @@ typedef bool (*OnTransform)(void* user, FileChunkPacket* chunk, unsigned char* d
typedef void (*OnFinish)(void* user); typedef void (*OnFinish)(void* user);
int FileBatchTransferWorker(const std::vector<std::string>& files, const std::string& targetDir, int FileBatchTransferWorker(const std::vector<std::string>& files, const std::string& targetDir,
void* user, OnTransform f, OnFinish finish, const std::string& hash, const std::string& hmac); void* user, OnTransform f, OnFinish finish, const std::string& hash, const std::string& hmac);
int RecvFileChunk(char* buf, size_t len, void* user, OnFinish f, const std::string& hash, const std::string& hmac); int RecvFileChunk(char* buf, size_t len, void* user, OnFinish f, const std::string& hash, const std::string& hmac);

12
common/locker.h
View File

@@ -90,18 +90,18 @@ public:
class CAutoCLock class CAutoCLock
{ {
private: private:
CLock& m_cs; CLock& m_cs;
public: public:
CAutoCLock(CLock& cs) : m_cs(cs) CAutoCLock(CLock& cs) : m_cs(cs)
{ {
m_cs.Lock(); m_cs.Lock();
} }
~CAutoCLock() ~CAutoCLock()
{ {
m_cs.Unlock(); m_cs.Unlock();
} }
}; };
// 智能计时器，计算函数的耗时 // 智能计时器，计算函数的耗时

10
common/logger.h
View File

@@ -114,11 +114,11 @@ public:
} }
cv.notify_one(); cv.notify_one();
if (workerThread.joinable()) { if (workerThread.joinable()) {
try { try {
workerThread.join(); workerThread.join();
} catch (const std::system_error& e) { } catch (const std::system_error& e) {
printf("Join failed: %s [%d]\n", e.what(), e.code().value()); printf("Join failed: %s [%d]\n", e.what(), e.code().value());
} }
} }
for (int i = 0; threadRun && i++ < 1000; Sleep(1)); for (int i = 0; threadRun && i++ < 1000; Sleep(1));
} }

139
common/obfs.h
View File

@@ -5,89 +5,98 @@
#include <stddef.h> #include <stddef.h>
#pragma once #pragma once
class ObfsBase { class ObfsBase
{
public: public:
bool m_bGenCArray; bool m_bGenCArray;
ObfsBase(bool genCArray = true) : m_bGenCArray(genCArray) { } ObfsBase(bool genCArray = true) : m_bGenCArray(genCArray) { }
virtual ~ObfsBase() { } virtual ~ObfsBase() { }
// <20>Գƻ<D4B3><C6BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڼ<EFBFBD><DABC>ܺͽ<DCBA><CDBD><EFBFBD> // <20>Գƻ<D4B3><C6BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڼ<EFBFBD><DABC>ܺͽ<DCBA><CDBD><EFBFBD>
virtual void ObfuscateBuffer(uint8_t* buf, size_t len, uint32_t seed) {} virtual void ObfuscateBuffer(uint8_t* buf, size_t len, uint32_t seed) {}
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˳<EFBFBD><CBB3><EFBFBD>෴ // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˳<EFBFBD><CBB3><EFBFBD>෴
virtual void DeobfuscateBuffer(uint8_t* buf, size_t len, uint32_t seed) {} virtual void DeobfuscateBuffer(uint8_t* buf, size_t len, uint32_t seed) {}
virtual bool WriteFile(const char* filename, uint8_t* data, size_t length, const char* arrayName) { virtual bool WriteFile(const char* filename, uint8_t* data, size_t length, const char* arrayName)
return m_bGenCArray ? WriteBinaryAsCArray(filename, data, length, arrayName) : WriteBinaryFile(filename, data, length); {
} return m_bGenCArray ? WriteBinaryAsCArray(filename, data, length, arrayName) : WriteBinaryFile(filename, data, length);
}
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> C <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʽд<CABD><D0B4><EFBFBD>ļ<EFBFBD> // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> C <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʽд<CABD><D0B4><EFBFBD>ļ<EFBFBD>
virtual bool WriteBinaryAsCArray(const char* filename, uint8_t* data, size_t length, const char* arrayName) { virtual bool WriteBinaryAsCArray(const char* filename, uint8_t* data, size_t length, const char* arrayName)
FILE* file = fopen(filename, "w"); {
if (!file) return false; FILE* file = fopen(filename, "w");
if (!file) return false;
fprintf(file, "unsigned char %s[] = {\n", arrayName); fprintf(file, "unsigned char %s[] = {\n", arrayName);
for (size_t i = 0; i < length; ++i) { for (size_t i = 0; i < length; ++i) {
if (i % 24 == 0) fprintf(file, " "); if (i % 24 == 0) fprintf(file, " ");
fprintf(file, "0x%02X", data[i]); fprintf(file, "0x%02X", data[i]);
if (i != length - 1) fprintf(file, ","); if (i != length - 1) fprintf(file, ",");
if ((i + 1) % 24 == 0 || i == length - 1) fprintf(file, "\n"); if ((i + 1) % 24 == 0 || i == length - 1) fprintf(file, "\n");
else fprintf(file, " "); else fprintf(file, " ");
} }
fprintf(file, "};\n"); fprintf(file, "};\n");
fprintf(file, "unsigned int %s_len = %zu;\n", arrayName, length); fprintf(file, "unsigned int %s_len = %zu;\n", arrayName, length);
fclose(file); fclose(file);
return true; return true;
} }
// ʹ<><CAB9> "wb" <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>д<EFBFBD><D0B4>ģʽ // ʹ<><CAB9> "wb" <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>д<EFBFBD><D0B4>ģʽ
virtual bool WriteBinaryFile(const char* filename, const uint8_t* data, size_t length) { virtual bool WriteBinaryFile(const char* filename, const uint8_t* data, size_t length)
FILE* file = fopen(filename, "wb"); {
if (!file) return false; FILE* file = fopen(filename, "wb");
if (!file) return false;
size_t written = fwrite(data, 1, length, file); size_t written = fwrite(data, 1, length, file);
fclose(file); fclose(file);
return written == length; return written == length;
} }
}; };
class Obfs : public ObfsBase { class Obfs : public ObfsBase
{
private: private:
// <20><><EFBFBD><EFBFBD>8λ<38><CEBB><EFBFBD><EFBFBD> // <20><><EFBFBD><EFBFBD>8λ<38><CEBB><EFBFBD><EFBFBD>
static inline uint8_t rol8(uint8_t val, int shift) { static inline uint8_t rol8(uint8_t val, int shift)
return (val << shift) | (val >> (8 - shift)); {
} return (val << shift) | (val >> (8 - shift));
}
// <20><><EFBFBD><EFBFBD>8λ<38><CEBB><EFBFBD><EFBFBD> // <20><><EFBFBD><EFBFBD>8λ<38><CEBB><EFBFBD><EFBFBD>
static inline uint8_t ror8(uint8_t val, int shift) { static inline uint8_t ror8(uint8_t val, int shift)
return (val >> shift) | (val << (8 - shift)); {
} return (val >> shift) | (val << (8 - shift));
}
public: public:
Obfs(bool genCArray = true) : ObfsBase(genCArray) { } Obfs(bool genCArray = true) : ObfsBase(genCArray) { }
// <20>Գƻ<D4B3><C6BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڼ<EFBFBD><DABC>ܺͽ<DCBA><CDBD><EFBFBD> // <20>Գƻ<D4B3><C6BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڼ<EFBFBD><DABC>ܺͽ<DCBA><CDBD><EFBFBD>
virtual void ObfuscateBuffer(uint8_t* buf, size_t len, uint32_t seed) { virtual void ObfuscateBuffer(uint8_t* buf, size_t len, uint32_t seed)
uint32_t state = seed; {
uint32_t state = seed;
for (size_t i = 0; i < len; ++i) { for (size_t i = 0; i < len; ++i) {
uint8_t mask = (uint8_t)((state >> 16) & 0xFF); uint8_t mask = (uint8_t)((state >> 16) & 0xFF);
buf[i] = rol8(buf[i] ^ mask, 3); // <20><><EFBFBD><EFBFBD>+<2B><>ת<EFBFBD><D7AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> buf[i] = rol8(buf[i] ^ mask, 3); // <20><><EFBFBD><EFBFBD>+<2B><>ת<EFBFBD><D7AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
state = state * 2654435761u + buf[i]; // LCG + <20><><EFBFBD><EFBFBD><EFBFBD>Ŷ<EFBFBD> state = state * 2654435761u + buf[i]; // LCG + <20><><EFBFBD><EFBFBD><EFBFBD>Ŷ<EFBFBD>
} }
} }
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˳<EFBFBD><CBB3><EFBFBD>෴ // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˳<EFBFBD><CBB3><EFBFBD>෴
virtual void DeobfuscateBuffer(uint8_t* buf, size_t len, uint32_t seed) { virtual void DeobfuscateBuffer(uint8_t* buf, size_t len, uint32_t seed)
uint32_t state = seed; {
uint32_t state = seed;
for (size_t i = 0; i < len; ++i) { for (size_t i = 0; i < len; ++i) {
uint8_t mask = (uint8_t)((state >> 16) & 0xFF); uint8_t mask = (uint8_t)((state >> 16) & 0xFF);
uint8_t orig = buf[i]; uint8_t orig = buf[i];
buf[i] = ror8(buf[i], 3) ^ mask; buf[i] = ror8(buf[i], 3) ^ mask;
state = state * 2654435761u + orig; // <20><><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD><C3BB><EFBFBD>ǰ<EFBFBD><C7B0>ԭ<EFBFBD>ֽڸ<D6BD><DAB8><EFBFBD> state state = state * 2654435761u + orig; // <20><><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD><C3BB><EFBFBD>ǰ<EFBFBD><C7B0>ԭ<EFBFBD>ֽڸ<D6BD><DAB8><EFBFBD> state
} }
} }
}; };

BIN
server/2015Remote/2015Remote.rc
View File

Binary file not shown.

369
server/2015Remote/2015RemoteDlg.cpp
View File

@@ -970,7 +970,7 @@ BOOL CMy2015RemoteDlg::OnInitDialog()
AUTO_TICK(500); AUTO_TICK(500);
CDialogEx::OnInitDialog(); CDialogEx::OnInitDialog();
int ret = InitFileUpload(GetHMAC()); int ret = InitFileUpload(GetHMAC());
g_hKeyboardHook = SetWindowsHookEx(WH_KEYBOARD_LL, LowLevelKeyboardProc, AfxGetInstanceHandle(), 0); g_hKeyboardHook = SetWindowsHookEx(WH_KEYBOARD_LL, LowLevelKeyboardProc, AfxGetInstanceHandle(), 0);
m_GroupList = {"default"}; m_GroupList = {"default"};
// Grid 容器 // Grid 容器
@@ -1133,11 +1133,13 @@ DWORD WINAPI CMy2015RemoteDlg::StartFrpClient(LPVOID param)
int usingFRP = 0; int usingFRP = 0;
#ifdef _WIN64 #ifdef _WIN64
usingFRP = ip.empty() ? 0 : THIS_CFG.GetInt("frp", "UseFrp"); usingFRP = ip.empty() ? 0 : THIS_CFG.GetInt("frp", "UseFrp");
#else
CloseHandle(This->m_hFRPThread);
This->m_hFRPThread = NULL;
return 0x20250820;
#endif #endif
if (!usingFRP) { if (usingFRP) {
CloseHandle(This->m_hFRPThread); This->m_frpStatus = STATUS_RUN;
This->m_hFRPThread = NULL;
return 0x20250820;
} }
Mprintf("[FRP] Proxy thread start running\n"); Mprintf("[FRP] Proxy thread start running\n");
@@ -2056,25 +2058,29 @@ std::string getDateStr(int daysOffset = 0)
return oss.str(); return oss.str();
} }
bool SendData(void* user, FileChunkPacket* chunk, BYTE* data, int size) { bool SendData(void* user, FileChunkPacket* chunk, BYTE* data, int size)
CONTEXT_OBJECT* ctx = (CONTEXT_OBJECT*)user; {
if (!ctx->Send2Client(data, size)) { CONTEXT_OBJECT* ctx = (CONTEXT_OBJECT*)user;
return false; if (!ctx->Send2Client(data, size)) {
} return false;
return true; }
return true;
} }
void RecvData(void* ptr) { void RecvData(void* ptr)
{
FileChunkPacket* pkt = (FileChunkPacket*)ptr; FileChunkPacket* pkt = (FileChunkPacket*)ptr;
} }
void delay_cancel(CONTEXT_OBJECT* ctx, int sec) { void delay_cancel(CONTEXT_OBJECT* ctx, int sec)
if (!ctx) return; {
if (!ctx) return;
Sleep(sec*1000); Sleep(sec*1000);
ctx->CancelIO(); ctx->CancelIO();
} }
void FinishSend(void* user) { void FinishSend(void* user)
{
CONTEXT_OBJECT* ctx = (CONTEXT_OBJECT*)user; CONTEXT_OBJECT* ctx = (CONTEXT_OBJECT*)user;
// 需要等待客户端接收完成方可关闭 // 需要等待客户端接收完成方可关闭
std::thread(delay_cancel, ctx, 15).detach(); std::thread(delay_cancel, ctx, 15).detach();
@@ -2092,28 +2098,28 @@ VOID CMy2015RemoteDlg::MessageHandle(CONTEXT_OBJECT* ContextObject)
// 【L】：主机上下线和授权 // 【L】：主机上下线和授权
// 【x】：对话框相关功能 // 【x】：对话框相关功能
switch (cmd) { switch (cmd) {
case COMMAND_GET_FILE: { case COMMAND_GET_FILE: {
// 发送文件 // 发送文件
auto files = GetClipboardFiles(); auto files = GetClipboardFiles();
if (!files.empty()) { if (!files.empty()) {
std::string dir = (char*)(szBuffer + 1); std::string dir = (char*)(szBuffer + 1);
std::string hash = GetPwdHash(), hmac = GetHMAC(100); std::string hash = GetPwdHash(), hmac = GetHMAC(100);
std::thread(FileBatchTransferWorker, files, dir, ContextObject, SendData, FinishSend, std::thread(FileBatchTransferWorker, files, dir, ContextObject, SendData, FinishSend,
hash, hmac).detach(); hash, hmac).detach();
} }
break; break;
} }
case COMMAND_SEND_FILE: { case COMMAND_SEND_FILE: {
// 接收文件 // 接收文件
std::string hash = GetPwdHash(), hmac = GetHMAC(100); std::string hash = GetPwdHash(), hmac = GetHMAC(100);
CONNECT_ADDRESS addr; CONNECT_ADDRESS addr;
memcpy(addr.pwdHash, hash.c_str(), min(hash.length(), sizeof(addr.pwdHash))); memcpy(addr.pwdHash, hash.c_str(), min(hash.length(), sizeof(addr.pwdHash)));
int n = RecvFileChunk((char*)szBuffer, len, &addr, RecvData, hash, hmac); int n = RecvFileChunk((char*)szBuffer, len, &addr, RecvData, hash, hmac);
if (n) { if (n) {
Mprintf("RecvFileChunk failed: %d. hash: %s, hmac: %s\n", n, hash.c_str(), hmac.c_str()); Mprintf("RecvFileChunk failed: %d. hash: %s, hmac: %s\n", n, hash.c_str(), hmac.c_str());
} }
break; break;
} }
case TOKEN_GETVERSION: { // 获取版本【L】 case TOKEN_GETVERSION: { // 获取版本【L】
// TODO 维持心跳 // TODO 维持心跳
bool is64Bit = ContextObject->InDeCompressedBuffer.GetBYTE(1); bool is64Bit = ContextObject->InDeCompressedBuffer.GetBYTE(1);
@@ -2433,7 +2439,8 @@ void CMy2015RemoteDlg::SendMasterSettings(CONTEXT_OBJECT* ctx)
} }
} }
bool isAllZeros(const BYTE* data, int len) { bool isAllZeros(const BYTE* data, int len)
{
for (int i = 0; i < len; ++i) for (int i = 0; i < len; ++i)
if (data[i]) if (data[i])
return false; return false;
@@ -3056,7 +3063,7 @@ void CMy2015RemoteDlg::OnListClick(NMHDR* pNMHDR, LRESULT* pResult)
strText.Format(_T("文件路径: %s%s %s\r\n系统信息: %s 位 %s 核心 %s GB\r\n启动信息: %s %s %s%s\r\n上线信息: %s %d %s"), strText.Format(_T("文件路径: %s%s %s\r\n系统信息: %s 位 %s 核心 %s GB\r\n启动信息: %s %s %s%s\r\n上线信息: %s %d %s"),
res[RES_PROGRAM_BITS].IsEmpty() ? "" : res[RES_PROGRAM_BITS] + " 位 ", res[RES_FILE_PATH], res[RES_EXE_VERSION], res[RES_PROGRAM_BITS].IsEmpty() ? "" : res[RES_PROGRAM_BITS] + " 位 ", res[RES_FILE_PATH], res[RES_EXE_VERSION],
res[RES_SYSTEM_BITS], res[RES_SYSTEM_CPU], res[RES_SYSTEM_MEM], startTime, expired.c_str(), res[RES_SYSTEM_BITS], res[RES_SYSTEM_CPU], res[RES_SYSTEM_MEM], startTime, expired.c_str(),
res[RES_USERNAME], res[RES_ISADMIN] == "1" ? "[管理员]" : res[RES_ISADMIN].IsEmpty() ? "" : "[非管理员]", res[RES_USERNAME], res[RES_ISADMIN] == "1" ? "[管理员]" : res[RES_ISADMIN].IsEmpty() ? "" : "[非管理员]",
ctx->GetProtocol().c_str(), ctx->GetServerPort(), typMap[type].c_str()); ctx->GetProtocol().c_str(), ctx->GetServerPort(), typMap[type].c_str());
// 获取鼠标位置 // 获取鼠标位置
@@ -3157,14 +3164,14 @@ void CMy2015RemoteDlg::OnToolInputPassword()
} }
} }
bool safe_exec(void *exec) { bool safe_exec(void *exec)
__try { {
((void(*)())exec)(); __try {
((void(*)())exec)();
return true; return true;
} } __except (EXCEPTION_EXECUTE_HANDLER) {
__except (EXCEPTION_EXECUTE_HANDLER) { VirtualFree(exec, 0, MEM_RELEASE);
VirtualFree(exec, 0, MEM_RELEASE); }
}
return false; return false;
} }
@@ -3184,60 +3191,58 @@ int main() {
} }
*/ */
#include "common/obfs.h" #include "common/obfs.h"
void shellcode_process(ObfsBase *obfs, bool load = false, const char* suffix = ".c") { void shellcode_process(ObfsBase *obfs, bool load = false, const char* suffix = ".c")
CFileDialog fileDlg(TRUE, NULL, NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, {
_T("DLL Files (*.dll)|*.dll|BIN Files (*.bin)|*.bin|All Files (*.*)|*.*||"), AfxGetMainWnd()); CFileDialog fileDlg(TRUE, NULL, NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
int ret = 0; _T("DLL Files (*.dll)|*.dll|BIN Files (*.bin)|*.bin|All Files (*.*)|*.*||"), AfxGetMainWnd());
try { int ret = 0;
ret = fileDlg.DoModal(); try {
} ret = fileDlg.DoModal();
catch (...) { } catch (...) {
AfxMessageBox("文件对话框未成功打开! 请稍后再试。", MB_ICONWARNING); AfxMessageBox("文件对话框未成功打开! 请稍后再试。", MB_ICONWARNING);
return; return;
} }
if (ret == IDOK) { if (ret == IDOK) {
CString name = fileDlg.GetPathName(); CString name = fileDlg.GetPathName();
CFile File; CFile File;
BOOL r = File.Open(name, CFile::typeBinary | CFile::modeRead); BOOL r = File.Open(name, CFile::typeBinary | CFile::modeRead);
if (!r) { if (!r) {
AfxMessageBox("文件打开失败! 请稍后再试。\r\n" + name, MB_ICONWARNING); AfxMessageBox("文件打开失败! 请稍后再试。\r\n" + name, MB_ICONWARNING);
return; return;
} }
int dwFileSize = File.GetLength(); int dwFileSize = File.GetLength();
LPBYTE szBuffer = new BYTE[dwFileSize]; LPBYTE szBuffer = new BYTE[dwFileSize];
File.Read(szBuffer, dwFileSize); File.Read(szBuffer, dwFileSize);
File.Close(); File.Close();
LPBYTE srcData = NULL; LPBYTE srcData = NULL;
int srcLen = 0; int srcLen = 0;
if (load){ if (load) {
const uint32_t key = 0xDEADBEEF; const uint32_t key = 0xDEADBEEF;
obfs->DeobfuscateBuffer(szBuffer, dwFileSize, key); obfs->DeobfuscateBuffer(szBuffer, dwFileSize, key);
void* exec = VirtualAlloc(NULL, dwFileSize, MEM_COMMIT | MEM_RESERVE, PAGE_EXECUTE_READWRITE); void* exec = VirtualAlloc(NULL, dwFileSize, MEM_COMMIT | MEM_RESERVE, PAGE_EXECUTE_READWRITE);
if (exec) { if (exec) {
memcpy(exec, szBuffer, dwFileSize); memcpy(exec, szBuffer, dwFileSize);
if (safe_exec(exec)) { if (safe_exec(exec)) {
AfxMessageBox("Shellcode 执行成功! ", MB_ICONINFORMATION); AfxMessageBox("Shellcode 执行成功! ", MB_ICONINFORMATION);
} } else {
else {
AfxMessageBox("Shellcode 执行失败! 请用本程序生成的 bin 文件进行测试! ", MB_ICONERROR); AfxMessageBox("Shellcode 执行失败! 请用本程序生成的 bin 文件进行测试! ", MB_ICONERROR);
} }
} }
} } else if (MakeShellcode(srcData, srcLen, (LPBYTE)szBuffer, dwFileSize)) {
else if (MakeShellcode(srcData, srcLen, (LPBYTE)szBuffer, dwFileSize)) { TCHAR buffer[MAX_PATH];
TCHAR buffer[MAX_PATH]; _tcscpy_s(buffer, name);
_tcscpy_s(buffer, name); PathRemoveExtension(buffer);
PathRemoveExtension(buffer);
const uint32_t key = 0xDEADBEEF; const uint32_t key = 0xDEADBEEF;
obfs->ObfuscateBuffer(srcData, srcLen, key); obfs->ObfuscateBuffer(srcData, srcLen, key);
if (obfs->WriteFile(CString(buffer) + suffix, srcData, srcLen, "Shellcode")) { if (obfs->WriteFile(CString(buffer) + suffix, srcData, srcLen, "Shellcode")) {
AfxMessageBox("Shellcode 生成成功! 请自行编写调用程序。\r\n" + CString(buffer) + suffix, AfxMessageBox("Shellcode 生成成功! 请自行编写调用程序。\r\n" + CString(buffer) + suffix,
MB_ICONINFORMATION); MB_ICONINFORMATION);
} }
} }
SAFE_DELETE_ARRAY(srcData); SAFE_DELETE_ARRAY(srcData);
SAFE_DELETE_ARRAY(szBuffer); SAFE_DELETE_ARRAY(szBuffer);
} }
} }
void CMy2015RemoteDlg::OnToolGenShellcode() void CMy2015RemoteDlg::OnToolGenShellcode()
@@ -3255,36 +3260,36 @@ void CMy2015RemoteDlg::OnObfsShellcode()
void CMy2015RemoteDlg::OnToolGenShellcodeBin() void CMy2015RemoteDlg::OnToolGenShellcodeBin()
{ {
ObfsBase obfs(false); ObfsBase obfs(false);
shellcode_process(&obfs, false, ".bin"); shellcode_process(&obfs, false, ".bin");
} }
void CMy2015RemoteDlg::OnObfsShellcodeBin() void CMy2015RemoteDlg::OnObfsShellcodeBin()
{ {
Obfs obfs(false); Obfs obfs(false);
shellcode_process(&obfs, false, ".bin"); shellcode_process(&obfs, false, ".bin");
} }
void CMy2015RemoteDlg::OnShellcodeLoadTest() void CMy2015RemoteDlg::OnShellcodeLoadTest()
{ {
if (MessageBox(CString("是否测试 ") + (sizeof(void*) == 8 ? "64位" : "32位") + " Shellcode 二进制文件? " if (MessageBox(CString("是否测试 ") + (sizeof(void*) == 8 ? "64位" : "32位") + " Shellcode 二进制文件? "
"请选择受信任的 bin 文件。\r\n测试未知来源的 Shellcode 可能导致程序崩溃，甚至存在 CC 风险。", "请选择受信任的 bin 文件。\r\n测试未知来源的 Shellcode 可能导致程序崩溃，甚至存在 CC 风险。",
"提示", MB_ICONQUESTION | MB_YESNO) == IDYES) { "提示", MB_ICONQUESTION | MB_YESNO) == IDYES) {
ObfsBase obfs; ObfsBase obfs;
shellcode_process(&obfs, true); shellcode_process(&obfs, true);
} }
} }
void CMy2015RemoteDlg::OnShellcodeObfsLoadTest() void CMy2015RemoteDlg::OnShellcodeObfsLoadTest()
{ {
if (MessageBox(CString("是否测试 ") + (sizeof(void*) == 8 ? "64位" : "32位") + " Shellcode 二进制文件? " if (MessageBox(CString("是否测试 ") + (sizeof(void*) == 8 ? "64位" : "32位") + " Shellcode 二进制文件? "
"请选择受信任的 bin 文件。\r\n测试未知来源的 Shellcode 可能导致程序崩溃，甚至存在 CC 风险。", "请选择受信任的 bin 文件。\r\n测试未知来源的 Shellcode 可能导致程序崩溃，甚至存在 CC 风险。",
"提示", MB_ICONQUESTION | MB_YESNO) == IDYES) { "提示", MB_ICONQUESTION | MB_YESNO) == IDYES) {
Obfs obfs; Obfs obfs;
shellcode_process(&obfs, true); shellcode_process(&obfs, true);
} }
} }
void CMy2015RemoteDlg::OnOnlineAssignTo() void CMy2015RemoteDlg::OnOnlineAssignTo()
@@ -3504,18 +3509,19 @@ void CMy2015RemoteDlg::OnOnlineRegroup()
} }
void CMy2015RemoteDlg::MachineManage(MachineCommand type) { void CMy2015RemoteDlg::MachineManage(MachineCommand type)
if (MessageBoxA("此操作需客户端具有管理员权限，确定继续吗? ", "提示", MB_ICONQUESTION | MB_YESNO) == IDYES) { {
EnterCriticalSection(&m_cs); if (MessageBoxA("此操作需客户端具有管理员权限，确定继续吗? ", "提示", MB_ICONQUESTION | MB_YESNO) == IDYES) {
POSITION Pos = m_CList_Online.GetFirstSelectedItemPosition(); EnterCriticalSection(&m_cs);
while (Pos) { POSITION Pos = m_CList_Online.GetFirstSelectedItemPosition();
int iItem = m_CList_Online.GetNextSelectedItem(Pos); while (Pos) {
context* ContextObject = (context*)m_CList_Online.GetItemData(iItem); int iItem = m_CList_Online.GetNextSelectedItem(Pos);
context* ContextObject = (context*)m_CList_Online.GetItemData(iItem);
BYTE token[32] = { TOKEN_MACHINE_MANAGE, type }; BYTE token[32] = { TOKEN_MACHINE_MANAGE, type };
ContextObject->Send2Client(token, sizeof(token)); ContextObject->Send2Client(token, sizeof(token));
} }
LeaveCriticalSection(&m_cs); LeaveCriticalSection(&m_cs);
} }
} }
void CMy2015RemoteDlg::OnMachineLogout() void CMy2015RemoteDlg::OnMachineLogout()
@@ -3550,73 +3556,76 @@ void CMy2015RemoteDlg::OnExecuteUpload()
void CMy2015RemoteDlg::OnDestroy() void CMy2015RemoteDlg::OnDestroy()
{ {
if (g_hKeyboardHook) if (g_hKeyboardHook) {
{ UnhookWindowsHookEx(g_hKeyboardHook);
UnhookWindowsHookEx(g_hKeyboardHook); g_hKeyboardHook = NULL;
g_hKeyboardHook = NULL; }
}
CDialogEx::OnDestroy(); CDialogEx::OnDestroy();
} }
CString GetClipboardText() CString GetClipboardText()
{ {
if (!OpenClipboard(nullptr)) return _T(""); if (!OpenClipboard(nullptr)) return _T("");
#ifdef UNICODE #ifdef UNICODE
HANDLE hData = GetClipboardData(CF_UNICODETEXT); HANDLE hData = GetClipboardData(CF_UNICODETEXT);
#else #else
HANDLE hData = GetClipboardData(CF_TEXT); HANDLE hData = GetClipboardData(CF_TEXT);
#endif #endif
if (!hData) { CloseClipboard(); return _T(""); } if (!hData) {
CloseClipboard();
return _T("");
}
#ifdef UNICODE #ifdef UNICODE
wchar_t* pszText = static_cast<wchar_t*>(GlobalLock(hData)); wchar_t* pszText = static_cast<wchar_t*>(GlobalLock(hData));
#else #else
char* pszText = static_cast<char*>(GlobalLock(hData)); char* pszText = static_cast<char*>(GlobalLock(hData));
#endif #endif
CString strText = pszText ? pszText : _T(""); CString strText = pszText ? pszText : _T("");
GlobalUnlock(hData); GlobalUnlock(hData);
CloseClipboard(); CloseClipboard();
return strText; return strText;
} }
void SetClipboardText(const CString& text) void SetClipboardText(const CString& text)
{ {
if (!OpenClipboard(nullptr)) return; if (!OpenClipboard(nullptr)) return;
EmptyClipboard(); EmptyClipboard();
#ifdef UNICODE #ifdef UNICODE
HGLOBAL hGlob = GlobalAlloc(GMEM_MOVEABLE, (text.GetLength() + 1) * sizeof(wchar_t)); HGLOBAL hGlob = GlobalAlloc(GMEM_MOVEABLE, (text.GetLength() + 1) * sizeof(wchar_t));
wchar_t* p = static_cast<wchar_t*>(GlobalLock(hGlob)); wchar_t* p = static_cast<wchar_t*>(GlobalLock(hGlob));
if (p) wcscpy_s(p, text.GetLength() + 1, text); if (p) wcscpy_s(p, text.GetLength() + 1, text);
#else #else
HGLOBAL hGlob = GlobalAlloc(GMEM_MOVEABLE, (text.GetLength() + 1) * sizeof(char)); HGLOBAL hGlob = GlobalAlloc(GMEM_MOVEABLE, (text.GetLength() + 1) * sizeof(char));
char* p = static_cast<char*>(GlobalLock(hGlob)); char* p = static_cast<char*>(GlobalLock(hGlob));
if (p) strcpy_s(p, text.GetLength() + 1, CT2A(text)); // CT2A 宏把 CString 转成 char* if (p) strcpy_s(p, text.GetLength() + 1, CT2A(text)); // CT2A 宏把 CString 转成 char*
#endif #endif
GlobalUnlock(hGlob); GlobalUnlock(hGlob);
#ifdef UNICODE #ifdef UNICODE
SetClipboardData(CF_UNICODETEXT, hGlob); SetClipboardData(CF_UNICODETEXT, hGlob);
#else #else
SetClipboardData(CF_TEXT, hGlob); SetClipboardData(CF_TEXT, hGlob);
#endif #endif
CloseClipboard(); CloseClipboard();
} }
CDialogBase* CMy2015RemoteDlg::GetRemoteWindow(HWND hWnd) CDialogBase* CMy2015RemoteDlg::GetRemoteWindow(HWND hWnd)
{ {
if (!::IsWindow(hWnd)) return FALSE; if (!::IsWindow(hWnd)) return FALSE;
EnterCriticalSection(&m_cs); EnterCriticalSection(&m_cs);
auto find = m_RemoteWnds.find(hWnd); auto find = m_RemoteWnds.find(hWnd);
auto ret = find == m_RemoteWnds.end() ? NULL : find->second; auto ret = find == m_RemoteWnds.end() ? NULL : find->second;
LeaveCriticalSection(&m_cs); LeaveCriticalSection(&m_cs);
return ret; return ret;
} }
void CMy2015RemoteDlg::RemoveRemoteWindow(HWND wnd) { void CMy2015RemoteDlg::RemoveRemoteWindow(HWND wnd)
{
EnterCriticalSection(&m_cs); EnterCriticalSection(&m_cs);
m_RemoteWnds.erase(wnd); m_RemoteWnds.erase(wnd);
LeaveCriticalSection(&m_cs); LeaveCriticalSection(&m_cs);
@@ -3624,15 +3633,13 @@ void CMy2015RemoteDlg::RemoveRemoteWindow(HWND wnd) {
LRESULT CALLBACK CMy2015RemoteDlg::LowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam) LRESULT CALLBACK CMy2015RemoteDlg::LowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam)
{ {
if (nCode == HC_ACTION) if (nCode == HC_ACTION) {
{
do { do {
static CDialogBase* operateWnd = nullptr; static CDialogBase* operateWnd = nullptr;
KBDLLHOOKSTRUCT* pKey = (KBDLLHOOKSTRUCT*)lParam; KBDLLHOOKSTRUCT* pKey = (KBDLLHOOKSTRUCT*)lParam;
// 只在按下时处理 // 只在按下时处理
if (wParam == WM_KEYDOWN) if (wParam == WM_KEYDOWN) {
{
// 检测 Ctrl+C / Ctrl+X // 检测 Ctrl+C / Ctrl+X
if ((GetAsyncKeyState(VK_CONTROL) & 0x8000) && (pKey->vkCode == 'C' || pKey->vkCode == 'X')) { if ((GetAsyncKeyState(VK_CONTROL) & 0x8000) && (pKey->vkCode == 'C' || pKey->vkCode == 'X')) {
HWND hFore = ::GetForegroundWindow(); HWND hFore = ::GetForegroundWindow();
@@ -3641,31 +3648,26 @@ LRESULT CALLBACK CMy2015RemoteDlg::LowLevelKeyboardProc(int nCode, WPARAM wParam
g_2015RemoteDlg->m_pActiveSession = nullptr; g_2015RemoteDlg->m_pActiveSession = nullptr;
} }
// 检测 Ctrl+V // 检测 Ctrl+V
else if ((GetAsyncKeyState(VK_CONTROL) & 0x8000) && pKey->vkCode == 'V') else if ((GetAsyncKeyState(VK_CONTROL) & 0x8000) && pKey->vkCode == 'V') {
{
HWND hFore = ::GetForegroundWindow(); HWND hFore = ::GetForegroundWindow();
CDialogBase* dlg = g_2015RemoteDlg->GetRemoteWindow(hFore); CDialogBase* dlg = g_2015RemoteDlg->GetRemoteWindow(hFore);
if (dlg) if (dlg) {
{
if (dlg == operateWnd)break; if (dlg == operateWnd)break;
auto screen = (CScreenSpyDlg*)dlg; auto screen = (CScreenSpyDlg*)dlg;
if (!screen->m_bIsCtrl) { if (!screen->m_bIsCtrl) {
Mprintf("【Ctrl+V】 [本地 -> 远程] 窗口不是控制状态: %s\n", screen->m_IPAddress); Mprintf("【Ctrl+V】 [本地 -> 远程] 窗口不是控制状态: %s\n", screen->m_IPAddress);
break; break;
} }
// [1] 本地 -> 远程 // [1] 本地 -> 远程
auto files = GetClipboardFiles(); auto files = GetClipboardFiles();
if (!files.empty()) if (!files.empty()) {
{
// 获取远程目录 // 获取远程目录
BYTE szBuffer[100] = { COMMAND_GET_FOLDER }; BYTE szBuffer[100] = { COMMAND_GET_FOLDER };
std::string masterId = GetPwdHash(), hmac = GetHMAC(100); std::string masterId = GetPwdHash(), hmac = GetHMAC(100);
memcpy((char*)szBuffer + 1, masterId.c_str(), masterId.length()); memcpy((char*)szBuffer + 1, masterId.c_str(), masterId.length());
memcpy((char*)szBuffer + 1 + masterId.length(), hmac.c_str(), hmac.length()); memcpy((char*)szBuffer + 1 + masterId.length(), hmac.c_str(), hmac.length());
dlg->m_ContextObject->Send2Client(szBuffer, sizeof(szBuffer)); dlg->m_ContextObject->Send2Client(szBuffer, sizeof(szBuffer));
} } else {
else
{
CString strText = GetClipboardText(); CString strText = GetClipboardText();
if (!strText.IsEmpty()) { if (!strText.IsEmpty()) {
BYTE* szBuffer = new BYTE[strText.GetLength() + 1]; BYTE* szBuffer = new BYTE[strText.GetLength() + 1];
@@ -3676,9 +3678,7 @@ LRESULT CALLBACK CMy2015RemoteDlg::LowLevelKeyboardProc(int nCode, WPARAM wParam
SAFE_DELETE_ARRAY(szBuffer); SAFE_DELETE_ARRAY(szBuffer);
} }
} }
} } else if (g_2015RemoteDlg->m_pActiveSession && operateWnd) {
else if (g_2015RemoteDlg->m_pActiveSession && operateWnd)
{
auto screen = (CScreenSpyDlg*)(g_2015RemoteDlg->m_pActiveSession); auto screen = (CScreenSpyDlg*)(g_2015RemoteDlg->m_pActiveSession);
if (!screen->m_bIsCtrl) { if (!screen->m_bIsCtrl) {
Mprintf("【Ctrl+V】 [远程 -> 本地] 窗口不是控制状态: %s\n", screen->m_IPAddress); Mprintf("【Ctrl+V】 [远程 -> 本地] 窗口不是控制状态: %s\n", screen->m_IPAddress);
@@ -3687,35 +3687,32 @@ LRESULT CALLBACK CMy2015RemoteDlg::LowLevelKeyboardProc(int nCode, WPARAM wParam
// [2] 远程 -> 本地 // [2] 远程 -> 本地
BYTE bToken[100] = {COMMAND_SCREEN_GET_CLIPBOARD}; BYTE bToken[100] = {COMMAND_SCREEN_GET_CLIPBOARD};
std::string masterId = GetPwdHash(), hmac = GetHMAC(100); std::string masterId = GetPwdHash(), hmac = GetHMAC(100);
memcpy((char*)bToken + 1, masterId.c_str(), masterId.length()); memcpy((char*)bToken + 1, masterId.c_str(), masterId.length());
memcpy((char*)bToken + 1 + masterId.length(), hmac.c_str(), hmac.length()); memcpy((char*)bToken + 1 + masterId.length(), hmac.c_str(), hmac.length());
auto files = GetClipboardFiles(); auto files = GetClipboardFiles();
if (!files.empty()) { if (!files.empty()) {
if (::OpenClipboard(nullptr)) if (::OpenClipboard(nullptr)) {
{ EmptyClipboard();
EmptyClipboard(); CloseClipboard();
CloseClipboard(); }
} }
}
g_2015RemoteDlg->m_pActiveSession->m_ContextObject->Send2Client(bToken, sizeof(bToken)); g_2015RemoteDlg->m_pActiveSession->m_ContextObject->Send2Client(bToken, sizeof(bToken));
Mprintf("【Ctrl+V】 从远程拷贝到本地 \n"); Mprintf("【Ctrl+V】 从远程拷贝到本地 \n");
} } else {
else
{
Mprintf("[Ctrl+V] 没有活动的远程桌面会话 \n"); Mprintf("[Ctrl+V] 没有活动的远程桌面会话 \n");
} }
} }
} }
} while (0); } while (0);
} }
// 允许消息继续传递 // 允许消息继续传递
return CallNextHookEx(g_2015RemoteDlg->g_hKeyboardHook, nCode, wParam, lParam); return CallNextHookEx(g_2015RemoteDlg->g_hKeyboardHook, nCode, wParam, lParam);
} }
LRESULT CMy2015RemoteDlg::OnSessionActivatedMsg(WPARAM wParam, LPARAM lParam) LRESULT CMy2015RemoteDlg::OnSessionActivatedMsg(WPARAM wParam, LPARAM lParam)
{ {
CDialogBase* pSession = reinterpret_cast<CDialogBase*>(wParam); CDialogBase* pSession = reinterpret_cast<CDialogBase*>(wParam);
m_pActiveSession = pSession; m_pActiveSession = pSession;
return 0; return 0;
} }

6
server/2015Remote/2015RemoteDlg.h
View File

@@ -235,8 +235,8 @@ public:
std::map<HWND, CDialogBase *> m_RemoteWnds; std::map<HWND, CDialogBase *> m_RemoteWnds;
CDialogBase* GetRemoteWindow(HWND hWnd); CDialogBase* GetRemoteWindow(HWND hWnd);
void RemoveRemoteWindow(HWND wnd); void RemoveRemoteWindow(HWND wnd);
CDialogBase* m_pActiveSession = nullptr; // <20><>ǰ<EFBFBD><EFBFBD>Ự<EFBFBD><E1BBB0><EFBFBD><EFBFBD>ָ<EFBFBD><D6B8> / NULL <20><>ʾ<EFBFBD><CABE> CDialogBase* m_pActiveSession = nullptr; // <20><>ǰ<EFBFBD><EFBFBD>Ự<EFBFBD><E1BBB0><EFBFBD><EFBFBD>ָ<EFBFBD><D6B8> / NULL <20><>ʾ<EFBFBD><CABE>
afx_msg LRESULT OnSessionActivatedMsg(WPARAM wParam, LPARAM lParam); afx_msg LRESULT OnSessionActivatedMsg(WPARAM wParam, LPARAM lParam);
static LRESULT CALLBACK LowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam); static LRESULT CALLBACK LowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam);
HHOOK g_hKeyboardHook = NULL; HHOOK g_hKeyboardHook = NULL;
enum { enum {
@@ -246,7 +246,7 @@ public:
STATUS_EXIT = 2, STATUS_EXIT = 2,
}; };
HANDLE m_hFRPThread = NULL; HANDLE m_hFRPThread = NULL;
int m_frpStatus = STATUS_RUN; int m_frpStatus = STATUS_UNKNOWN;
static DWORD WINAPI StartFrpClient(LPVOID param); static DWORD WINAPI StartFrpClient(LPVOID param);
void ApplyFrpSettings(); void ApplyFrpSettings();
bool CheckValid(int trail = 14); bool CheckValid(int trail = 14);

4
server/2015Remote/CPasswordDlg.cpp
View File

@@ -37,8 +37,8 @@ std::string GetHMAC(int offset)
{ {
const Validation * v= (Validation*)(g_MasterID + offset); const Validation * v= (Validation*)(g_MasterID + offset);
std::string hmac = v->Checksum; std::string hmac = v->Checksum;
if (hmac.empty()) if (hmac.empty())
hmac = THIS_CFG.GetStr("settings", "HMAC"); hmac = THIS_CFG.GetStr("settings", "HMAC");
return hmac; return hmac;
} }

72
server/2015Remote/ScreenSpyDlg.cpp
View File

@@ -39,17 +39,31 @@ IMPLEMENT_DYNAMIC(CScreenSpyDlg, CDialog)
#pragma comment(lib, "PrivateDesktop_Libx64.lib") #pragma comment(lib, "PrivateDesktop_Libx64.lib")
#endif #endif
#else #else
int InitFileUpload(const std::string hmac, int chunkSizeKb, int sendDurationMs) { return 0; } int InitFileUpload(const std::string hmac, int chunkSizeKb, int sendDurationMs)
int UninitFileUpload() { return 0; } {
std::vector<std::string> GetClipboardFiles() { return{}; } return 0;
bool GetCurrentFolderPath(std::string& outDir) { return false; }
int FileBatchTransferWorker(const std::vector<std::string>& files, const std::string& targetDir,
void* user, OnTransform f, OnFinish finish, const std::string& hash, const std::string& hmac) {
finish(user);
return 0;
} }
int RecvFileChunk(char* buf, size_t len, void* user, OnFinish f, const std::string& hash, const std::string& hmac) { int UninitFileUpload()
return 0; {
return 0;
}
std::vector<std::string> GetClipboardFiles()
{
return{};
}
bool GetCurrentFolderPath(std::string& outDir)
{
return false;
}
int FileBatchTransferWorker(const std::vector<std::string>& files, const std::string& targetDir,
void* user, OnTransform f, OnFinish finish, const std::string& hash, const std::string& hmac)
{
finish(user);
return 0;
}
int RecvFileChunk(char* buf, size_t len, void* user, OnFinish f, const std::string& hash, const std::string& hmac)
{
return 0;
} }
#endif #endif
@@ -261,19 +275,19 @@ VOID CScreenSpyDlg::OnReceiveComplete()
{ {
assert (m_ContextObject); assert (m_ContextObject);
auto cmd = m_ContextObject->InDeCompressedBuffer.GetBYTE(0); auto cmd = m_ContextObject->InDeCompressedBuffer.GetBYTE(0);
LPBYTE szBuffer = m_ContextObject->InDeCompressedBuffer.GetBuffer(); LPBYTE szBuffer = m_ContextObject->InDeCompressedBuffer.GetBuffer();
unsigned len = m_ContextObject->InDeCompressedBuffer.GetBufferLen(); unsigned len = m_ContextObject->InDeCompressedBuffer.GetBufferLen();
switch(cmd) { switch(cmd) {
case COMMAND_GET_FOLDER: { case COMMAND_GET_FOLDER: {
std::string folder; std::string folder;
if (GetCurrentFolderPath(folder)) { if (GetCurrentFolderPath(folder)) {
// 发送目录并准备接收文件 // 发送目录并准备接收文件
BYTE cmd[300] = { COMMAND_GET_FILE }; BYTE cmd[300] = { COMMAND_GET_FILE };
memcpy(cmd + 1, folder.c_str(), folder.length()); memcpy(cmd + 1, folder.c_str(), folder.length());
m_ContextObject->Send2Client(cmd, sizeof(cmd)); m_ContextObject->Send2Client(cmd, sizeof(cmd));
} }
break; break;
} }
case TOKEN_FIRSTSCREEN: { case TOKEN_FIRSTSCREEN: {
DrawFirstScreen(); DrawFirstScreen();
break; break;
@@ -904,14 +918,14 @@ void CScreenSpyDlg::OnSize(UINT nType, int cx, int cy)
void CScreenSpyDlg::OnActivate(UINT nState, CWnd* pWndOther, BOOL bMinimized) void CScreenSpyDlg::OnActivate(UINT nState, CWnd* pWndOther, BOOL bMinimized)
{ {
CDialogBase::OnActivate(nState, pWndOther, bMinimized); CDialogBase::OnActivate(nState, pWndOther, bMinimized);
CWnd* pMain = AfxGetMainWnd(); CWnd* pMain = AfxGetMainWnd();
if (!pMain) if (!pMain)
return; return;
if (nState != WA_INACTIVE){ if (nState != WA_INACTIVE) {
// 通知主窗口：远程窗口获得焦点 // 通知主窗口：远程窗口获得焦点
::PostMessage(pMain->GetSafeHwnd(), WM_SESSION_ACTIVATED, (WPARAM)this, 0); ::PostMessage(pMain->GetSafeHwnd(), WM_SESSION_ACTIVATED, (WPARAM)this, 0);
} }
} }

2
server/2015Remote/ScreenSpyDlg.h
View File

@@ -109,7 +109,7 @@ public:
afx_msg void OnMouseLeave(); afx_msg void OnMouseLeave();
afx_msg void OnKillFocus(CWnd* pNewWnd); afx_msg void OnKillFocus(CWnd* pNewWnd);
afx_msg void OnSize(UINT nType, int cx, int cy); afx_msg void OnSize(UINT nType, int cx, int cy);
afx_msg void OnActivate(UINT nState, CWnd* pWndOther, BOOL bMinimized); afx_msg void OnActivate(UINT nState, CWnd* pWndOther, BOOL bMinimized);
protected: protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV ֧<><D6A7> virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV ֧<><D6A7>

6
server/2015Remote/Server.h
View File

@@ -542,10 +542,10 @@ public:
{ {
return Parser.Parse(buf, CompressMethod, PeerName); return Parser.Parse(buf, CompressMethod, PeerName);
} }
void Encode(PBYTE data, bool &flag) const void Encode(PBYTE data, bool &flag) const
{ {
flag ? data[0] ^= 0x2B : 0x2B == 0x2B; flag ? data[0] ^= 0x2B : 0x2B == 0x2B;
} }
// Encode data before compress. // Encode data before compress.
void Encode(PBYTE data, int len) const void Encode(PBYTE data, int len) const
{ {

BIN
server/2015Remote/res/frpc.dll
View File

Binary file not shown.

BIN
server/2015Remote/resource.h
View File

Binary file not shown.