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

/v1/actions/schedule-downtime: reject request on invalid trigger_name 

For this purpose lookup the specified Downtime. Also pass Downtime objects,
not just names, to Downtime::AddDowntime() not to lookup it twice.
This commit is contained in:
Alexander A. Klimov 2024-04-24 16:58:08 +02:00
parent f0b5239a15
commit c0f87dd4c9
5 changed files with 48 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/icinga/apiactions.cpp
View File

@ -391,9 +391,16 @@ Dictionary::Ptr ApiActions::ScheduleDowntime(const ConfigObject::Ptr& object,
if (params->Contains("duration")) if (params->Contains("duration"))
duration = HttpUtility::GetLastParameter(params, "duration"); duration = HttpUtility::GetLastParameter(params, "duration");
String triggerName; Downtime::Ptr trigger;
if (params->Contains("trigger_name")) String triggerName = HttpUtility::GetLastParameter(params, "trigger_name");
triggerName = HttpUtility::GetLastParameter(params, "trigger_name");
if (!triggerName.IsEmpty()) {
trigger = Downtime::GetByName(triggerName);
if (!trigger) {
return ApiActions::CreateResult(404, "Won't schedule downtime with non-existent trigger downtime.");
}
}
String author = HttpUtility::GetLastParameter(params, "author"); String author = HttpUtility::GetLastParameter(params, "author");
String comment = HttpUtility::GetLastParameter(params, "comment"); String comment = HttpUtility::GetLastParameter(params, "comment");
@ -420,7 +427,7 @@ Dictionary::Ptr ApiActions::ScheduleDowntime(const ConfigObject::Ptr& object,
} }
Downtime::Ptr downtime = Downtime::AddDowntime(checkable, author, comment, startTime, endTime, Downtime::Ptr downtime = Downtime::AddDowntime(checkable, author, comment, startTime, endTime,
fixed, triggerName, duration); fixed, trigger, duration);
String downtimeName = downtime->GetName(); String downtimeName = downtime->GetName();
Dictionary::Ptr additional = new Dictionary({ Dictionary::Ptr additional = new Dictionary({
@ -442,7 +449,7 @@ Dictionary::Ptr ApiActions::ScheduleDowntime(const ConfigObject::Ptr& object,
<< "Creating downtime for service " << hostService->GetName() << " on host " << host->GetName(); << "Creating downtime for service " << hostService->GetName() << " on host " << host->GetName();
Downtime::Ptr serviceDowntime = Downtime::AddDowntime(hostService, author, comment, startTime, endTime, Downtime::Ptr serviceDowntime = Downtime::AddDowntime(hostService, author, comment, startTime, endTime,
fixed, triggerName, duration, String(), String(), downtimeName); fixed, trigger, duration, String(), String(), downtimeName);
String serviceDowntimeName = serviceDowntime->GetName(); String serviceDowntimeName = serviceDowntime->GetName();
serviceDowntimes.push_back(new Dictionary({ serviceDowntimes.push_back(new Dictionary({
@ -459,8 +466,9 @@ Dictionary::Ptr ApiActions::ScheduleDowntime(const ConfigObject::Ptr& object,
/* 'DowntimeTriggeredChildren' schedules child downtimes triggered by the parent downtime. /* 'DowntimeTriggeredChildren' schedules child downtimes triggered by the parent downtime.
* 'DowntimeNonTriggeredChildren' schedules non-triggered downtimes for all children. * 'DowntimeNonTriggeredChildren' schedules non-triggered downtimes for all children.
*/ */
if (childOptions == DowntimeTriggeredChildren) if (childOptions == DowntimeTriggeredChildren) {
triggerName = downtimeName; trigger = downtime;
}
Log(LogNotice, "ApiActions") Log(LogNotice, "ApiActions")
<< "Processing child options " << childOptions << " for downtime " << downtimeName; << "Processing child options " << childOptions << " for downtime " << downtimeName;
@ -486,7 +494,7 @@ Dictionary::Ptr ApiActions::ScheduleDowntime(const ConfigObject::Ptr& object,
<< "Scheduling downtime for child object " << child->GetName(); << "Scheduling downtime for child object " << child->GetName();
Downtime::Ptr childDowntime = Downtime::AddDowntime(child, author, comment, startTime, endTime, Downtime::Ptr childDowntime = Downtime::AddDowntime(child, author, comment, startTime, endTime,
fixed, triggerName, duration); fixed, trigger, duration);
String childDowntimeName = childDowntime->GetName(); String childDowntimeName = childDowntime->GetName();
Log(LogNotice, "ApiActions") Log(LogNotice, "ApiActions")
@ -506,7 +514,7 @@ Dictionary::Ptr ApiActions::ScheduleDowntime(const ConfigObject::Ptr& object,
<< "Creating downtime for service " << childService->GetName() << " on child host " << childHost->GetName(); << "Creating downtime for service " << childService->GetName() << " on child host " << childHost->GetName();
Downtime::Ptr serviceDowntime = Downtime::AddDowntime(childService, author, comment, startTime, endTime, Downtime::Ptr serviceDowntime = Downtime::AddDowntime(childService, author, comment, startTime, endTime,
fixed, triggerName, duration, String(), String(), childDowntimeName); fixed, trigger, duration, String(), String(), childDowntimeName);
String serviceDowntimeName = serviceDowntime->GetName(); String serviceDowntimeName = serviceDowntime->GetName();
childServiceDowntimes.push_back(new Dictionary({ childServiceDowntimes.push_back(new Dictionary({

10
lib/icinga/downtime.cpp
View File

@ -245,17 +245,22 @@ int Downtime::GetNextDowntimeID()
Downtime::Ptr Downtime::AddDowntime(const Checkable::Ptr& checkable, const String& author, Downtime::Ptr Downtime::AddDowntime(const Checkable::Ptr& checkable, const String& author,
const String& comment, double startTime, double endTime, bool fixed, const String& comment, double startTime, double endTime, bool fixed,
const String& triggeredBy, double duration, const Downtime::Ptr& parentDowntime, double duration,
const String& scheduledDowntime, const String& scheduledBy, const String& parent, const String& scheduledDowntime, const String& scheduledBy, const String& parent,
const String& id, const MessageOrigin::Ptr& origin) const String& id, const MessageOrigin::Ptr& origin)
{ {
String fullName; String fullName;
String triggeredBy;
if (id.IsEmpty()) if (id.IsEmpty())
fullName = checkable->GetName() + "!" + Utility::NewUniqueID(); fullName = checkable->GetName() + "!" + Utility::NewUniqueID();
else else
fullName = id; fullName = id;
if (parentDowntime) {
triggeredBy = parentDowntime->GetName();
}
Dictionary::Ptr attrs = new Dictionary(); Dictionary::Ptr attrs = new Dictionary();
attrs->Set("author", author); attrs->Set("author", author);
@ -326,8 +331,7 @@ Downtime::Ptr Downtime::AddDowntime(const Checkable::Ptr& checkable, const Strin
BOOST_THROW_EXCEPTION(std::runtime_error("Could not create downtime.")); BOOST_THROW_EXCEPTION(std::runtime_error("Could not create downtime."));
} }
if (!triggeredBy.IsEmpty()) { if (parentDowntime) {
Downtime::Ptr parentDowntime = Downtime::GetByName(triggeredBy);
Array::Ptr triggers = parentDowntime->GetTriggers(); Array::Ptr triggers = parentDowntime->GetTriggers();
ObjectLock olock(triggers); ObjectLock olock(triggers);

2
lib/icinga/downtime.hpp
View File

@ -48,7 +48,7 @@ public:
static Ptr AddDowntime(const intrusive_ptr<Checkable>& checkable, const String& author, static Ptr AddDowntime(const intrusive_ptr<Checkable>& checkable, const String& author,
const String& comment, double startTime, double endTime, bool fixed, const String& comment, double startTime, double endTime, bool fixed,
const String& triggeredBy, double duration, const String& scheduledDowntime = String(), const Ptr& parentDowntime, double duration, const String& scheduledDowntime = String(),
const String& scheduledBy = String(), const String& parent = String(), const String& id = String(), const String& scheduledBy = String(), const String& parent = String(), const String& id = String(),
const MessageOrigin::Ptr& origin = nullptr); const MessageOrigin::Ptr& origin = nullptr);

74
lib/icinga/externalcommandprocessor.cpp
View File

@ -967,16 +967,12 @@ void ExternalCommandProcessor::ScheduleSvcDowntime(double, const std::vector<Str
if (!service) if (!service)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot schedule service downtime for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot schedule service downtime for non-existent service '" + arguments[1] + "' on host '" + arguments[0] + "'"));
String triggeredBy; Downtime::Ptr triggeredBy;
int triggeredByLegacy = Convert::ToLong(arguments[5]); int triggeredByLegacy = Convert::ToLong(arguments[5]);
int is_fixed = Convert::ToLong(arguments[4]); int is_fixed = Convert::ToLong(arguments[4]);
if (triggeredByLegacy != 0) { if (triggeredByLegacy != 0) {
auto trigger (Downtime::GetDowntimeFromLegacyID(triggeredByLegacy)); triggeredBy = Downtime::GetDowntimeFromLegacyID(triggeredByLegacy);
if (trigger) {
triggeredBy = trigger->GetName();
}
} }
Log(LogNotice, "ExternalCommandProcessor") Log(LogNotice, "ExternalCommandProcessor")
@ -1013,16 +1009,12 @@ void ExternalCommandProcessor::ScheduleHostDowntime(double, const std::vector<St
if (!host) if (!host)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot schedule host downtime for non-existent host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot schedule host downtime for non-existent host '" + arguments[0] + "'"));
String triggeredBy; Downtime::Ptr triggeredBy;
int triggeredByLegacy = Convert::ToLong(arguments[4]); int triggeredByLegacy = Convert::ToLong(arguments[4]);
int is_fixed = Convert::ToLong(arguments[3]); int is_fixed = Convert::ToLong(arguments[3]);
if (triggeredByLegacy != 0) { if (triggeredByLegacy != 0) {
auto trigger (Downtime::GetDowntimeFromLegacyID(triggeredByLegacy)); triggeredBy = Downtime::GetDowntimeFromLegacyID(triggeredByLegacy);
if (trigger) {
triggeredBy = trigger->GetName();
}
} }
Log(LogNotice, "ExternalCommandProcessor") Log(LogNotice, "ExternalCommandProcessor")
@ -1040,16 +1032,12 @@ void ExternalCommandProcessor::ScheduleAndPropagateHostDowntime(double, const st
if (!host) if (!host)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot schedule and propagate host downtime for non-existent host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot schedule and propagate host downtime for non-existent host '" + arguments[0] + "'"));
String triggeredBy; Downtime::Ptr triggeredBy;
int triggeredByLegacy = Convert::ToLong(arguments[4]); int triggeredByLegacy = Convert::ToLong(arguments[4]);
int is_fixed = Convert::ToLong(arguments[3]); int is_fixed = Convert::ToLong(arguments[3]);
if (triggeredByLegacy != 0) { if (triggeredByLegacy != 0) {
auto trigger (Downtime::GetDowntimeFromLegacyID(triggeredByLegacy)); triggeredBy = Downtime::GetDowntimeFromLegacyID(triggeredByLegacy);
if (trigger) {
triggeredBy = trigger->GetName();
}
} }
Log(LogNotice, "ExternalCommandProcessor") Log(LogNotice, "ExternalCommandProcessor")
@ -1082,16 +1070,12 @@ void ExternalCommandProcessor::ScheduleAndPropagateTriggeredHostDowntime(double,
if (!host) if (!host)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot schedule and propagate triggered host downtime for non-existent host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot schedule and propagate triggered host downtime for non-existent host '" + arguments[0] + "'"));
String triggeredBy; Downtime::Ptr triggeredBy;
int triggeredByLegacy = Convert::ToLong(arguments[4]); int triggeredByLegacy = Convert::ToLong(arguments[4]);
int is_fixed = Convert::ToLong(arguments[3]); int is_fixed = Convert::ToLong(arguments[3]);
if (triggeredByLegacy != 0) { if (triggeredByLegacy != 0) {
auto trigger (Downtime::GetDowntimeFromLegacyID(triggeredByLegacy)); triggeredBy = Downtime::GetDowntimeFromLegacyID(triggeredByLegacy);
if (trigger) {
triggeredBy = trigger->GetName();
}
} }
Log(LogNotice, "ExternalCommandProcessor") Log(LogNotice, "ExternalCommandProcessor")
@ -1113,7 +1097,7 @@ void ExternalCommandProcessor::ScheduleAndPropagateTriggeredHostDowntime(double,
(void) Downtime::AddDowntime(child, arguments[6], arguments[7], (void) Downtime::AddDowntime(child, arguments[6], arguments[7],
Convert::ToDouble(arguments[1]), Convert::ToDouble(arguments[2]), Convert::ToDouble(arguments[1]), Convert::ToDouble(arguments[2]),
Convert::ToBool(is_fixed), parentDowntime->GetName(), Convert::ToDouble(arguments[5])); Convert::ToBool(is_fixed), parentDowntime, Convert::ToDouble(arguments[5]));
} }
} }
@ -1203,16 +1187,12 @@ void ExternalCommandProcessor::ScheduleHostSvcDowntime(double, const std::vector
if (!host) if (!host)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot schedule host services downtime for non-existent host '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot schedule host services downtime for non-existent host '" + arguments[0] + "'"));
String triggeredBy; Downtime::Ptr triggeredBy;
int triggeredByLegacy = Convert::ToLong(arguments[4]); int triggeredByLegacy = Convert::ToLong(arguments[4]);
int is_fixed = Convert::ToLong(arguments[3]); int is_fixed = Convert::ToLong(arguments[3]);
if (triggeredByLegacy != 0) { if (triggeredByLegacy != 0) {
auto trigger (Downtime::GetDowntimeFromLegacyID(triggeredByLegacy)); triggeredBy = Downtime::GetDowntimeFromLegacyID(triggeredByLegacy);
if (trigger) {
triggeredBy = trigger->GetName();
}
} }
Log(LogNotice, "ExternalCommandProcessor") Log(LogNotice, "ExternalCommandProcessor")
@ -1238,16 +1218,12 @@ void ExternalCommandProcessor::ScheduleHostgroupHostDowntime(double, const std::
if (!hg) if (!hg)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot schedule hostgroup host downtime for non-existent hostgroup '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot schedule hostgroup host downtime for non-existent hostgroup '" + arguments[0] + "'"));
String triggeredBy; Downtime::Ptr triggeredBy;
int triggeredByLegacy = Convert::ToLong(arguments[4]); int triggeredByLegacy = Convert::ToLong(arguments[4]);
int is_fixed = Convert::ToLong(arguments[3]); int is_fixed = Convert::ToLong(arguments[3]);
if (triggeredByLegacy != 0) { if (triggeredByLegacy != 0) {
auto trigger (Downtime::GetDowntimeFromLegacyID(triggeredByLegacy)); triggeredBy = Downtime::GetDowntimeFromLegacyID(triggeredByLegacy);
if (trigger) {
triggeredBy = trigger->GetName();
}
} }
for (const Host::Ptr& host : hg->GetMembers()) { for (const Host::Ptr& host : hg->GetMembers()) {
@ -1267,16 +1243,12 @@ void ExternalCommandProcessor::ScheduleHostgroupSvcDowntime(double, const std::v
if (!hg) if (!hg)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot schedule hostgroup service downtime for non-existent hostgroup '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot schedule hostgroup service downtime for non-existent hostgroup '" + arguments[0] + "'"));
String triggeredBy; Downtime::Ptr triggeredBy;
int triggeredByLegacy = Convert::ToLong(arguments[4]); int triggeredByLegacy = Convert::ToLong(arguments[4]);
int is_fixed = Convert::ToLong(arguments[3]); int is_fixed = Convert::ToLong(arguments[3]);
if (triggeredByLegacy != 0) { if (triggeredByLegacy != 0) {
auto trigger (Downtime::GetDowntimeFromLegacyID(triggeredByLegacy)); triggeredBy = Downtime::GetDowntimeFromLegacyID(triggeredByLegacy);
if (trigger) {
triggeredBy = trigger->GetName();
}
} }
/* Note: we can't just directly create downtimes for all the services by iterating /* Note: we can't just directly create downtimes for all the services by iterating
@ -1307,16 +1279,12 @@ void ExternalCommandProcessor::ScheduleServicegroupHostDowntime(double, const st
if (!sg) if (!sg)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot schedule servicegroup host downtime for non-existent servicegroup '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot schedule servicegroup host downtime for non-existent servicegroup '" + arguments[0] + "'"));
String triggeredBy; Downtime::Ptr triggeredBy;
int triggeredByLegacy = Convert::ToLong(arguments[4]); int triggeredByLegacy = Convert::ToLong(arguments[4]);
int is_fixed = Convert::ToLong(arguments[3]); int is_fixed = Convert::ToLong(arguments[3]);
if (triggeredByLegacy != 0) { if (triggeredByLegacy != 0) {
auto trigger (Downtime::GetDowntimeFromLegacyID(triggeredByLegacy)); triggeredBy = Downtime::GetDowntimeFromLegacyID(triggeredByLegacy);
if (trigger) {
triggeredBy = trigger->GetName();
}
} }
/* Note: we can't just directly create downtimes for all the hosts by iterating /* Note: we can't just directly create downtimes for all the hosts by iterating
@ -1346,16 +1314,12 @@ void ExternalCommandProcessor::ScheduleServicegroupSvcDowntime(double, const std
if (!sg) if (!sg)
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot schedule servicegroup service downtime for non-existent servicegroup '" + arguments[0] + "'")); BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot schedule servicegroup service downtime for non-existent servicegroup '" + arguments[0] + "'"));
String triggeredBy; Downtime::Ptr triggeredBy;
int triggeredByLegacy = Convert::ToLong(arguments[4]); int triggeredByLegacy = Convert::ToLong(arguments[4]);
int is_fixed = Convert::ToLong(arguments[3]); int is_fixed = Convert::ToLong(arguments[3]);
if (triggeredByLegacy != 0) { if (triggeredByLegacy != 0) {
auto trigger (Downtime::GetDowntimeFromLegacyID(triggeredByLegacy)); triggeredBy = Downtime::GetDowntimeFromLegacyID(triggeredByLegacy);
if (trigger) {
triggeredBy = trigger->GetName();
}
} }
for (const Service::Ptr& service : sg->GetMembers()) { for (const Service::Ptr& service : sg->GetMembers()) {

8
lib/icinga/scheduleddowntime.cpp
View File

@ -282,7 +282,7 @@ void ScheduledDowntime::CreateNextDowntime()
Downtime::Ptr downtime = Downtime::AddDowntime(GetCheckable(), GetAuthor(), GetComment(), Downtime::Ptr downtime = Downtime::AddDowntime(GetCheckable(), GetAuthor(), GetComment(),
segment.first, segment.second, segment.first, segment.second,
GetFixed(), String(), GetDuration(), GetName(), GetName()); GetFixed(), nullptr, GetDuration(), GetName(), GetName());
String downtimeName = downtime->GetName(); String downtimeName = downtime->GetName();
int childOptions = Downtime::ChildOptionsFromValue(GetChildOptions()); int childOptions = Downtime::ChildOptionsFromValue(GetChildOptions());
@ -290,9 +290,9 @@ void ScheduledDowntime::CreateNextDowntime()
/* 'DowntimeTriggeredChildren' schedules child downtimes triggered by the parent downtime. /* 'DowntimeTriggeredChildren' schedules child downtimes triggered by the parent downtime.
* 'DowntimeNonTriggeredChildren' schedules non-triggered downtimes for all children. * 'DowntimeNonTriggeredChildren' schedules non-triggered downtimes for all children.
*/ */
String triggerName; Downtime::Ptr trigger;
if (childOptions == 1) if (childOptions == 1)
triggerName = downtimeName; trigger = downtime;
Log(LogNotice, "ScheduledDowntime") Log(LogNotice, "ScheduledDowntime")
<< "Processing child options " << childOptions << " for downtime " << downtimeName; << "Processing child options " << childOptions << " for downtime " << downtimeName;
@ -302,7 +302,7 @@ void ScheduledDowntime::CreateNextDowntime()
<< "Scheduling downtime for child object " << child->GetName(); << "Scheduling downtime for child object " << child->GetName();
Downtime::Ptr childDowntime = Downtime::AddDowntime(child, GetAuthor(), GetComment(), Downtime::Ptr childDowntime = Downtime::AddDowntime(child, GetAuthor(), GetComment(),
segment.first, segment.second, GetFixed(), triggerName, GetDuration(), GetName(), GetName()); segment.first, segment.second, GetFixed(), trigger, GetDuration(), GetName(), GetName());
Log(LogNotice, "ScheduledDowntime") Log(LogNotice, "ScheduledDowntime")
<< "Add child downtime '" << childDowntime->GetName() << "'."; << "Add child downtime '" << childDowntime->GetName() << "'.";