tyler.durden
/
icingaweb2-module-director
mirror of https://github.com/Icinga/icingaweb2-module-director.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

IcingaServiceSetTable: do not trust a Servicve Set 

...name, as the Template might have been renamed in the meantime - and the
name on the Set "object" has no meaning at all

fixes #1664
This commit is contained in:
Thomas Gelf 2018-10-04 18:30:27 +02:00
parent ea18006819
commit 33053103e1
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
library/Director/Web/Table/IcingaServiceSetServiceTable.php
View File

@ -165,14 +165,24 @@ class IcingaServiceSetServiceTable extends ZfQueryBasedTable
'name' => $this->host->getObjectName()
])
);
$hostId = $this->host->get('id');
$setName = $this->set->getObjectName();
$db = $this->set->getConnection();
$deleteLink->runOnSuccess(function () use ($db, $hostId, $setName) {
IcingaServiceSet::load([
'host_id' => $hostId,
'object_name' => $setName
], $db)->delete();
$deleteLink->runOnSuccess(function () {
$conn = $this->set->getConnection();
$db = $conn->getDbAdapter();
$query = $db->select()->from(
['ss' => 'icinga_service_set'],
'ss.id'
)->join(
['ssih' => 'icinga_service_set_inheritance'],
'ssih.service_set_id = ss.id',
[]
)->where(
'ssih.parent_service_set_id = ?',
$this->set->get('id')
)->where('ss.host_id = ?', $this->host->get('id'));
IcingaServiceSet::loadWithAutoIncId(
$db->fetchOne($query),
$conn
)->delete();
});
$deleteLink->handleRequest();
}