tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7836 from Icinga/bugfix/jsonrpcconnection-m_seen 

Consider a JsonRpcConnection being seen on a single byte of TLS payload, not only a whole message
This commit is contained in:
Noah Hilverling 2020-07-29 15:02:48 +02:00 committed by GitHub
parent 188535b534 0f84ce0470
commit 97fc70ccb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/base/tlsstream.hpp
View File

@ -9,17 +9,53 @@
#include "base/stream.hpp"
#include "base/tlsutility.hpp"
#include "base/fifo.hpp"
#include "base/utility.hpp"
#include <atomic>
#include <memory>
#include <utility>
#include <boost/asio/buffered_stream.hpp>
#include <boost/asio/io_context.hpp>
#include <boost/asio/ip/tcp.hpp>
#include <boost/asio/spawn.hpp>
#include <boost/asio/ssl/context.hpp>
#include <boost/asio/ssl/stream.hpp>
namespace icinga
{
template<class ARS>
class SeenStream : public ARS
{
public:
template<class... Args>
SeenStream(Args&&... args) : ARS(std::forward<Args>(args)...)
{
m_Seen.store(nullptr);
}
template<class... Args>
auto async_read_some(Args&&... args) -> decltype(((ARS*)nullptr)->async_read_some(std::forward<Args>(args)...))
{
{
auto seen (m_Seen.load());
if (seen) {
*seen = Utility::GetTime();
}
}
return ((ARS*)this)->async_read_some(std::forward<Args>(args)...);
}
inline void SetSeen(double* seen)
{
m_Seen.store(seen);
}
private:
std::atomic<double*> m_Seen;
};
struct UnbufferedAsioTlsStreamParams
{
boost::asio::io_context& IoContext;
@ -27,14 +63,14 @@ struct UnbufferedAsioTlsStreamParams
const String& Hostname;
};
typedef boost::asio::ssl::stream<boost::asio::ip::tcp::socket> AsioTcpTlsStream;
typedef SeenStream<boost::asio::ssl::stream<boost::asio::ip::tcp::socket>> AsioTcpTlsStream;
class UnbufferedAsioTlsStream : public AsioTcpTlsStream
{
public:
inline
UnbufferedAsioTlsStream(UnbufferedAsioTlsStreamParams& init)
: stream(init.IoContext, init.SslContext), m_VerifyOK(true), m_Hostname(init.Hostname)
: AsioTcpTlsStream(init.IoContext, init.SslContext), m_VerifyOK(true), m_Hostname(init.Hostname)
{
}

2
lib/remote/jsonrpcconnection.cpp
View File

@ -60,6 +60,8 @@ void JsonRpcConnection::Start()
void JsonRpcConnection::HandleIncomingMessages(boost::asio::yield_context yc)
{
m_Stream->next_layer().SetSeen(&m_Seen);
for (;;) {
String message;