Truncate several macros if a notification command line gets too big t…

…o run Namely $host.output$, $service.output$ and $notification.comment$.
Icinga · Nov 22, 2023 · 7119051 · 7119051
1 parent 50f7923
commit 7119051
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/lib/icinga/pluginutility.cpp b/lib/icinga/pluginutility.cpp
@@ -16,7 +16,8 @@ using namespace icinga;
 void PluginUtility::ExecuteCommand(const Command::Ptr& commandObj, const Checkable::Ptr& checkable,
 	const CheckResult::Ptr& cr, const MacroProcessor::ResolverList& macroResolvers,
 	const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros, int timeout,
-	const std::function<void(const Value& commandLine, const ProcessResult&)>& callback)
+	const std::function<void(const Value& commandLine, const ProcessResult&)>& callback,
+	const Array::Ptr& safeToTruncate)
 {
 	Value raw_command = commandObj->GetCommandLine();
 	Dictionary::Ptr raw_arguments = commandObj->GetArguments();
@@ -74,7 +75,7 @@ void PluginUtility::ExecuteCommand(const Command::Ptr& commandObj, const Checkab
 	if (resolvedMacros && !useResolvedMacros)
 		return;
 
-	Process::Ptr process = new Process(Process::PrepareCommand(command), envMacros);
+	Process::Ptr process = new Process(Process::PrepareCommand(command), envMacros, safeToTruncate);
 
 	process->SetTimeout(timeout);
 	process->SetAdjustPriority(true);

diff --git a/lib/icinga/pluginutility.hpp b/lib/icinga/pluginutility.hpp
@@ -25,7 +25,8 @@ class PluginUtility
 	static void ExecuteCommand(const Command::Ptr& commandObj, const Checkable::Ptr& checkable,
 		const CheckResult::Ptr& cr, const MacroProcessor::ResolverList& macroResolvers,
 		const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros, int timeout,
-		const std::function<void(const Value& commandLine, const ProcessResult&)>& callback = std::function<void(const Value& commandLine, const ProcessResult&)>());
+		const std::function<void(const Value& commandLine, const ProcessResult&)>& callback = std::function<void(const Value& commandLine, const ProcessResult&)>(),
+		const Array::Ptr& safeToTruncate = nullptr);
 
 	static ServiceState ExitStatusToState(int exitStatus);
 	static std::pair<String, String> ParseCheckOutput(const String& output);

diff --git a/lib/methods/pluginnotificationtask.cpp b/lib/methods/pluginnotificationtask.cpp
@@ -62,8 +62,26 @@ void PluginNotificationTask::ScriptFunc(const Notification::Ptr& notification,
 		callback = [checkable](const Value& commandline, const ProcessResult& pr) { ProcessFinishedHandler(checkable, commandline, pr); };
 	}
 
+	Array::Ptr safeToTruncate = new Array();
+
+	auto hostCr (host->GetLastCheckResult());
+
+	if (hostCr) {
+		safeToTruncate->Add(hostCr->GetOutput());
+	}
+
+	if (service) {
+		auto cr (service->GetLastCheckResult());
+
+		if (cr) {
+			safeToTruncate->Add(cr->GetOutput());
+		}
+	}
+
+	safeToTruncate->Add(comment);
+
 	PluginUtility::ExecuteCommand(commandObj, checkable, cr, resolvers,
-		resolvedMacros, useResolvedMacros, timeout, callback);
+		resolvedMacros, useResolvedMacros, timeout, callback, safeToTruncate);
 }
 
 void PluginNotificationTask::ProcessFinishedHandler(const Checkable::Ptr& checkable, const Value& commandLine, const ProcessResult& pr)