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

Disallow modify attribute for certain object attributes

Browse Source 
fixes #9095
This commit is contained in:
Michael Friedrich 2015-10-15 16:33:20 +02:00
parent 4fb5329e60
commit 6cc4f85c66
8 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/base/configobject.cpp
View File

@ -130,6 +130,9 @@ void ConfigObject::ModifyAttribute(const String& attr, const Value& value, bool
int fid = type->GetFieldId(fieldName); int fid = type->GetFieldId(fieldName);
Field field = type->GetFieldInfo(fid); Field field = type->GetFieldInfo(fid);
if (field.Attributes & FAInternal || field.Attributes & FANoModify)
BOOST_THROW_EXCEPTION(std::invalid_argument("Attribute cannot be modified."));
if (field.Attributes & FAConfig) { if (field.Attributes & FAConfig) {
if (!original_attributes) { if (!original_attributes) {
original_attributes = new Dictionary(); original_attributes = new Dictionary();

20
lib/base/configobject.ti
View File

@ -68,8 +68,8 @@ private:
abstract class ConfigObject : ConfigObjectBase abstract class ConfigObject : ConfigObjectBase
{ {
[config, internal] String __name (Name); [config, internal, no_modify] String __name (Name);
[config] String "name" (ShortName) { [config, no_modify] String "name" (ShortName) {
get {{{ get {{{
if (m_ShortName.IsEmpty()) if (m_ShortName.IsEmpty())
return GetName(); return GetName();
@ -77,22 +77,22 @@ abstract class ConfigObject : ConfigObjectBase
return m_ShortName; return m_ShortName;
}}} }}}
}; };
[config, internal, get_protected] String type (TypeNameV); [config, internal, get_protected, no_modify] String type (TypeNameV);
[config] name(Zone) zone (ZoneName); [config] name(Zone) zone (ZoneName);
[config] String package; [config] String package;
[config, internal, get_protected] Array::Ptr templates; [config, internal, get_protected, no_modify] Array::Ptr templates;
[get_protected] bool active; [get_protected] bool active;
[get_protected] bool paused { [get_protected] bool paused {
default {{{ return true; }}} default {{{ return true; }}}
}; };
[get_protected, internal] bool start_called; [get_protected, internal, no_modify] bool start_called;
[get_protected, internal] bool stop_called; [get_protected, internal, no_modify] bool stop_called;
[get_protected, internal] bool pause_called; [get_protected, internal, no_modify] bool pause_called;
[get_protected, internal] bool resume_called; [get_protected, internal, no_modify] bool resume_called;
[enum] HAMode ha_mode (HAMode); [enum] HAMode ha_mode (HAMode);
[protected] Dictionary::Ptr extensions; [protected, no_modify] Dictionary::Ptr extensions;
[protected] bool state_loaded; [protected, no_modify] bool state_loaded;
Dictionary::Ptr original_attributes; Dictionary::Ptr original_attributes;
[state] double version { [state] double version {
default {{{ return 0; }}} default {{{ return 0; }}}

3
lib/base/type.hpp
View File

@ -38,7 +38,8 @@ enum FieldAttribute
FAState = 4, FAState = 4,
FAInternal = 64, FAInternal = 64,
FARequired = 512, FARequired = 512,
FANavigation = 1024 FANavigation = 1024,
FANoModify = 2048
}; };
class Type; class Type;

2
lib/icinga/host.ti
View File

@ -27,7 +27,7 @@ namespace icinga
class Host : Checkable class Host : Checkable
{ {
[config] array(name(HostGroup)) groups { [config, no_modify] array(name(HostGroup)) groups {
default {{{ return new Array(); }}} default {{{ return new Array(); }}}
}; };

2
lib/icinga/service.ti
View File

@ -40,7 +40,7 @@ class Service : Checkable < ServiceNameComposer
{ {
load_after Host; load_after Host;
[config] array(name(ServiceGroup)) groups { [config, no_modify] array(name(ServiceGroup)) groups {
default {{{ return new Array(); }}} default {{{ return new Array(); }}}
}; };

2
lib/icinga/user.ti
View File

@ -35,7 +35,7 @@ class User : CustomVarObject
return m_DisplayName; return m_DisplayName;
}}} }}}
}; };
[config] array(name(UserGroup)) groups { [config, no_modify] array(name(UserGroup)) groups {
default {{{ return new Array(); }}} default {{{ return new Array(); }}}
}; };
[config, navigation] name(TimePeriod) period (PeriodRaw) { [config, navigation] name(TimePeriod) period (PeriodRaw) {

1
tools/mkclass/class_lexer.ll
View File

@ -146,6 +146,7 @@ protected { yylval->num = FAGetProtected | FASetProtected; return T_FIELD_ATTR
internal { yylval->num = FAInternal; return T_FIELD_ATTRIBUTE; } internal { yylval->num = FAInternal; return T_FIELD_ATTRIBUTE; }
no_storage { yylval->num = FANoStorage; return T_FIELD_ATTRIBUTE; } no_storage { yylval->num = FANoStorage; return T_FIELD_ATTRIBUTE; }
navigation { return T_NAVIGATION; } navigation { return T_NAVIGATION; }
no_modify { yylval->num = FANoModify; return T_FIELD_ATTRIBUTE; }
validator { return T_VALIDATOR; } validator { return T_VALIDATOR; }
required { return T_REQUIRED; } required { return T_REQUIRED; }
name { return T_NAME; } name { return T_NAME; }

3
tools/mkclass/classcompiler.hpp
View File

@ -71,7 +71,8 @@ enum FieldAttribute
FANoStorage = 128, FANoStorage = 128,
FALoadDependency = 256, FALoadDependency = 256,
FARequired = 512, FARequired = 512,
FANavigation = 1024 FANavigation = 1024,
FANoModify = 2048
}; };
struct FieldType struct FieldType