Fix missing config validator for command arguments 'set_if'

fixes #8724

diff --git a/lib/icinga/command.cpp b/lib/icinga/command.cpp
index 293ffd1e9966eb5a8440ca0da2fd537b199a7d39..6d6bafcd4cbb7aa9cd60771c5ae27dd93f5789e7 100644 (file)
--- a/lib/icinga/command.cpp
+++ b/lib/icinga/command.cpp
@@ -72,19 +72,37 @@ void Command::ValidateArguments(const String& location, const Command::Ptr& obje
                if (arginfo.IsObjectType<Dictionary>()) {
                        Dictionary::Ptr argdict = arginfo;
 
-                       if (argdict->Contains("value"))
-                               argval = argdict->Get("value");
-               } else
+                       if (argdict->Contains("value")) {
+                               String argvalue = argdict->Get("value");
+
+                               if (!MacroProcessor::ValidateMacroString(argvalue)) {
+                                       BOOST_THROW_EXCEPTION(ScriptError("Validation failed for " +
+                                           location + ": Closing $ not found in macro format string '" + argvalue + "'.", object->GetDebugInfo()));
+                               }
+                       }
+
+                       if (argdict->Contains("set_if")) {
+                               String argsetif = argdict->Get("set_if");
+
+                               if (!MacroProcessor::ValidateMacroString(argsetif)) {
+                                       BOOST_THROW_EXCEPTION(ScriptError("Validation failed for " +
+                                           location + ": Closing $ not found in macro format string '" + argsetif + "'.", object->GetDebugInfo()));
+                               }
+                       }
+               } else if (arginfo.IsObjectType<Function>()) {
+                       continue; /* we cannot evaluate macros in functions */
+               } else {
                        argval = arginfo;
 
-               if (argval.IsEmpty())
-                       continue;
+                       if (argval.IsEmpty())
+                               continue;
 
-               String argstr = argval;
+                       String argstr = argval;
 
-               if (!MacroProcessor::ValidateMacroString(argstr)) {
-                       BOOST_THROW_EXCEPTION(ScriptError("Validation failed for " +
-                           location + ": Closing $ not found in macro format string '" + argstr + "'.", object->GetDebugInfo()));
+                       if (!MacroProcessor::ValidateMacroString(argstr)) {
+                               BOOST_THROW_EXCEPTION(ScriptError("Validation failed for " +
+                                   location + ": Closing $ not found in macro format string '" + argstr + "'.", object->GetDebugInfo()));
+                       }
                }
        }
 }