tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-26 15:14:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Detect client-side shutdown of TLS stream

Browse Source
This commit is contained in:
Johannes Schmidt 2025-07-02 11:37:10 +02:00
parent 309aa50ca3
commit 937f21d67c
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/remote/httpserverconnection.cpp
View File

@ -41,7 +41,7 @@ HttpServerConnection::HttpServerConnection(const WaitGroup::Ptr& waitGroup, cons
} }
HttpServerConnection::HttpServerConnection(const WaitGroup::Ptr& waitGroup, const String& identity, bool authenticated, const Shared<AsioTlsStream>::Ptr& stream, boost::asio::io_context& io) HttpServerConnection::HttpServerConnection(const WaitGroup::Ptr& waitGroup, const String& identity, bool authenticated, const Shared<AsioTlsStream>::Ptr& stream, boost::asio::io_context& io)
: m_WaitGroup(waitGroup), m_Stream(stream), m_Seen(Utility::GetTime()), m_IoStrand(io), m_ShuttingDown(false), m_HasStartedStreaming(false), : m_WaitGroup(waitGroup), m_Stream(stream), m_Seen(Utility::GetTime()), m_CanRead(io, true), m_IoStrand(io), m_ShuttingDown(false), m_HasStartedStreaming(false),
m_CheckLivenessTimer(io) m_CheckLivenessTimer(io)
{ {
if (authenticated) { if (authenticated) {
@ -66,6 +66,7 @@ void HttpServerConnection::Start()
IoEngine::SpawnCoroutine(m_IoStrand, [this, keepAlive](asio::yield_context yc) { ProcessMessages(yc); }); IoEngine::SpawnCoroutine(m_IoStrand, [this, keepAlive](asio::yield_context yc) { ProcessMessages(yc); });
IoEngine::SpawnCoroutine(m_IoStrand, [this, keepAlive](asio::yield_context yc) { CheckLiveness(yc); }); IoEngine::SpawnCoroutine(m_IoStrand, [this, keepAlive](asio::yield_context yc) { CheckLiveness(yc); });
IoEngine::SpawnCoroutine(m_IoStrand, [this, keepAlive](asio::yield_context yc) { DetectClientShutdown(yc); });
} }
/** /**
@ -446,6 +447,7 @@ void HttpServerConnection::ProcessMessages(boost::asio::yield_context yc)
response.set(http::field::server, l_ServerHeader); response.set(http::field::server, l_ServerHeader);
m_CanRead.WaitForSet(yc);
if (!EnsureValidHeaders(buf, request, response, m_ShuttingDown, yc)) { if (!EnsureValidHeaders(buf, request, response, m_ShuttingDown, yc)) {
break; break;
} }
@ -504,6 +506,7 @@ void HttpServerConnection::ProcessMessages(boost::asio::yield_context yc)
} }
m_Seen = std::numeric_limits<decltype(m_Seen)>::max(); m_Seen = std::numeric_limits<decltype(m_Seen)>::max();
m_CanRead.Clear();
if (!ProcessRequest(*m_Stream, request, response, *this, m_HasStartedStreaming, m_WaitGroup, cpuBoundWorkTime, yc)) { if (!ProcessRequest(*m_Stream, request, response, *this, m_HasStartedStreaming, m_WaitGroup, cpuBoundWorkTime, yc)) {
break; break;
@ -544,3 +547,27 @@ void HttpServerConnection::CheckLiveness(boost::asio::yield_context yc)
} }
} }
} }
/**
* Detects a shutdown initiated by the client side.
*
* @param yc The yield context for the coroutine of this function
*/
void HttpServerConnection::DetectClientShutdown(boost::asio::yield_context yc)
{
using wait_type = boost::asio::socket_base::wait_type;
while (!m_ShuttingDown) {
m_CanRead.WaitForClear(yc);
boost::system::error_code ec;
m_Stream->async_fill(yc[ec]);
if (ec && !m_ShuttingDown) {
Log(LogInformation, "HttpServerConnection") << "Detected shutdown from client: " << m_PeerAddress << ".";
Disconnect(yc);
break;
}
m_CanRead.Set();
}
}

3
lib/remote/httpserverconnection.hpp
View File

@ -4,6 +4,7 @@
#define HTTPSERVERCONNECTION_H #define HTTPSERVERCONNECTION_H
#include "remote/apiuser.hpp" #include "remote/apiuser.hpp"
#include "base/io-engine.hpp"
#include "base/string.hpp" #include "base/string.hpp"
#include "base/tlsstream.hpp" #include "base/tlsstream.hpp"
#include "base/wait-group.hpp" #include "base/wait-group.hpp"
@ -38,6 +39,7 @@ private:
ApiUser::Ptr m_ApiUser; ApiUser::Ptr m_ApiUser;
Shared<AsioTlsStream>::Ptr m_Stream; Shared<AsioTlsStream>::Ptr m_Stream;
double m_Seen; double m_Seen;
AsioDualEvent m_CanRead;
String m_PeerAddress; String m_PeerAddress;
boost::asio::io_context::strand m_IoStrand; boost::asio::io_context::strand m_IoStrand;
bool m_ShuttingDown; bool m_ShuttingDown;
@ -51,6 +53,7 @@ private:
void ProcessMessages(boost::asio::yield_context yc); void ProcessMessages(boost::asio::yield_context yc);
void CheckLiveness(boost::asio::yield_context yc); void CheckLiveness(boost::asio::yield_context yc);
void DetectClientShutdown(boost::asio::yield_context yc);
}; };
} }