tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Missing macros in nested macro() calls should not cause the outer macro resolution to fail 

fixes #10003
This commit is contained in:
Gunnar Beutner 2015-08-27 08:58:25 +02:00 committed by Michael Friedrich
parent ae647ddf19
commit 2baa81a941
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/icinga/macroprocessor.cpp
View File

@ -78,7 +78,7 @@ Value MacroProcessor::ResolveMacros(const Value& str, const ResolverList& resolv
result = resultDict; result = resultDict;
} else if (str.IsObjectType<Function>()) { } else if (str.IsObjectType<Function>()) {
result = EvaluateFunction(str, resolvers, cr, missingMacro, escapeFn, resolvedMacros, useResolvedMacros, 0); result = EvaluateFunction(str, resolvers, cr, escapeFn, resolvedMacros, useResolvedMacros, 0);
} else { } else {
BOOST_THROW_EXCEPTION(std::invalid_argument("Macro is not a string or array.")); BOOST_THROW_EXCEPTION(std::invalid_argument("Macro is not a string or array."));
} }
@ -175,21 +175,21 @@ bool MacroProcessor::ResolveMacro(const String& macro, const ResolverList& resol
} }
Value MacroProcessor::InternalResolveMacrosShim(const std::vector<Value>& args, const ResolverList& resolvers, Value MacroProcessor::InternalResolveMacrosShim(const std::vector<Value>& args, const ResolverList& resolvers,
const CheckResult::Ptr& cr, String *missingMacro, const CheckResult::Ptr& cr, const MacroProcessor::EscapeCallback& escapeFn, const Dictionary::Ptr& resolvedMacros,
const MacroProcessor::EscapeCallback& escapeFn, const Dictionary::Ptr& resolvedMacros,
bool useResolvedMacros, int recursionLevel) bool useResolvedMacros, int recursionLevel)
{ {
if (args.size() < 1) if (args.size() < 1)
BOOST_THROW_EXCEPTION(std::invalid_argument("Too few arguments for function")); BOOST_THROW_EXCEPTION(std::invalid_argument("Too few arguments for function"));
return MacroProcessor::InternalResolveMacros(args[0], resolvers, cr, missingMacro, escapeFn, String missingMacro;
return MacroProcessor::InternalResolveMacros(args[0], resolvers, cr, &missingMacro, escapeFn,
resolvedMacros, useResolvedMacros, recursionLevel); resolvedMacros, useResolvedMacros, recursionLevel);
} }
Value MacroProcessor::EvaluateFunction(const Function::Ptr& func, const ResolverList& resolvers, Value MacroProcessor::EvaluateFunction(const Function::Ptr& func, const ResolverList& resolvers,
const CheckResult::Ptr& cr, String *missingMacro, const CheckResult::Ptr& cr, const MacroProcessor::EscapeCallback& escapeFn,
const MacroProcessor::EscapeCallback& escapeFn, const Dictionary::Ptr& resolvedMacros, const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros, int recursionLevel)
bool useResolvedMacros, int recursionLevel)
{ {
Dictionary::Ptr resolvers_this = new Dictionary(); Dictionary::Ptr resolvers_this = new Dictionary();
@ -198,7 +198,7 @@ Value MacroProcessor::EvaluateFunction(const Function::Ptr& func, const Resolver
} }
resolvers_this->Set("macro", new Function(boost::bind(&MacroProcessor::InternalResolveMacrosShim, resolvers_this->Set("macro", new Function(boost::bind(&MacroProcessor::InternalResolveMacrosShim,
_1, boost::cref(resolvers), cr, missingMacro, MacroProcessor::EscapeCallback(), resolvedMacros, useResolvedMacros, _1, boost::cref(resolvers), cr, MacroProcessor::EscapeCallback(), resolvedMacros, useResolvedMacros,
recursionLevel + 1))); recursionLevel + 1)));
ScriptFrame frame(resolvers_this); ScriptFrame frame(resolvers_this);
@ -249,7 +249,7 @@ Value MacroProcessor::InternalResolveMacros(const String& str, const ResolverLis
} }
if (resolved_macro.IsObjectType<Function>()) { if (resolved_macro.IsObjectType<Function>()) {
resolved_macro = EvaluateFunction(resolved_macro, resolvers, cr, missingMacro, escapeFn, resolved_macro = EvaluateFunction(resolved_macro, resolvers, cr, escapeFn,
resolvedMacros, useResolvedMacros, recursionLevel); resolvedMacros, useResolvedMacros, recursionLevel);
} }

10
lib/icinga/macroprocessor.hpp
View File

@ -60,13 +60,11 @@ private:
const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros, const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros,
int recursionLevel = 0); int recursionLevel = 0);
static Value InternalResolveMacrosShim(const std::vector<Value>& args, const ResolverList& resolvers, static Value InternalResolveMacrosShim(const std::vector<Value>& args, const ResolverList& resolvers,
const CheckResult::Ptr& cr, String *missingMacro, const CheckResult::Ptr& cr, const MacroProcessor::EscapeCallback& escapeFn,
const MacroProcessor::EscapeCallback& escapeFn, const Dictionary::Ptr& resolvedMacros, const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros, int recursionLevel);
bool useResolvedMacros, int recursionLevel);
static Value EvaluateFunction(const Function::Ptr& func, const ResolverList& resolvers, static Value EvaluateFunction(const Function::Ptr& func, const ResolverList& resolvers,
const CheckResult::Ptr& cr, String *missingMacro, const CheckResult::Ptr& cr, const MacroProcessor::EscapeCallback& escapeFn,
const MacroProcessor::EscapeCallback& escapeFn, const Dictionary::Ptr& resolvedMacros, const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros, int recursionLevel);
bool useResolvedMacros, int recursionLevel);
}; };