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

Merge pull request #8459 from Icinga/bugfix/do-not-accept-api-updates-for-unknown-zone-2.11.7

Browse Source 
API: Don't accept object updates for unknown global zone
This commit is contained in:
Alexander Aleksandrovič Klimov 2020-11-10 10:20:46 +01:00 committed by GitHub
commit 820e7eed3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/remote/apilistener-configsync.cpp
View File

@ -72,6 +72,16 @@ Value ApiListener::ConfigUpdateObjectAPIHandler(const MessageOrigin::Ptr& origin
return Empty; return Empty;
} }
String objZone = params->Get("zone");
if (!Zone::GetByName(objZone)) {
Log(LogNotice, "ApiListener")
<< "Discarding 'config update object' message"
<< " from '" << identity << "' (endpoint: '" << endpoint->GetName() << "', zone: '" << endpointZone->GetName() << "')"
<< " for object '" << objName << "' of type '" << objType << "'. Objects zone '" << objZone << "' isn't known locally.";
return Empty;
}
/* ignore messages if the endpoint does not accept config */ /* ignore messages if the endpoint does not accept config */
if (!listener->GetAcceptConfig()) { if (!listener->GetAcceptConfig()) {
Log(LogWarning, "ApiListener") Log(LogWarning, "ApiListener")
@ -315,6 +325,7 @@ void ApiListener::UpdateConfigObject(const ConfigObject::Ptr& object, const Mess
params->Set("name", object->GetName()); params->Set("name", object->GetName());
params->Set("type", object->GetReflectionType()->GetName()); params->Set("type", object->GetReflectionType()->GetName());
params->Set("version", object->GetVersion()); params->Set("version", object->GetVersion());
params->Set("zone", object->GetZoneName());
if (object->GetPackage() == "_api") { if (object->GetPackage() == "_api") {
String file; String file;