tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-25 14:44:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow to exec command on endpoint where the checkable is not present but checkable has command_endpoint specified

Browse Source
This commit is contained in:
Mattia Codato 2023-04-12 17:30:04 +02:00
parent 912fdb9700
commit c5c17928a6
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/icinga/apiactions.cpp
View File

@ -681,9 +681,15 @@ Dictionary::Ptr ApiActions::ExecuteCommand(const ConfigObject::Ptr& object, cons
if (!endpointPtr) if (!endpointPtr)
return ApiActions::CreateResult(404, "Can't find a valid endpoint for '" + resolved_endpoint + "'."); return ApiActions::CreateResult(404, "Can't find a valid endpoint for '" + resolved_endpoint + "'.");
/* Check if the endpoint zone can access the checkable */ /* Return an error when
* the endpoint is different from the command endpoint of the checkable
* and the endpoint zone can't access the checkable.
* The endpoints are checked to allow for the case where command_endpoint is specified in the checkable
* but checkable is not actually present in the agent.
*/
Zone::Ptr endpointZone = endpointPtr->GetZone(); Zone::Ptr endpointZone = endpointPtr->GetZone();
if (!endpointZone->CanAccessObject(checkable)) { Endpoint::Ptr commandEndpoint = checkable->GetCommandEndpoint();
if (endpointPtr != commandEndpoint && !endpointZone->CanAccessObject(checkable)) {
return ApiActions::CreateResult( return ApiActions::CreateResult(
409, 409,
"Zone '" + endpointZone->GetName() + "' cannot access checkable '" + checkable->GetName() + "'." "Zone '" + endpointZone->GetName() + "' cannot access checkable '" + checkable->GetName() + "'."

12
lib/icinga/clusterevents.cpp
View File

@ -817,7 +817,7 @@ Value ClusterEvents::ExecuteCommandAPIHandler(const MessageOrigin::Ptr& origin,
Host::Ptr host = Host::GetByName(params->Get("host")); Host::Ptr host = Host::GetByName(params->Get("host"));
if (!host) { if (!host) {
Log(LogWarning, "ClusterEvents") Log(LogWarning, "ClusterEvents")
<< "Discarding 'execute command' message " << executionUuid << "Discarding 'execute command' message " << executionUuid
<< ": host " << params->Get("host") << " does not exist"; << ": host " << params->Get("host") << " does not exist";
return Empty; return Empty;
} }
@ -833,12 +833,16 @@ Value ClusterEvents::ExecuteCommandAPIHandler(const MessageOrigin::Ptr& origin,
checkableName += "!" + params->Get("service"); checkableName += "!" + params->Get("service");
Log(LogWarning, "ClusterEvents") Log(LogWarning, "ClusterEvents")
<< "Discarding 'execute command' message " << executionUuid << "Discarding 'execute command' message " << executionUuid
<< ": " << checkableName << " does not exist"; << ": " << checkableName << " does not exist";
return Empty; return Empty;
} }
/* Check if the child zone can access the checkable, and if it's the same endpoint zone */ /* Return an error when the endpointZone is different than the child zone and
* the child zone can't access the checkable.
* The zones are checked to allow for the case where command_endpoint is specified in the checkable
* but checkable is not actually present in the agent.
*/
if (!zone->CanAccessObject(checkable) && zone != endpointZone) { if (!zone->CanAccessObject(checkable) && zone != endpointZone) {
double now = Utility::GetTime(); double now = Utility::GetTime();
Dictionary::Ptr executedParams = new Dictionary(); Dictionary::Ptr executedParams = new Dictionary();
@ -1276,7 +1280,7 @@ Value ClusterEvents::ExecutedCommandAPIHandler(const MessageOrigin::Ptr& origin,
return Empty; return Empty;
} }
if (origin->FromZone && !origin->FromZone->CanAccessObject(command_endpoint->GetZone())) { if (origin->FromZone && !command_endpoint->GetZone()->IsChildOf(origin->FromZone)) {
Log(LogNotice, "ClusterEvents") Log(LogNotice, "ClusterEvents")
<< "Discarding 'update executions API handler' message for checkable '" << checkable->GetName() << "Discarding 'update executions API handler' message for checkable '" << checkable->GetName()
<< "' from '" << origin->FromClient->GetIdentity() << "': Unauthorized access."; << "' from '" << origin->FromClient->GetIdentity() << "': Unauthorized access.";