tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-23 21:55:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
refs #10539
This commit is contained in:
Gunnar Beutner 2015-11-10 07:59:10 +01:00
parent 9933b44ebd
commit 2cc33b7fb3
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/base/object.cpp
View File

@ -48,7 +48,7 @@ Object::~Object(void)
*/ */
String Object::ToString(void) const String Object::ToString(void) const
{ {
return "Object of type '" + Utility::GetTypeName(typeid(*this)) + "'"; return "Object of type '" + GetReflectionType()->GetName() + "'";
} }
#ifdef I2_DEBUG #ifdef I2_DEBUG

23
lib/icinga/command.cpp
View File

@ -50,30 +50,21 @@ void Command::Validate(int types, const ValidationUtils& utils)
Dictionary::Ptr argdict = arginfo; Dictionary::Ptr argdict = arginfo;
if (argdict->Contains("value")) { 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 + "'.")); 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")) { 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 + "'.")); 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>()) { } else if (arginfo.IsString()) {
continue; /* we cannot evaluate macros in functions */ if (!MacroProcessor::ValidateMacroString(arginfo))
} else { BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of<String>("arguments")(kv.first), "Closing $ not found in macro format string '" + arginfo + "'."));
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 + "'."));
} }
} }
} }