Improve error handling for invalid child_options for API downtime actions

fixes #6712

diff --git a/lib/icinga/apiactions.cpp b/lib/icinga/apiactions.cpp
index 33b9d6f5686706267f6ab2019efa406ead4495b1..6d2fc3fc566a01e1c2ead9ff7e6d0229d3c8afb5 100644 (file)
--- a/lib/icinga/apiactions.cpp
+++ b/lib/icinga/apiactions.cpp
@@ -355,6 +355,15 @@ Dictionary::Ptr ApiActions::ScheduleDowntime(const ConfigObject::Ptr& object,
        double startTime = HttpUtility::GetLastParameter(params, "start_time");
        double endTime = HttpUtility::GetLastParameter(params, "end_time");
 
+       DowntimeChildOptions childOptions = DowntimeNoChildren;
+       if (params->Contains("child_options")) {
+               try {
+                       childOptions = Downtime::ChildOptionsFromValue(HttpUtility::GetLastParameter(params, "child_options"));
+               } catch (const std::exception&) {
+                       return ApiActions::CreateResult(400, "Option 'child_options' provided an invalid value.");
+               }
+       }
+
        String downtimeName = Downtime::AddDowntime(checkable, author, comment, startTime, endTime,
                fixed, triggerName, duration);
 
@@ -366,10 +375,6 @@ Dictionary::Ptr ApiActions::ScheduleDowntime(const ConfigObject::Ptr& object,
        });
 
        /* Schedule downtime for all child objects. */
-       DowntimeChildOptions childOptions = DowntimeNoChildren;
-       if (params->Contains("child_options"))
-               childOptions = Downtime::ChildOptionsFromValue(HttpUtility::GetLastParameter(params, "child_options"));
-
        if (childOptions != DowntimeNoChildren) {
                /* 'DowntimeTriggeredChildren' schedules child downtimes triggered by the parent downtime.
                 * 'DowntimeNonTriggeredChildren' schedules non-triggered downtimes for all children.