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 #10049 from Icinga/AddDowntime-trigger_name 

Downtime::AddDowntime(): NULL-check pointer before deref not to crash
This commit is contained in:
Alexander Aleksandrovič Klimov 2024-05-06 10:26:26 +02:00 committed by GitHub
parent d8f8d64f1a 5f80ac17aa
commit 8c2eb3c1ed
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 100 additions and 53 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"))
duration = HttpUtility::GetLastParameter(params, "duration");
String triggerName;
if (params->Contains("trigger_name"))
triggerName = HttpUtility::GetLastParameter(params, "trigger_name");
Downtime::Ptr trigger;
String 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 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,
fixed, triggerName, duration);
fixed, trigger, duration);
String downtimeName = downtime->GetName();
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();
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();
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.
* 'DowntimeNonTriggeredChildren' schedules non-triggered downtimes for all children.
*/
if (childOptions == DowntimeTriggeredChildren)
triggerName = downtimeName;
if (childOptions == DowntimeTriggeredChildren) {
trigger = downtime;
}
Log(LogNotice, "ApiActions")
<< "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();
Downtime::Ptr childDowntime = Downtime::AddDowntime(child, author, comment, startTime, endTime,
fixed, triggerName, duration);
fixed, trigger, duration);
String childDowntimeName = childDowntime->GetName();
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();
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();
childServiceDowntimes.push_back(new Dictionary({

27
lib/icinga/downtime.cpp
View File

@ -16,7 +16,7 @@ using namespace icinga;
static int l_NextDowntimeID = 1;
static std::mutex l_DowntimeMutex;
static std::map<int, String> l_LegacyDowntimesCache;
static std::map<int, Downtime::Ptr> l_LegacyDowntimesCache;
static Timer::Ptr l_DowntimesOrphanedTimer;
static Timer::Ptr l_DowntimesStartTimer;
@ -109,7 +109,7 @@ void Downtime::Start(bool runtimeCreated)
std::unique_lock<std::mutex> lock(l_DowntimeMutex);
SetLegacyId(l_NextDowntimeID);
l_LegacyDowntimesCache[l_NextDowntimeID] = GetName();
l_LegacyDowntimesCache[l_NextDowntimeID] = this;
l_NextDowntimeID++;
}
@ -148,6 +148,12 @@ void Downtime::Start(bool runtimeCreated)
void Downtime::Stop(bool runtimeRemoved)
{
{
std::unique_lock<std::mutex> lock (l_DowntimeMutex);
l_LegacyDowntimesCache.erase(GetLegacyId());
}
GetCheckable()->UnregisterDowntime(this);
Downtime::Ptr parent = GetByName(GetParent());
@ -245,17 +251,22 @@ int Downtime::GetNextDowntimeID()
Downtime::Ptr Downtime::AddDowntime(const Checkable::Ptr& checkable, const String& author,
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& id, const MessageOrigin::Ptr& origin)
{
String fullName;
String triggeredBy;
if (id.IsEmpty())
fullName = checkable->GetName() + "!" + Utility::NewUniqueID();
else
fullName = id;
if (parentDowntime) {
triggeredBy = parentDowntime->GetName();
}
Dictionary::Ptr attrs = new Dictionary();
attrs->Set("author", author);
@ -326,8 +337,7 @@ Downtime::Ptr Downtime::AddDowntime(const Checkable::Ptr& checkable, const Strin
BOOST_THROW_EXCEPTION(std::runtime_error("Could not create downtime."));
}
if (!triggeredBy.IsEmpty()) {
Downtime::Ptr parentDowntime = Downtime::GetByName(triggeredBy);
if (parentDowntime) {
Array::Ptr triggers = parentDowntime->GetTriggers();
ObjectLock olock(triggers);
@ -513,14 +523,15 @@ void Downtime::SetRemovalInfo(const String& removedBy, double removeTime, const
OnRemovalInfoChanged(this, removedBy, removeTime, origin);
}
String Downtime::GetDowntimeIDFromLegacyID(int id)
Downtime::Ptr Downtime::GetDowntimeFromLegacyID(int id)
{
std::unique_lock<std::mutex> lock(l_DowntimeMutex);
auto it = l_LegacyDowntimesCache.find(id);
if (it == l_LegacyDowntimesCache.end())
return Empty;
if (it == l_LegacyDowntimesCache.end()) {
return nullptr;
}
return it->second;
}

4
lib/icinga/downtime.hpp
View File

@ -48,7 +48,7 @@ public:
static Ptr AddDowntime(const intrusive_ptr<Checkable>& checkable, const String& author,
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 MessageOrigin::Ptr& origin = nullptr);
@ -64,7 +64,7 @@ public:
void OnAllConfigLoaded() override;
static String GetDowntimeIDFromLegacyID(int id);
static Downtime::Ptr GetDowntimeFromLegacyID(int id);
static DowntimeChildOptions ChildOptionsFromValue(const Value& options);

88
lib/icinga/externalcommandprocessor.cpp
View File

@ -967,11 +967,13 @@ void ExternalCommandProcessor::ScheduleSvcDowntime(double, const std::vector<Str
if (!service)
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 is_fixed = Convert::ToLong(arguments[4]);
if (triggeredByLegacy != 0)
triggeredBy = Downtime::GetDowntimeIDFromLegacyID(triggeredByLegacy);
if (triggeredByLegacy != 0) {
triggeredBy = Downtime::GetDowntimeFromLegacyID(triggeredByLegacy);
}
Log(LogNotice, "ExternalCommandProcessor")
<< "Creating downtime for service " << service->GetName();
@ -983,7 +985,12 @@ void ExternalCommandProcessor::ScheduleSvcDowntime(double, const std::vector<Str
void ExternalCommandProcessor::DelSvcDowntime(double, const std::vector<String>& arguments)
{
int id = Convert::ToLong(arguments[0]);
String rid = Downtime::GetDowntimeIDFromLegacyID(id);
String rid;
auto dt (Downtime::GetDowntimeFromLegacyID(id));
if (dt) {
rid = dt->GetName();
}
try {
Downtime::RemoveDowntime(rid, false, true);
@ -1002,11 +1009,13 @@ void ExternalCommandProcessor::ScheduleHostDowntime(double, const std::vector<St
if (!host)
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 is_fixed = Convert::ToLong(arguments[3]);
if (triggeredByLegacy != 0)
triggeredBy = Downtime::GetDowntimeIDFromLegacyID(triggeredByLegacy);
if (triggeredByLegacy != 0) {
triggeredBy = Downtime::GetDowntimeFromLegacyID(triggeredByLegacy);
}
Log(LogNotice, "ExternalCommandProcessor")
<< "Creating downtime for host " << host->GetName();
@ -1023,11 +1032,13 @@ void ExternalCommandProcessor::ScheduleAndPropagateHostDowntime(double, const st
if (!host)
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 is_fixed = Convert::ToLong(arguments[3]);
if (triggeredByLegacy != 0)
triggeredBy = Downtime::GetDowntimeIDFromLegacyID(triggeredByLegacy);
if (triggeredByLegacy != 0) {
triggeredBy = Downtime::GetDowntimeFromLegacyID(triggeredByLegacy);
}
Log(LogNotice, "ExternalCommandProcessor")
<< "Creating downtime for host " << host->GetName();
@ -1059,11 +1070,13 @@ void ExternalCommandProcessor::ScheduleAndPropagateTriggeredHostDowntime(double,
if (!host)
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 is_fixed = Convert::ToLong(arguments[3]);
if (triggeredByLegacy != 0)
triggeredBy = Downtime::GetDowntimeIDFromLegacyID(triggeredByLegacy);
if (triggeredByLegacy != 0) {
triggeredBy = Downtime::GetDowntimeFromLegacyID(triggeredByLegacy);
}
Log(LogNotice, "ExternalCommandProcessor")
<< "Creating downtime for host " << host->GetName();
@ -1084,14 +1097,19 @@ void ExternalCommandProcessor::ScheduleAndPropagateTriggeredHostDowntime(double,
(void) Downtime::AddDowntime(child, arguments[6], arguments[7],
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]));
}
}
void ExternalCommandProcessor::DelHostDowntime(double, const std::vector<String>& arguments)
{
int id = Convert::ToLong(arguments[0]);
String rid = Downtime::GetDowntimeIDFromLegacyID(id);
String rid;
auto dt (Downtime::GetDowntimeFromLegacyID(id));
if (dt) {
rid = dt->GetName();
}
try {
Downtime::RemoveDowntime(rid, false, true);
@ -1169,11 +1187,13 @@ void ExternalCommandProcessor::ScheduleHostSvcDowntime(double, const std::vector
if (!host)
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 is_fixed = Convert::ToLong(arguments[3]);
if (triggeredByLegacy != 0)
triggeredBy = Downtime::GetDowntimeIDFromLegacyID(triggeredByLegacy);
if (triggeredByLegacy != 0) {
triggeredBy = Downtime::GetDowntimeFromLegacyID(triggeredByLegacy);
}
Log(LogNotice, "ExternalCommandProcessor")
<< "Creating downtime for host " << host->GetName();
@ -1198,11 +1218,13 @@ void ExternalCommandProcessor::ScheduleHostgroupHostDowntime(double, const std::
if (!hg)
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 is_fixed = Convert::ToLong(arguments[3]);
if (triggeredByLegacy != 0)
triggeredBy = Downtime::GetDowntimeIDFromLegacyID(triggeredByLegacy);
if (triggeredByLegacy != 0) {
triggeredBy = Downtime::GetDowntimeFromLegacyID(triggeredByLegacy);
}
for (const Host::Ptr& host : hg->GetMembers()) {
Log(LogNotice, "ExternalCommandProcessor")
@ -1221,11 +1243,13 @@ void ExternalCommandProcessor::ScheduleHostgroupSvcDowntime(double, const std::v
if (!hg)
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 is_fixed = Convert::ToLong(arguments[3]);
if (triggeredByLegacy != 0)
triggeredBy = Downtime::GetDowntimeIDFromLegacyID(triggeredByLegacy);
if (triggeredByLegacy != 0) {
triggeredBy = Downtime::GetDowntimeFromLegacyID(triggeredByLegacy);
}
/* Note: we can't just directly create downtimes for all the services by iterating
* over all hosts in the host group - otherwise we might end up creating multiple
@ -1255,11 +1279,13 @@ void ExternalCommandProcessor::ScheduleServicegroupHostDowntime(double, const st
if (!sg)
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 is_fixed = Convert::ToLong(arguments[3]);
if (triggeredByLegacy != 0)
triggeredBy = Downtime::GetDowntimeIDFromLegacyID(triggeredByLegacy);
if (triggeredByLegacy != 0) {
triggeredBy = Downtime::GetDowntimeFromLegacyID(triggeredByLegacy);
}
/* Note: we can't just directly create downtimes for all the hosts by iterating
* over all services in the service group - otherwise we might end up creating multiple
@ -1288,11 +1314,13 @@ void ExternalCommandProcessor::ScheduleServicegroupSvcDowntime(double, const std
if (!sg)
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 is_fixed = Convert::ToLong(arguments[3]);
if (triggeredByLegacy != 0)
triggeredBy = Downtime::GetDowntimeIDFromLegacyID(triggeredByLegacy);
if (triggeredByLegacy != 0) {
triggeredBy = Downtime::GetDowntimeFromLegacyID(triggeredByLegacy);
}
for (const Service::Ptr& service : sg->GetMembers()) {
Log(LogNotice, "ExternalCommandProcessor")

8
lib/icinga/scheduleddowntime.cpp
View File

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