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

Detect client-side shutdown of TLS stream

Browse Source 
Adds a third coroutine that detects when a TLS-shutdown is initiated
by the client. It also adds an optional `reason` parameter to
`HttpServerConnection::Disconnect()` that adds the reason for the
shutdown to the log message that is generated.
This commit is contained in:
Johannes Schmidt 2025-07-02 11:37:10 +02:00
parent 21725cd95c
commit c9a196bc87
2 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
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)
: m_WaitGroup(waitGroup), m_Stream(stream), m_Seen(Utility::GetTime()), m_IoStrand(io), m_ShuttingDown(false), m_CheckLivenessTimer(io)
: m_WaitGroup(waitGroup), m_Stream(stream), m_Seen(Utility::GetTime()), m_CanRead(io, true), m_IoStrand(io), m_ShuttingDown(false), m_CheckLivenessTimer(io)
{
if (authenticated) {
m_ApiUser = ApiUser::GetByClientCN(identity);
@ -65,6 +65,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) { CheckLiveness(yc); });
IoEngine::SpawnCoroutine(m_IoStrand, [this, keepAlive](asio::yield_context yc) { DetectClientShutdown(yc); });
}
/**
@ -73,8 +74,9 @@ void HttpServerConnection::Start()
* It is important to note that this method should only be called from within a coroutine that uses `m_IoStrand`.
*
* @param yc boost::asio::yield_context The coroutine yield context which you are calling this method from.
* @param reason A string to be included in the disconnect log message.
*/
void HttpServerConnection::Disconnect(boost::asio::yield_context yc)
void HttpServerConnection::Disconnect(boost::asio::yield_context yc, const String& reason)
{
namespace asio = boost::asio;
@ -85,7 +87,8 @@ void HttpServerConnection::Disconnect(boost::asio::yield_context yc)
m_ShuttingDown = true;
Log(LogInformation, "HttpServerConnection")
<< "HTTP client disconnected (from " << m_PeerAddress << ")";
<< "HTTP client disconnected (from " << m_PeerAddress << ")"
<< (reason.IsEmpty() ? "" : ": " + reason + ".");
m_CheckLivenessTimer.cancel();
@ -414,6 +417,7 @@ void HttpServerConnection::ProcessMessages(boost::asio::yield_context yc)
response.set(http::field::server, l_ServerHeader);
m_CanRead.WaitForSet(yc);
if (!EnsureValidHeaders(buf, request, response, m_ShuttingDown, yc)) {
break;
}
@ -471,6 +475,7 @@ void HttpServerConnection::ProcessMessages(boost::asio::yield_context yc)
}
m_Seen = std::numeric_limits<decltype(m_Seen)>::max();
m_CanRead.Clear();
ProcessRequest(request, response, m_WaitGroup, cpuBoundWorkTime, yc);
@ -501,11 +506,29 @@ void HttpServerConnection::CheckLiveness(boost::asio::yield_context yc)
}
if (m_Seen < Utility::GetTime() - 10) {
Log(LogInformation, "HttpServerConnection")
<< "No messages for HTTP connection have been received in the last 10 seconds.";
Disconnect(yc);
Disconnect(yc, "Liveness Timeout reached");
break;
}
}
}
/**
* 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)
{
while (!m_ShuttingDown) {
m_CanRead.WaitForClear(yc);
boost::system::error_code ec;
m_Stream->async_fill(yc[ec]);
if (ec && !m_ShuttingDown) {
Disconnect(yc, "Shutdown by client");
break;
}
m_CanRead.Set();
}
}

5
lib/remote/httpserverconnection.hpp
View File

@ -4,6 +4,7 @@
#define HTTPSERVERCONNECTION_H
#include "remote/apiuser.hpp"
#include "base/io-engine.hpp"
#include "base/string.hpp"
#include "base/tlsstream.hpp"
#include "base/wait-group.hpp"
@ -37,6 +38,7 @@ private:
ApiUser::Ptr m_ApiUser;
Shared<AsioTlsStream>::Ptr m_Stream;
double m_Seen;
AsioDualEvent m_CanRead;
String m_PeerAddress;
boost::asio::io_context::strand m_IoStrand;
bool m_ShuttingDown;
@ -45,10 +47,11 @@ private:
HttpServerConnection(const WaitGroup::Ptr& waitGroup, const String& identity, bool authenticated,
const Shared<AsioTlsStream>::Ptr& stream, boost::asio::io_context& io);
void Disconnect(boost::asio::yield_context yc);
void Disconnect(boost::asio::yield_context yc, const String& reason = {});
void ProcessMessages(boost::asio::yield_context yc);
void CheckLiveness(boost::asio::yield_context yc);
void DetectClientShutdown(boost::asio::yield_context yc);
};
}