From: Gunnar Beutner <gunnar@beutner.name>
Date: Tue, 10 Nov 2015 06:59:10 +0000 (+0100)
Subject: Don't validate arguments/parameters that aren't strings
X-Git-Tag: v2.4.0~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2cc33b7fb38bb897c57da3bee1cf875385e92633;p=icinga2

Don't validate arguments/parameters that aren't strings

refs #10539
---

diff --git a/lib/base/object.cpp b/lib/base/object.cpp
index 4eeef78db..b15965ca7 100644
--- a/lib/base/object.cpp
+++ b/lib/base/object.cpp
@@ -48,7 +48,7 @@ Object::~Object(void)
  */
 String Object::ToString(void) const
 {
-	return "Object of type '" + Utility::GetTypeName(typeid(*this)) + "'";
+	return "Object of type '" + GetReflectionType()->GetName() + "'";
 }
 
 #ifdef I2_DEBUG
diff --git a/lib/icinga/command.cpp b/lib/icinga/command.cpp
index e029322f5..1a01421bf 100644
--- a/lib/icinga/command.cpp
+++ b/lib/icinga/command.cpp
@@ -50,30 +50,21 @@ void Command::Validate(int types, const ValidationUtils& utils)
 				Dictionary::Ptr argdict = arginfo;
 
 				if (argdict->Contains("value")) {
-					String argvalue = argdict->Get("value");
+					Value argvalue = argdict->Get("value");
 
-					if (!MacroProcessor::ValidateMacroString(argvalue))
+					if (argvalue.IsString() && !MacroProcessor::ValidateMacroString(argvalue))
 						BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of<String>("arguments")(kv.first)("value"), "Validation failed: Closing $ not found in macro format string '" + argvalue + "'."));
 				}
 
 				if (argdict->Contains("set_if")) {
-					String argsetif = argdict->Get("set_if");
+					Value argsetif = argdict->Get("set_if");
 
-					if (!MacroProcessor::ValidateMacroString(argsetif))
+					if (argsetif.IsString() && !MacroProcessor::ValidateMacroString(argsetif))
 						BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of<String>("arguments")(kv.first)("set_if"), "Closing $ not found in macro format string '" + argsetif + "'."));
 				}
-			} else if (arginfo.IsObjectType<Function>()) {
-				continue; /* we cannot evaluate macros in functions */
-			} else {
-				argval = arginfo;
-
-				if (argval.IsEmpty())
-					continue;
-
-				String argstr = argval;
-
-				if (!MacroProcessor::ValidateMacroString(argstr))
-					BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of<String>("arguments")(kv.first), "Closing $ not found in macro format string '" + argstr + "'."));
+			} else if (arginfo.IsString()) {
+				if (!MacroProcessor::ValidateMacroString(arginfo))
+					BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of<String>("arguments")(kv.first), "Closing $ not found in macro format string '" + arginfo + "'."));
 			}
 		}
 	}