tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-09-25 18:48:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

config::HaveZones: send config::WantZones if not up-to-date

Browse Source 
refs #8210
This commit is contained in:
Alexander A. Klimov 2020-09-08 12:05:54 +02:00
parent 1c4cf7c98d
commit 3d79fdbaf1
2 changed files with 95 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
lib/remote/apilistener-filesync.cpp
View File

@ -22,6 +22,7 @@
using namespace icinga;
REGISTER_APIFUNCTION(Update, config, &ApiListener::ConfigUpdateHandler);
REGISTER_APIFUNCTION(HaveZones, config, &ApiListener::ConfigHaveZonesHandler);
boost::mutex ApiListener::m_ConfigSyncStageLock;
@ -456,6 +457,99 @@ Value ApiListener::ConfigUpdateHandler(const MessageOrigin::Ptr& origin, const D
return Empty;
}
Value ApiListener::ConfigHaveZonesHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params)
{
auto endpoint (origin->FromClient->GetEndpoint());
// Verify permissions and trust relationship.
if (!endpoint || (origin->FromZone && !Zone::GetLocalZone()->IsChildOf(origin->FromZone))) {
return Empty;
}
ApiListener::Ptr listener = ApiListener::GetInstance();
if (!listener) {
Log(LogCritical, "ApiListener", "No instance available.");
return Empty;
}
if (!listener->GetAcceptConfig()) {
Log(LogWarning, "ApiListener")
<< "Ignoring information about zones. '" << listener->GetName() << "' does not accept config.";
return Empty;
}
auto fromEndpointName (origin->FromClient->GetEndpoint()->GetName());
auto fromZoneName (GetFromZoneName(origin->FromZone));
Log(LogInformation, "ApiListener")
<< "Checking information about zones from endpoint '" << fromEndpointName
<< "' of zone '" << fromZoneName << "'.";
Dictionary::Ptr zones = params->Get("zones");
Array::Ptr want = new Array();
ObjectLock oLock (zones);
for (auto& kv : zones) {
if (!Zone::GetByName(kv.first)) {
Log(LogWarning, "ApiListener")
<< "Ignoring information about unknown zone '" << kv.first
<< "' from endpoint '" << fromEndpointName << "'.";
continue;
}
// Ignore files declarations where we have an authoritive copy in etc/zones.d, packages, etc.
if (ConfigCompiler::HasZoneConfigAuthority(kv.first)) {
Log(LogInformation, "ApiListener")
<< "Ignoring information about zone '" << kv.first << "' from endpoint '" << fromEndpointName
<< "' because we have an authoritative version of the zone's config.";
continue;
}
{
auto local (AssembleZoneDeclaration(kv.first));
Dictionary::Ptr remote = kv.second;
if (local && (local->Get("checksum") == remote->Get("checksum") || local->Get("timestamp") >= remote->Get("timestamp"))) {
Log(LogInformation, "ApiListener")
<< "Ignoring information about zone '" << kv.first
<< "' from endpoint '" << fromEndpointName << "' because we're up-to-date.";
continue;
}
}
Log(LogInformation, "ApiListener")
<< "Requesting actual zone '" << kv.first << "' from endpoint '" << fromEndpointName
<< "' because compared to it we're not up-to-date.";
want->Add(kv.first);
}
JsonRpcConnection::Ptr client;
for (auto& conn : endpoint->GetClients()) {
client = conn;
break;
}
if (!client) {
Log(LogNotice, "ApiListener")
<< "Compared to '" << fromEndpointName
<< "' not everything is up-to-date, but we're not connected.";
return Empty;
}
client->SendMessage(new Dictionary({
{ "jsonrpc", "2.0" },
{ "method", "config::WantZones" },
{ "params", new Dictionary({
{ "zones", want }
}) }
}));
return Empty;
}
void ApiListener::HandleConfigUpdate(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params)
{
/* Only one transaction is allowed, concurrent message handlers need to wait.

1
lib/remote/apilistener.hpp
View File

@ -85,6 +85,7 @@ public:
/* filesync */
static Value ConfigUpdateHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params);
static Value ConfigHaveZonesHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params);
static void HandleConfigUpdate(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params);
/* configsync */