Fix update execution message discarded

refs #8616
Icinga · Jul 30, 2021 · 4534b0c · 4534b0c
1 parent 0599f94
commit 4534b0c
Show file tree

Hide file tree

Showing 2 changed files with 79 additions and 8 deletions.
diff --git a/lib/icinga/apiactions.cpp b/lib/icinga/apiactions.cpp
@@ -798,6 +798,7 @@ Dictionary::Ptr ApiActions::ExecuteCommand(const ConfigObject::Ptr& object, cons
 	Dictionary::Ptr pending_execution = new Dictionary();
 	pending_execution->Set("pending", true);
 	pending_execution->Set("deadline", deadline);
+	pending_execution->Set("endpoint", resolved_endpoint);
 	Dictionary::Ptr executions = checkable->GetExecutions();
 
 	if (!executions)
@@ -882,6 +883,27 @@ Dictionary::Ptr ApiActions::ExecuteCommand(const ConfigObject::Ptr& object, cons
 						return ApiActions::CreateResult(202, "Accepted", result);
 					}
 				}
+
+				/* Check if the child zone can access the checkable */
+				if (!zone->CanAccessObject(checkable)) {
+					/* Update execution */
+					double now = Utility::GetTime();
+					pending_execution->Set("exit", 126);
+					pending_execution->Set(
+						"output",
+						"Zone '" + zone->GetName() + "' cannot access to checkable '" + checkable->GetName() + "'."
+					);
+					pending_execution->Set("start", now);
+					pending_execution->Set("end", now);
+					pending_execution->Remove("pending");
+
+					listener->RelayMessage(origin, checkable, updateMessage, true);
+
+					Dictionary::Ptr result = new Dictionary();
+					result->Set("checkable", checkable->GetName());
+					result->Set("execution", uuid);
+					return ApiActions::CreateResult(202, "Accepted", result);
+				}
 			}
 		}
 

diff --git a/lib/icinga/clusterevents.cpp b/lib/icinga/clusterevents.cpp
@@ -739,6 +739,11 @@ Value ClusterEvents::ExecuteCommandAPIHandler(const MessageOrigin::Ptr& origin,
 	if (params->Contains("endpoint")) {
 		Endpoint::Ptr execEndpoint = Endpoint::GetByName(params->Get("endpoint"));
 
+		if (!execEndpoint) {
+			Log(LogWarning, "ClusterEvents") << "Endpoint " << params->Get("endpoint") << " does not exist";
+			return Empty;
+		}
+
 		if (execEndpoint != Endpoint::GetLocalEndpoint()) {
 			Zone::Ptr endpointZone = execEndpoint->GetZone();
 			Zone::Ptr localZone = Zone::GetLocalZone();
@@ -778,6 +783,41 @@ Value ClusterEvents::ExecuteCommandAPIHandler(const MessageOrigin::Ptr& origin,
 							return Empty;
 						}
 					}
+
+					Checkable::Ptr checkable;
+					Host::Ptr host = Host::GetByName(params->Get("host"));
+
+					if (params->Contains("service"))
+						checkable = host->GetServiceByShortName(params->Get("service"));
+					else
+						checkable = host;
+
+					/* Check if the child zone can access the checkable */
+					if (!checkable || !zone->CanAccessObject(checkable) && zone != endpointZone) {
+						double now = Utility::GetTime();
+						Dictionary::Ptr executedParams = new Dictionary();
+						executedParams->Set("execution", params->Get("source"));
+						executedParams->Set("host", params->Get("host"));
+
+						if (params->Contains("service"))
+							executedParams->Set("service", params->Get("service"));
+
+						executedParams->Set("exit", 126);
+						executedParams->Set(
+							"output",
+							"Zone '" + zone->GetName() + "' cannot access to checkable '" + checkable->GetName() + "'."
+						);
+						executedParams->Set("start", now);
+						executedParams->Set("end", now);
+
+						Dictionary::Ptr executedMessage = new Dictionary();
+						executedMessage->Set("jsonrpc", "2.0");
+						executedMessage->Set("method", "event::ExecutedCommand");
+						executedMessage->Set("params", executedParams);
+
+						listener->RelayMessage(nullptr, nullptr, executedMessage, true);
+						return Empty;
+					}
 				}
 			}
 
@@ -1154,13 +1194,6 @@ Value ClusterEvents::ExecutedCommandAPIHandler(const MessageOrigin::Ptr& origin,
 
 	ObjectLock oLock (checkable);
 
-	if (origin->FromZone && !origin->FromZone->CanAccessObject(checkable)) {
-		Log(LogNotice, "ClusterEvents")
-			<< "Discarding 'update executions API handler' message for checkable '" << checkable->GetName()
-			<< "' from '" << origin->FromClient->GetIdentity() << "': Unauthorized access.";
-		return Empty;
-	}
-
 	if (!params->Contains("execution")) {
 		Log(LogNotice, "ClusterEvents")
 			<< "Discarding 'update executions API handler' message for checkable '" << checkable->GetName()
@@ -1188,6 +1221,22 @@ Value ClusterEvents::ExecutedCommandAPIHandler(const MessageOrigin::Ptr& origin,
 		return Empty;
 	}
 
+	Endpoint::Ptr command_endpoint = Endpoint::GetByName(execution->Get("endpoint"));
+	if (!command_endpoint) {
+		Log(LogNotice, "ClusterEvents")
+			<< "Discarding 'update executions API handler' message from '" << origin->FromClient->GetIdentity()
+			<< "': Command endpoint does not exists.";
+
+		return Empty;
+	}
+
+	if (origin->FromZone && !origin->FromZone->CanAccessObject(command_endpoint->GetZone())) {
+		Log(LogNotice, "ClusterEvents")
+			<< "Discarding 'update executions API handler' message for checkable '" << checkable->GetName()
+			<< "' from '" << origin->FromClient->GetIdentity() << "': Unauthorized access.";
+		return Empty;
+	}
+
 	if (params->Contains("exit"))
 		execution->Set("exit", params->Get("exit"));
 
@@ -1278,7 +1327,7 @@ Value ClusterEvents::UpdateExecutionsAPIHandler(const MessageOrigin::Ptr& origin
 	updateMessage->Set("method", "event::UpdateExecutions");
 	updateMessage->Set("params", params);
 
-	listener->RelayMessage(origin, Zone::GetLocalZone(), updateMessage, true);
+	listener->RelayMessage(origin, checkable, updateMessage, true);
 
 	return Empty;
 }