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

Merge pull request #7271 from Icinga/bugfix/api-schedule-downtime-parameters 

API: Improve error handling for 'schedule-downtime' action
This commit is contained in:
Michael Friedrich 2019-07-02 11:52:40 +02:00 committed by GitHub
parent f72ef9360d 8ca38302fc
commit 5198254a61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/icinga/apiactions.cpp
View File

@ -337,6 +337,16 @@ Dictionary::Ptr ApiActions::ScheduleDowntime(const ConfigObject::Ptr& object,
String comment = HttpUtility::GetLastParameter(params, "comment"); String comment = HttpUtility::GetLastParameter(params, "comment");
double startTime = HttpUtility::GetLastParameter(params, "start_time"); double startTime = HttpUtility::GetLastParameter(params, "start_time");
double endTime = HttpUtility::GetLastParameter(params, "end_time"); double endTime = HttpUtility::GetLastParameter(params, "end_time");
double now = Utility::GetTime();
if (author.IsEmpty() || comment.IsEmpty())
return ApiActions::CreateResult(400, "Options 'author' and 'comment' must not be empty");
if (startTime < now || endTime < now)
return ApiActions::CreateResult(400, "Options 'start_time' and 'end_time' must be greater than current timestamp");
if (endTime < startTime)
return ApiActions::CreateResult(400, "Option 'end_time' must be greater than 'start_time'");
Host::Ptr host; Host::Ptr host;
Service::Ptr service; Service::Ptr service;