Skip to content

Fix director services permissions #3019

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
raviks789 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix director services permissions #3019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fad00d3
Allow service configuration only with 'director/services' permission
raviks789 Nov 20, 2025
4bbbbac
Show modify action links only with corresponding monitoring and Icing…
raviks789 Nov 20, 2025
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
14 changes: 11 additions & 3 deletions application/controllers/HostController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,12 @@
$info = ServiceFinder::find($host, $serviceName);
$backend = $this->backend();

if ($info && $auth->hasPermission(Permission::HOSTS)) {
if ($info && $auth->hasPermission(Permission::SERVICES)) {
$redirectUrl = $info->getUrl();
} elseif (
$info
&& (($backend instanceof Monitoring && $auth->hasPermission(Permission::MONITORING_HOSTS))
|| ($backend instanceof IcingadbBackend && $auth->hasPermission(Permission::ICINGADB_HOSTS))
&& (($backend instanceof Monitoring && $auth->hasPermission(Permission::MONITORING_SERVICES))
|| ($backend instanceof IcingadbBackend && $auth->hasPermission(Permission::ICINGADB_SERVICES))
)
&& $backend->canModifyService($hostName, $serviceName)
) {
Expand Down Expand Up @@ -215,6 +215,14 @@
*/
public function servicesAction()
{
if (! $this->hasPermission(Permission::SERVICES)) {
if ($this->isServicesReadOnlyAction() && $this->hasPermission($this->getServicesReadOnlyPermission())) {
$this->servicesroAction();
}

return;
}

$this->addServicesHeader();
$host = $this->getHostObject();
$this->addTitle($this->translate('Services: %s'), $host->getObjectName());
Expand Down Expand Up @@ -366,7 +374,7 @@
* @param IcingaHost $host
* @param IcingaHost|null $affectedHost
*/
protected function addHostServiceSetTables(IcingaHost $host, IcingaHost $affectedHost = null, $roService = null)

Check failure on line 377 in application/controllers/HostController.php

View workflow job for this annotation

GitHub Actions / phpstan / Static analysis with phpstan and php 8.4 on ubuntu-latest 

Deprecated in PHP 8.4: Parameter #2 $affectedHost (Icinga\Module\Director\Objects\IcingaHost) is implicitly nullable via default value null.
{
$db = $this->db();
if ($affectedHost === null) {
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/ServiceController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ protected function checkDirectorPermissions()
return;
}

$this->assertPermission(Permission::HOSTS);
$this->assertPermission(Permission::SERVICES);
}

public function init()
Expand Down
10 changes: 6 additions & 4 deletions library/Director/ProvidedHook/Icingadb/HostActions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,12 @@ protected function getThem(Host $host): array
if (Util::hasPermission(Permission::HOSTS) && IcingaHost::exists($hostname, $db)) {
$allowEdit = true;
}
if (Util::hasPermission(Permission::ICINGADB_HOSTS)) {
if ((new IcingadbBackend())->canModifyHost($hostname)) {
$allowEdit = IcingaHost::exists($hostname, $db);
}
if (
Util::hasPermission(Permission::HOSTS)
&& Util::hasPermission(Permission::ICINGADB_HOSTS)
&& (new IcingadbBackend())->canModifyHost($hostname)
) {
$allowEdit = IcingaHost::exists($hostname, $db);
}

if ($allowEdit) {
Expand Down
10 changes: 5 additions & 5 deletions library/Director/ProvidedHook/Icingadb/ServiceActions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,12 @@ protected function getThem(Service $service)
}

$title = null;
if (Util::hasPermission(Permission::HOSTS)) {
if (
Util::hasPermission(Permission::SERVICES)
&& Util::hasPermission(Permission::ICINGADB_SERVICES)
&& (new IcingadbBackend())->canModifyService($hostname, $serviceName)
) {
$title = mt('director', 'Modify');
} elseif (Util::hasPermission(Permission::ICINGADB_SERVICES)) {
if ((new IcingadbBackend())->canModifyService($hostname, $serviceName)) {
$title = mt('director', 'Modify');
}
} elseif (Util::hasPermission(Permission::ICINGADB_SERVICES_RO)) {
$title = mt('director', 'Configuration');
}
Expand Down
13 changes: 6 additions & 7 deletions library/Director/ProvidedHook/Monitoring/HostActions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,12 @@ protected function getThem(Host $host)
}

$allowEdit = false;
if (Util::hasPermission(Permission::HOSTS) && IcingaHost::exists($hostname, $db)) {
$allowEdit = true;
}
if (Util::hasPermission(Permission::MONITORING_HOSTS)) {
if ((new Monitoring(Auth::getInstance()))->canModifyHost($hostname)) {
$allowEdit = IcingaHost::exists($hostname, $db);
}
if (
Util::hasPermission(Permission::HOSTS)
&& Util::hasPermission(Permission::MONITORING_HOSTS)
&& (new Monitoring(Auth::getInstance()))->canModifyHost($hostname)
) {
$allowEdit = IcingaHost::exists($hostname, $db);
}

if ($allowEdit) {
Expand Down
10 changes: 5 additions & 5 deletions library/Director/ProvidedHook/Monitoring/ServiceActions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ protected function getThem(Service $service)
}

$title = null;
if (Util::hasPermission(Permission::HOSTS)) {
if (
Util::hasPermission(Permission::SERVICES)
&& Util::hasPermission(Permission::MONITORING_SERVICES)
&& (new Monitoring(Auth::getInstance()))->canModifyService($hostname, $serviceName)
) {
$title = mt('director', 'Modify');
} elseif (Util::hasPermission(Permission::MONITORING_SERVICES)) {
if ((new Monitoring(Auth::getInstance()))->canModifyService($hostname, $serviceName)) {
$title = mt('director', 'Modify');
}
} elseif (Util::hasPermission(Permission::MONITORING_SERVICES_RO)) {
$title = mt('director', 'Configuration');
}
Expand Down
3 changes: 2 additions & 1 deletion library/Director/Web/Tabs/ObjectTabs.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ protected function addTabsForExistingObject()
'label' => $this->translate(ucfirst($type))
]);
}
if ($object->getShortTableName() === 'host') {

if ($object->getShortTableName() === 'host' && $auth->hasPermission(Permission::SERVICES)) {
$this->add('services', [
'url' => 'director/host/services',
'urlParams' => $params,
Expand Down
Loading