Adding upstream version 2.13.6.upstream/2.13.6upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 68 insertions, 0 deletions

diff --git a/lib/icinga/command.cpp b/lib/icinga/command.cpp
new file mode 100644
index 0000000..8e0f357
--- /dev/null
+++ b/lib/icinga/command.cpp
@@ -0,0 +1,68 @@
+/* Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ */
+
+#include "icinga/command.hpp"
+#include "icinga/command-ti.cpp"
+#include "icinga/macroprocessor.hpp"
+#include "base/exception.hpp"
+#include "base/objectlock.hpp"
+
+using namespace icinga;
+
+REGISTER_TYPE(Command);
+
+void Command::Validate(int types, const ValidationUtils& utils)
+{
+	ObjectImpl<Command>::Validate(types, utils);
+
+	Dictionary::Ptr arguments = GetArguments();
+
+	if (!(types & FAConfig))
+		return;
+
+	if (arguments) {
+		if (!GetCommandLine().IsObjectType<Array>())
+			BOOST_THROW_EXCEPTION(ValidationError(this, { "command" }, "Attribute 'command' must be an array if the 'arguments' attribute is set."));
+
+		ObjectLock olock(arguments);
+		for (const Dictionary::Pair& kv : arguments) {
+			const Value& arginfo = kv.second;
+			Value argval;
+
+			if (arginfo.IsObjectType<Dictionary>()) {
+				Dictionary::Ptr argdict = arginfo;
+
+				if (argdict->Contains("value")) {
+					Value argvalue = argdict->Get("value");
+
+					if (argvalue.IsString() && !MacroProcessor::ValidateMacroString(argvalue))
+						BOOST_THROW_EXCEPTION(ValidationError(this, { "arguments", kv.first, "value" }, "Validation failed: Closing $ not found in macro format string '" + argvalue + "'."));
+				}
+
+				if (argdict->Contains("set_if")) {
+					Value argsetif = argdict->Get("set_if");
+
+					if (argsetif.IsString() && !MacroProcessor::ValidateMacroString(argsetif))
+						BOOST_THROW_EXCEPTION(ValidationError(this, { "arguments", kv.first, "set_if" }, "Closing $ not found in macro format string '" + argsetif + "'."));
+				}
+			} else if (arginfo.IsString()) {
+				if (!MacroProcessor::ValidateMacroString(arginfo))
+					BOOST_THROW_EXCEPTION(ValidationError(this, { "arguments", kv.first }, "Closing $ not found in macro format string '" + arginfo + "'."));
+			}
+		}
+	}
+
+	Dictionary::Ptr env = GetEnv();
+
+	if (env) {
+		ObjectLock olock(env);
+		for (const Dictionary::Pair& kv : env) {
+			const Value& envval = kv.second;
+
+			if (!envval.IsString() || envval.IsEmpty())
+				continue;
+
+			if (!MacroProcessor::ValidateMacroString(envval))
+				BOOST_THROW_EXCEPTION(ValidationError(this, { "env", kv.first }, "Closing $ not found in macro format string '" + envval + "'."));
+		}
+	}
+}