Skip to content

HostgroupRestriction: Allow creation of hosts if they match restricted groups filter #3003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

HostgroupRestriction: Allow creation of hosts if they match restricted groups filter #3003

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion library/Director/Restriction/HostgroupRestriction.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@

namespace Icinga\Module\Director\Restriction;

use Icinga\Data\Filter\Filter;
use Icinga\Module\Director\Auth\Restriction;
use Icinga\Module\Director\Db\IcingaObjectFilterHelper;
use Icinga\Module\Director\Objects\HostApplyMatches;
use Icinga\Module\Director\Objects\IcingaHost;
use Icinga\Module\Director\Objects\IcingaHostGroup;
use Icinga\Module\Director\Objects\IcingaObject;
Expand Down Expand Up @@ -59,7 +61,7 @@ public function allowsHost(IcingaHost $host)
// Hint: branched hosts have no id
if (! $host->hasBeenLoadedFromDb() || $host->hasModifiedGroups() || $host->get('id') === null) {
foreach ($this->listRestrictedHostgroups() as $group) {
if ($host->hasGroup($group)) {
if ($host->hasGroup($group) || $this->matchesHostGroupFilter($group, $host)) {
return true;
}
}
Expand All @@ -76,6 +78,21 @@ public function allowsHost(IcingaHost $host)
return (int) $this->db->fetchOne($query) === (int) $host->get('id');
}

/**
* Check if the given host matches the filter of given host group
*
* @param string $group
* @param IcingaHost $host
*
* @return bool
*/
private function matchesHostGroupFilter(string $group, IcingaHost $host): bool
{
return HostApplyMatches::prepare($host)->matchesFilter(
Filter::fromQueryString(IcingaHostGroup::load($group, $host->getConnection())->get('assign_filter'))
);
}

/**
* Whether access to the given hostgroup is allowed
*
Expand Down
Loading