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

Ensure that added group members are unique

Browse Source 
refs #4732
This commit is contained in:
Michael Friedrich 2018-05-09 17:15:44 +02:00
parent 6660a45c41
commit 88d99094bf
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/icinga/hostgroup.cpp
View File

@ -37,9 +37,9 @@ INITIALIZE_ONCE([]() {
bool HostGroup::EvaluateObjectRule(const Host::Ptr& host, const ConfigItem::Ptr& group) bool HostGroup::EvaluateObjectRule(const Host::Ptr& host, const ConfigItem::Ptr& group)
{ {
String group_name = group->GetName(); String groupName = group->GetName();
CONTEXT("Evaluating rule for group '" + group_name + "'"); CONTEXT("Evaluating rule for group '" + groupName + "'");
ScriptFrame frame(true); ScriptFrame frame(true);
if (group->GetScope()) if (group->GetScope())
@ -50,10 +50,12 @@ bool HostGroup::EvaluateObjectRule(const Host::Ptr& host, const ConfigItem::Ptr&
return false; return false;
Log(LogDebug, "HostGroup") Log(LogDebug, "HostGroup")
<< "Assigning membership for group '" << group_name << "' to host '" << host->GetName() << "'"; << "Assigning membership for group '" << groupName << "' to host '" << host->GetName() << "'";
Array::Ptr groups = host->GetGroups(); Array::Ptr groups = host->GetGroups();
groups->Add(group_name);
if (groups && !groups->Contains(groupName))
groups->Add(groupName);
return true; return true;
} }

10
lib/icinga/servicegroup.cpp
View File

@ -37,9 +37,9 @@ INITIALIZE_ONCE([]() {
bool ServiceGroup::EvaluateObjectRule(const Service::Ptr& service, const ConfigItem::Ptr& group) bool ServiceGroup::EvaluateObjectRule(const Service::Ptr& service, const ConfigItem::Ptr& group)
{ {
String group_name = group->GetName(); String groupName = group->GetName();
CONTEXT("Evaluating rule for group '" + group_name + "'"); CONTEXT("Evaluating rule for group '" + groupName + "'");
Host::Ptr host = service->GetHost(); Host::Ptr host = service->GetHost();
@ -53,10 +53,12 @@ bool ServiceGroup::EvaluateObjectRule(const Service::Ptr& service, const ConfigI
return false; return false;
Log(LogDebug, "ServiceGroup") Log(LogDebug, "ServiceGroup")
<< "Assigning membership for group '" << group_name << "' to service '" << service->GetName() << "'"; << "Assigning membership for group '" << groupName << "' to service '" << service->GetName() << "'";
Array::Ptr groups = service->GetGroups(); Array::Ptr groups = service->GetGroups();
groups->Add(group_name);
if (groups && !groups->Contains(groupName))
groups->Add(groupName);
return true; return true;
} }

10
lib/icinga/usergroup.cpp
View File

@ -37,9 +37,9 @@ INITIALIZE_ONCE([]() {
bool UserGroup::EvaluateObjectRule(const User::Ptr& user, const ConfigItem::Ptr& group) bool UserGroup::EvaluateObjectRule(const User::Ptr& user, const ConfigItem::Ptr& group)
{ {
String group_name = group->GetName(); String groupName = group->GetName();
CONTEXT("Evaluating rule for group '" + group_name + "'"); CONTEXT("Evaluating rule for group '" + groupName + "'");
ScriptFrame frame(true); ScriptFrame frame(true);
if (group->GetScope()) if (group->GetScope())
@ -50,10 +50,12 @@ bool UserGroup::EvaluateObjectRule(const User::Ptr& user, const ConfigItem::Ptr&
return false; return false;
Log(LogDebug, "UserGroup") Log(LogDebug, "UserGroup")
<< "Assigning membership for group '" << group_name << "' to user '" << user->GetName() << "'"; << "Assigning membership for group '" << groupName << "' to user '" << user->GetName() << "'";
Array::Ptr groups = user->GetGroups(); Array::Ptr groups = user->GetGroups();
groups->Add(group_name);
if (groups && !groups->Contains(groupName))
groups->Add(groupName);
return true; return true;
} }