tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-24 06:05:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix attribute validation for PUT queries

Browse Source 
fixes #10601
This commit is contained in:
Michael Friedrich 2015-11-12 09:31:27 +01:00
parent e1b2f1750d
commit 6518f78af0
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/icinga/downtime.cpp
View File

@ -320,7 +320,12 @@ void Downtime::TriggerDowntime(void)
{ {
ObjectLock olock(triggers); ObjectLock olock(triggers);
BOOST_FOREACH(const String& triggerName, triggers) { BOOST_FOREACH(const String& triggerName, triggers) {
Downtime::GetByName(triggerName)->TriggerDowntime(); Downtime::Ptr downtime = Downtime::GetByName(triggerName);
if (!downtime)
continue;
downtime->TriggerDowntime();
} }
} }

4
lib/icinga/downtime.ti
View File

@ -76,9 +76,9 @@ class Downtime : ConfigObject < DowntimeNameComposer
[state] double trigger_time; [state] double trigger_time;
[config] bool fixed; [config] bool fixed;
[config] double duration; [config] double duration;
[state] name(Downtime) triggered_by; [config] name(Downtime) triggered_by;
[config] String scheduled_by; [config] String scheduled_by;
[config] Array::Ptr triggers { [state] Array::Ptr triggers {
default {{{ return new Array(); }}} default {{{ return new Array(); }}}
}; };
int legacy_id; int legacy_id;

4
lib/remote/configobjectutility.cpp
View File

@ -71,14 +71,14 @@ String ConfigObjectUtility::CreateObjectConfig(const Type::Ptr& type, const Stri
ObjectLock olock(attrs); ObjectLock olock(attrs);
BOOST_FOREACH(const Dictionary::Pair& kv, attrs) { BOOST_FOREACH(const Dictionary::Pair& kv, attrs) {
int fid = type->GetFieldId(kv.first); int fid = type->GetFieldId(kv.first.SubStr(0, kv.first.FindFirstOf(".")));
if (fid < 0) if (fid < 0)
BOOST_THROW_EXCEPTION(ScriptError("Invalid attribute specified: " + kv.first)); BOOST_THROW_EXCEPTION(ScriptError("Invalid attribute specified: " + kv.first));
Field field = type->GetFieldInfo(fid); Field field = type->GetFieldInfo(fid);
if (field.Attributes & FANoUserModify) if (!(field.Attributes & FAConfig) || kv.first == "name")
BOOST_THROW_EXCEPTION(ScriptError("Attribute is marked for internal use only and may not be set: " + kv.first)); BOOST_THROW_EXCEPTION(ScriptError("Attribute is marked for internal use only and may not be set: " + kv.first));
} }
} }