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 #8466 from Icinga/feature/one-connection 

ApiListener#NewClientHandlerInternal(): reject connections from already connected endpoints
This commit is contained in:
Julian Brost 2020-11-24 16:33:15 +01:00 committed by GitHub
parent 39bc1590f6 38110e55d3
commit c154d4d50e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/remote/apilistener.cpp
View File

@ -679,17 +679,22 @@ void ApiListener::NewClientHandlerInternal(
if (ctype == ClientJsonRpc) { if (ctype == ClientJsonRpc) {
Log(LogNotice, "ApiListener", "New JSON-RPC client"); Log(LogNotice, "ApiListener", "New JSON-RPC client");
if (endpoint && endpoint->GetConnected()) {
Log(LogNotice, "ApiListener")
<< "Ignoring JSON-RPC connection " << conninfo
<< ". We're already connected to Endpoint '" << endpoint->GetName() << "'.";
return;
}
JsonRpcConnection::Ptr aclient = new JsonRpcConnection(identity, verify_ok, client, role); JsonRpcConnection::Ptr aclient = new JsonRpcConnection(identity, verify_ok, client, role);
if (endpoint) { if (endpoint) {
bool needSync = !endpoint->GetConnected();
endpoint->AddClient(aclient); endpoint->AddClient(aclient);
IoEngine::SpawnCoroutine(IoEngine::Get().GetIoContext(), [this, aclient, endpoint, needSync](asio::yield_context yc) { IoEngine::SpawnCoroutine(IoEngine::Get().GetIoContext(), [this, aclient, endpoint](asio::yield_context yc) {
CpuBoundWork syncClient (yc); CpuBoundWork syncClient (yc);
SyncClient(aclient, endpoint, needSync); SyncClient(aclient, endpoint, true);
}); });
} else if (!AddAnonymousClient(aclient)) { } else if (!AddAnonymousClient(aclient)) {