hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2025-12-25 13:10:04 +01:00
Code Issues Projects Releases Packages Wiki Activity

Made hyprctl IPC non-blocking and bounded: listener socket and accepted fds use SOCK_NONBLOCK, removed the blocking poll, added a 64KiB request cap, and clearer read/accept error handling

Browse source
This commit is contained in:
Rtur2003 2025-12-07 19:07:25 +03:00
parent 76ac655c9e
commit f2b8abc444
1 changed files with 31 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/debug/HyprCtl.cpp
View file

@ -9,6 +9,7 @@
#include <cstdio> #include <cstdio>
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>
#include <cerrno>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
@ -2250,6 +2251,8 @@ static bool isFollowUpRollingLogRequest(const std::string& request) {
} }
static int hyprCtlFDTick(int fd, uint32_t mask, void* data) { static int hyprCtlFDTick(int fd, uint32_t mask, void* data) {
constexpr size_t MAX_REQUEST_SIZE = 64 * 1024;
if (mask & WL_EVENT_ERROR || mask & WL_EVENT_HANGUP) if (mask & WL_EVENT_ERROR || mask & WL_EVENT_HANGUP)
return 0; return 0;
@ -2259,7 +2262,13 @@ static int hyprCtlFDTick(int fd, uint32_t mask, void* data) {
sockaddr_in clientAddress; sockaddr_in clientAddress;
socklen_t clientSize = sizeof(clientAddress); socklen_t clientSize = sizeof(clientAddress);
const auto ACCEPTEDCONNECTION = accept4(g_pHyprCtl->m_socketFD.get(), rc<sockaddr*>(&clientAddress), &clientSize, SOCK_CLOEXEC); const auto ACCEPTEDCONNECTION = accept4(g_pHyprCtl->m_socketFD.get(), rc<sockaddr*>(&clientAddress), &clientSize, SOCK_CLOEXEC | SOCK_NONBLOCK);
if (ACCEPTEDCONNECTION < 0) {
if (errno != EAGAIN && errno != EWOULDBLOCK)
Debug::log(ERR, "Hyprctl: failed to accept connection: {}", strerror(errno));
return 0;
}
std::array<char, 1024> readBuffer; std::array<char, 1024> readBuffer;
@ -2273,31 +2282,28 @@ static int hyprCtlFDTick(int fd, uint32_t mask, void* data) {
Debug::log(LOG, "Hyprctl: new connection from pid {}", creds.CRED_PID); Debug::log(LOG, "Hyprctl: new connection from pid {}", creds.CRED_PID);
} }
// std::string request;
pollfd pollfds[1] = { while (request.size() < MAX_REQUEST_SIZE) {
{ readBuffer.fill(0);
.fd = ACCEPTEDCONNECTION, auto messageSize = read(ACCEPTEDCONNECTION, readBuffer.data(), readBuffer.size());
.events = POLLIN, if (messageSize < 0) {
}, if (errno == EAGAIN || errno == EWOULDBLOCK)
}; break;
Debug::log(ERR, "Hyprctl: read error: {}", strerror(errno));
int ret = poll(pollfds, 1, 5000); close(ACCEPTEDCONNECTION);
return 0;
if (ret <= 0) { }
close(ACCEPTEDCONNECTION); if (messageSize == 0)
return 0; break;
request.append(readBuffer.data(), rc<size_t>(messageSize));
if (messageSize < static_cast<int>(readBuffer.size()))
break; // drained
} }
std::string request; if (request.size() >= MAX_REQUEST_SIZE) {
while (true) { Debug::log(ERR, "Hyprctl: request exceeded {} bytes, closing", MAX_REQUEST_SIZE);
readBuffer.fill(0); close(ACCEPTEDCONNECTION);
auto messageSize = read(ACCEPTEDCONNECTION, readBuffer.data(), 1023); return 0;
if (messageSize < 1)
break;
std::string recvd = readBuffer.data();
request += recvd;
if (messageSize < 1023)
break;
} }
std::string reply = ""; std::string reply = "";
@ -2342,7 +2348,7 @@ static int hyprCtlFDTick(int fd, uint32_t mask, void* data) {
} }
void CHyprCtl::startHyprCtlSocket() { void CHyprCtl::startHyprCtlSocket() {
m_socketFD = CFileDescriptor{socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0)}; m_socketFD = CFileDescriptor{socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0)};
if (!m_socketFD.isValid()) { if (!m_socketFD.isValid()) {
Debug::log(ERR, "Couldn't start the Hyprland Socket. (1) IPC will not work."); Debug::log(ERR, "Couldn't start the Hyprland Socket. (1) IPC will not work.");