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 #7164 from Icinga/bugfix/notification-times-validate 

Improve validation for times.{begin,end} in notification objects
This commit is contained in:
Michael Friedrich 2019-05-07 15:58:44 +02:00 committed by GitHub
parent 296fc06890 8ae206cd5d
commit 736e0806d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/icinga/notification.cpp
View File

@ -720,6 +720,35 @@ void Notification::ValidateTypes(const Lazy<Array::Ptr>& lvalue, const Validatio
BOOST_THROW_EXCEPTION(ValidationError(this, { "types" }, "Type filter is invalid."));
}
void Notification::ValidateTimes(const Lazy<Dictionary::Ptr>& lvalue, const ValidationUtils& utils)
{
ObjectImpl<Notification>::ValidateTimes(lvalue, utils);
Dictionary::Ptr times = lvalue();
if (!times)
return;
double begin;
double end;
try {
begin = Convert::ToDouble(times->Get("begin"));
} catch (const std::exception&) {
BOOST_THROW_EXCEPTION(ValidationError(this, { "times" }, "'begin' is invalid, must be duration or number." ));
}
try {
end = Convert::ToDouble(times->Get("end"));
} catch (const std::exception&) {
BOOST_THROW_EXCEPTION(ValidationError(this, { "times" }, "'end' is invalid, must be duration or number." ));
}
/* Also solve logical errors where begin > end. */
if (begin > 0 && end > 0 && begin > end)
BOOST_THROW_EXCEPTION(ValidationError(this, { "times" }, "'begin' must be smaller than 'end'."));
}
Endpoint::Ptr Notification::GetCommandEndpoint() const
{
return Endpoint::GetByName(GetCommandEndpointRaw());

1
lib/icinga/notification.hpp
View File

@ -95,6 +95,7 @@ public:
void ValidateStates(const Lazy<Array::Ptr>& lvalue, const ValidationUtils& utils) override;
void ValidateTypes(const Lazy<Array::Ptr>& lvalue, const ValidationUtils& utils) override;
void ValidateTimes(const Lazy<Dictionary::Ptr>& lvalue, const ValidationUtils& utils) override;
static void EvaluateApplyRules(const intrusive_ptr<Host>& host);
static void EvaluateApplyRules(const intrusive_ptr<Service>& service);