tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-09-22 01:08:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

config::WantObjects: send the actual config objects

Browse Source 
refs #8210
This commit is contained in:
Alexander A. Klimov 2020-09-08 11:56:14 +02:00
parent 61586ed6f2
commit a0285769dd
2 changed files with 67 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,7 @@ using namespace icinga;
REGISTER_APIFUNCTION(UpdateObject, config, &ApiListener::ConfigUpdateObjectAPIHandler); REGISTER_APIFUNCTION(UpdateObject, config, &ApiListener::ConfigUpdateObjectAPIHandler);
REGISTER_APIFUNCTION(DeleteObject, config, &ApiListener::ConfigDeleteObjectAPIHandler); REGISTER_APIFUNCTION(DeleteObject, config, &ApiListener::ConfigDeleteObjectAPIHandler);
REGISTER_APIFUNCTION(HaveObjects, config, &ApiListener::ConfigHaveObjectsAPIHandler); REGISTER_APIFUNCTION(HaveObjects, config, &ApiListener::ConfigHaveObjectsAPIHandler);
REGISTER_APIFUNCTION(WantObjects, config, &ApiListener::ConfigWantObjectsAPIHandler);
INITIALIZE_ONCE([]() { INITIALIZE_ONCE([]() {
ConfigObject::OnActiveChanged.connect(&ApiListener::ConfigUpdateObjectHandler); ConfigObject::OnActiveChanged.connect(&ApiListener::ConfigUpdateObjectHandler);
@ -322,6 +323,71 @@ Value ApiListener::ConfigHaveObjectsAPIHandler(const MessageOrigin::Ptr& origin,
return Empty; return Empty;
} }
Value ApiListener::ConfigWantObjectsAPIHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params)
{
Log(LogNotice, "ApiListener")
<< "Received request for runtime objects: " << JsonEncode(params);
/* check permissions */
ApiListener::Ptr listener = ApiListener::GetInstance();
if (!listener)
return Empty;
Endpoint::Ptr endpoint = origin->FromClient->GetEndpoint();
String identity = origin->FromClient->GetIdentity();
/* discard messages if the client is not configured on this node */
if (!endpoint) {
Log(LogNotice, "ApiListener")
<< "Discarding 'config want objects' message from '" << identity << "': Invalid endpoint origin (client not allowed).";
return Empty;
}
auto zone (endpoint->GetZone());
Dictionary::Ptr objects (params->Get("objects"));
ObjectLock oLock (objects);
for (auto& kv : objects) {
auto type (Type::GetByName(kv.first));
if (!type) {
Log(LogWarning, "ApiListener")
<< "Bad object type in runtime objects request from '"
<< identity << "': '" << kv.first << "'";
continue;
}
auto ctype (dynamic_cast<ConfigType*>(type.get()));
if (!ctype) {
Log(LogWarning, "ApiListener")
<< "Bad object type in runtime objects request from '"
<< identity << "': '" << kv.first << "'";
continue;
}
Array::Ptr perType (kv.second);
ObjectLock oLock (perType);
for (auto& name : perType) {
auto object (ctype->GetObject(name));
if (!object) {
Log(LogWarning, "ApiListener")
<< "No such " << kv.first << " in runtime objects request from '"
<< identity << "': '" << name << "'";
continue;
}
// UpdateConfigObject() checks access by itself
listener->UpdateConfigObject(object, nullptr, origin->FromClient);
}
}
return Empty;
}
Value ApiListener::ConfigDeleteObjectAPIHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params) Value ApiListener::ConfigDeleteObjectAPIHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params)
{ {
Log(LogNotice, "ApiListener") Log(LogNotice, "ApiListener")

1
lib/remote/apilistener.hpp
View File

@ -92,6 +92,7 @@ public:
static Value ConfigUpdateObjectAPIHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params); static Value ConfigUpdateObjectAPIHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params);
static Value ConfigDeleteObjectAPIHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params); static Value ConfigDeleteObjectAPIHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params);
static Value ConfigHaveObjectsAPIHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params); static Value ConfigHaveObjectsAPIHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params);
static Value ConfigWantObjectsAPIHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params);
/* API config packages */ /* API config packages */
void SetActivePackageStage(const String& package, const String& stage); void SetActivePackageStage(const String& package, const String& stage);