From 8b9cfef5488868424faa3531aebc40fd3cbbf2f0 Mon Sep 17 00:00:00 2001 From: nook24 Date: Fri, 30 Jun 2023 16:38:54 +0200 Subject: [PATCH 1/4] ITC-3049 Add locking by semaphore of the containers table the avoid broken nested set when concurrent requests modify the tree https://github.com/cakephp/cakephp/issues/17174 https://github.com/it-novum/openITCOCKPIT/issues/1525 --- composer.json | 1 + src/Controller/ContactgroupsController.php | 17 +++++++- src/Controller/ContainersController.php | 11 ++++- src/Controller/HostgroupsController.php | 15 +++++++ src/Controller/LocationsController.php | 13 ++++++ src/Controller/ServicegroupsController.php | 15 +++++++ .../ServicetemplategroupsController.php | 20 +++++++-- src/Controller/TenantsController.php | 13 +++++- src/Model/Table/ContainersTable.php | 43 +++++++++++++++++++ 9 files changed, 141 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index bb4416ea17..946bd20b98 100644 --- a/composer.json +++ b/composer.json @@ -37,6 +37,7 @@ "ext-sockets": "*", "ext-xmlrpc": "*", "ext-zip": "*", + "ext-sysvsem": "*", "azuyalabs/yasumi": "^2.2", "cakephp/authentication": "^2.0", "cakephp/authorization": "^2.0", diff --git a/src/Controller/ContactgroupsController.php b/src/Controller/ContactgroupsController.php index 2787795dd1..48c7b9f655 100644 --- a/src/Controller/ContactgroupsController.php +++ b/src/Controller/ContactgroupsController.php @@ -124,6 +124,11 @@ public function add() { $contactgroup->set('uuid', UUID::v4()); $contactgroup->get('container')->set('containertype_id', CT_CONTACTGROUP); + /** @var ContainersTable $ContainersTable */ + $ContainersTable = TableRegistry::getTableLocator()->get('Containers'); + + $ContainersTable->acquireLock(); + $ContactgroupsTable->save($contactgroup); if ($contactgroup->hasErrors()) { $this->response = $this->response->withStatus(400); @@ -197,6 +202,11 @@ public function edit($id = null) { //Update contact data $User = new User($this->getUser()); + /** @var ContainersTable $ContainersTable */ + $ContainersTable = TableRegistry::getTableLocator()->get('Containers'); + + $ContainersTable->acquireLock(); + $contactgroupEntity = $ContactgroupsTable->get($id, [ 'contain' => [ 'Containers' @@ -254,10 +264,15 @@ public function delete($id) { /** @var $ContactgroupsTable ContactgroupsTable */ $ContactgroupsTable = TableRegistry::getTableLocator()->get('Contactgroups'); + /** @var ContainersTable $ContainersTable */ + $ContainersTable = TableRegistry::getTableLocator()->get('Containers'); + if (!$ContactgroupsTable->existsById($id)) { throw new NotFoundException(__('Contact group not found')); } + $ContainersTable->acquireLock(); + $contactgroupEntity = $ContactgroupsTable->get($id, [ 'contain' => [ 'Containers' @@ -288,8 +303,6 @@ public function delete($id) { return; } - /** @var $ContainersTable ContainersTable */ - $ContainersTable = TableRegistry::getTableLocator()->get('Containers'); $container = $ContainersTable->get($contactgroupEntity->get('container')->get('id'), [ 'contain' => [ 'Contactgroups' diff --git a/src/Controller/ContainersController.php b/src/Controller/ContainersController.php index 70afefcdb0..1afc979fe1 100644 --- a/src/Controller/ContainersController.php +++ b/src/Controller/ContainersController.php @@ -107,6 +107,8 @@ public function add() { return; } + $ContainersTable->acquireLock(); + $ContainersTable->save($container); if ($container->hasErrors()) { $this->response = $this->response->withStatus(400); @@ -154,6 +156,9 @@ public function edit() { if (!$ContainersTable->existsById($containerId)) { throw new NotFoundException(__('Invalid container')); } + + $ContainersTable->acquireLock(); + $container = $ContainersTable->get($containerId); $containerForChangelog = $container->toArray(); @@ -416,6 +421,9 @@ public function delete($id = null) { /** @var $ContainersTable ContainersTable */ $ContainersTable = TableRegistry::getTableLocator()->get('Containers'); + + $ContainersTable->acquireLock(); + $container = $ContainersTable->find() ->where([ 'Containers.id' => $id, @@ -424,7 +432,8 @@ public function delete($id = null) { ->first(); if (empty($container)) { - return $this->render403(); + $this->render403(); + return; } $containerForChangelog = $container->toArray(); diff --git a/src/Controller/HostgroupsController.php b/src/Controller/HostgroupsController.php index 6969934c12..7386ed2180 100644 --- a/src/Controller/HostgroupsController.php +++ b/src/Controller/HostgroupsController.php @@ -154,6 +154,11 @@ public function add() { $hostgroup->set('uuid', UUID::v4()); $hostgroup->get('container')->set('containertype_id', CT_HOSTGROUP); + /** @var ContainersTable $ContainersTable */ + $ContainersTable = TableRegistry::getTableLocator()->get('Containers'); + + $ContainersTable->acquireLock(); + $HostgroupsTable->save($hostgroup); if ($hostgroup->hasErrors()) { $this->response = $this->response->withStatus(400); @@ -231,6 +236,12 @@ public function edit($id = null) { if ($this->request->is('post') && $this->isAngularJsRequest()) { //Update contact data $User = new User($this->getUser()); + + /** @var ContainersTable $ContainersTable */ + $ContainersTable = TableRegistry::getTableLocator()->get('Containers'); + + $ContainersTable->acquireLock(); + $hostgroupEntity = $HostgroupsTable->get($id, [ 'contain' => [ 'Containers' @@ -297,6 +308,8 @@ public function delete($id = null) { throw new NotFoundException(__('Invalid Hostgroup')); } + $ContainersTable->acquireLock(); + $hostgroup = $HostgroupsTable->getHostgroupById($id); $container = $ContainersTable->get($hostgroup->get('container')->get('id'), [ 'contain' => [ @@ -729,6 +742,8 @@ public function append() { throw new NotFoundException(__('Invalid Hostgroup')); } + $ContainersTable->acquireLock(); + $hostgroup = $HostgroupsTable->getHostgroupForEdit($id); $hostgroupForChangelog = $hostgroup; if (!$this->allowedByContainerId($hostgroup['Hostgroup']['container']['parent_id'])) { diff --git a/src/Controller/LocationsController.php b/src/Controller/LocationsController.php index 1c408f5cc5..5aaf7276f9 100644 --- a/src/Controller/LocationsController.php +++ b/src/Controller/LocationsController.php @@ -122,6 +122,11 @@ public function add() { $location->set('uuid', UUID::v4()); $location->container->containertype_id = CT_LOCATION; + /** @var ContainersTable $ContainersTable */ + $ContainersTable = TableRegistry::getTableLocator()->get('Containers'); + + $ContainersTable->acquireLock(); + $LocationsTable->save($location); if ($location->hasErrors()) { $this->response = $this->response->withStatus(400); @@ -194,6 +199,12 @@ public function edit($id = null) { } if ($this->request->is('post') && $this->isAngularJsRequest()) { + + /** @var ContainersTable $ContainersTable */ + $ContainersTable = TableRegistry::getTableLocator()->get('Containers'); + + $ContainersTable->acquireLock(); + $oldLocation = $LocationsTable->get($id, [ 'contain' => ['Containers'] ]); @@ -269,6 +280,8 @@ public function delete($containerId = null) { throw new NotFoundException(__('Invalid container')); } + $ContainersTable->acquireLock(); + $container = $ContainersTable->get($containerId); try { diff --git a/src/Controller/ServicegroupsController.php b/src/Controller/ServicegroupsController.php index 439354b5bd..e901879850 100644 --- a/src/Controller/ServicegroupsController.php +++ b/src/Controller/ServicegroupsController.php @@ -157,6 +157,11 @@ public function add() { $servicegroup->set('uuid', UUID::v4()); $servicegroup->get('container')->set('containertype_id', CT_SERVICEGROUP); + /** @var ContainersTable $ContainersTable */ + $ContainersTable = TableRegistry::getTableLocator()->get('Containers'); + + $ContainersTable->acquireLock(); + $ServicegroupsTable->save($servicegroup); if ($servicegroup->hasErrors()) { $this->response = $this->response->withStatus(400); @@ -234,6 +239,12 @@ public function edit($id = null) { if ($this->request->is('post') && $this->isAngularJsRequest()) { $User = new User($this->getUser()); + + /** @var ContainersTable $ContainersTable */ + $ContainersTable = TableRegistry::getTableLocator()->get('Containers'); + + $ContainersTable->acquireLock(); + $servicegroupEntity = $ServicegroupsTable->get($id, [ 'contain' => [ 'Containers' @@ -301,6 +312,8 @@ public function delete($id = null) { throw new NotFoundException(__('Invalid Servicegroup')); } + $ContainersTable->acquireLock(); + $servicegroup = $ServicegroupsTable->getServicegroupById($id); $container = $ContainersTable->get($servicegroup->get('container')->get('id'), [ 'contain' => [ @@ -391,6 +404,8 @@ public function append() { throw new NotFoundException(__('Invalid Servicegroup')); } + $ContainersTable->acquireLock(); + $servicegroup = $ServicegroupsTable->getServicegroupForEdit($id); $servicegroupForChangelog = $servicegroup; if (!$this->allowedByContainerId($servicegroup['Servicegroup']['container']['parent_id'])) { diff --git a/src/Controller/ServicetemplategroupsController.php b/src/Controller/ServicetemplategroupsController.php index 194c0af2ba..ac8ec707d3 100644 --- a/src/Controller/ServicetemplategroupsController.php +++ b/src/Controller/ServicetemplategroupsController.php @@ -145,6 +145,11 @@ public function add() { $servicetemplategroup->set('uuid', UUID::v4()); $servicetemplategroup->get('container')->set('containertype_id', CT_SERVICETEMPLATEGROUP); + /** @var ContainersTable $ContainersTable */ + $ContainersTable = TableRegistry::getTableLocator()->get('Containers'); + + $ContainersTable->acquireLock(); + $ServicetemplategroupsTable->save($servicetemplategroup); if ($servicetemplategroup->hasErrors()) { $this->response = $this->response->withStatus(400); @@ -225,6 +230,11 @@ public function edit($id = null) { //Update service template group data $User = new User($this->getUser()); + /** @var ContainersTable $ContainersTable */ + $ContainersTable = TableRegistry::getTableLocator()->get('Containers'); + + $ContainersTable->acquireLock(); + $servicetemplategroupEntity = $ServicetemplategroupsTable->get($id, [ 'contain' => [ 'Containers' @@ -304,6 +314,8 @@ public function append() { throw new NotFoundException(__('Invalid service template group')); } + $ContainersTable->acquireLock(); + $servicetemplategroup = $ServicetemplategroupsTable->getServicetemplategroupForEdit($id); $servicetemplategroupForChangelog = $servicetemplategroup; if (!$this->allowedByContainerId($servicetemplategroup['Servicetemplategroup']['container']['parent_id'])) { @@ -425,6 +437,11 @@ public function delete($id = null) { throw new NotFoundException(__('Service template group not found')); } + /** @var $ContainersTable ContainersTable */ + $ContainersTable = TableRegistry::getTableLocator()->get('Containers'); + + $ContainersTable->acquireLock(); + $servicetemplategroupEntity = $ServicetemplategroupsTable->get($id, [ 'contain' => [ 'Containers' @@ -436,9 +453,6 @@ public function delete($id = null) { return; } - - /** @var $ContainersTable ContainersTable */ - $ContainersTable = TableRegistry::getTableLocator()->get('Containers'); $container = $ContainersTable->get($servicetemplategroupEntity->get('container')->get('id'), [ 'contain' => [ 'Servicetemplategroups' diff --git a/src/Controller/TenantsController.php b/src/Controller/TenantsController.php index 41cc17833f..0d07a717c4 100644 --- a/src/Controller/TenantsController.php +++ b/src/Controller/TenantsController.php @@ -120,6 +120,10 @@ public function add() { $tenant->container->parent_id = ROOT_CONTAINER; $tenant->container->containertype_id = CT_TENANT; + /** @var ContainersTable $ContainersTable */ + $ContainersTable = TableRegistry::getTableLocator()->get('Containers'); + + $ContainersTable->acquireLock(); $TenantsTable->save($tenant); if ($tenant->hasErrors()) { @@ -193,6 +197,12 @@ public function edit($id = null) { } if ($this->request->is('post') && $this->isAngularJsRequest()) { + + /** @var ContainersTable $ContainersTable */ + $ContainersTable = TableRegistry::getTableLocator()->get('Containers'); + + $ContainersTable->acquireLock(); + $oldTenant = $TenantsTable->get($id, [ 'contain' => ['Containers'] ]); @@ -271,10 +281,11 @@ public function delete($containerId = null) { throw new NotFoundException(__('Invalid container')); } + $ContainersTable->acquireLock(); try { $tenant = $TenantsTable->getTenantByContainerId($containerId); - }catch (RecordNotFoundException $e){ + } catch (RecordNotFoundException $e) { throw new NotFoundException(__('Invalid tenant')); } $tenantForChangelog = $tenant; diff --git a/src/Model/Table/ContainersTable.php b/src/Model/Table/ContainersTable.php index 137faae812..7517d98bc7 100644 --- a/src/Model/Table/ContainersTable.php +++ b/src/Model/Table/ContainersTable.php @@ -6,9 +6,12 @@ use Cake\Cache\Cache; use Cake\Core\Plugin; use Cake\Database\Expression\QueryExpression; +use Cake\Datasource\EntityInterface; use Cake\Datasource\Exception\RecordNotFoundException; +use Cake\Event\EventInterface; use Cake\Http\Exception\ForbiddenException; use Cake\Http\Exception\NotFoundException; +use Cake\Log\Log; use Cake\ORM\RulesChecker; use Cake\ORM\Table; use Cake\ORM\TableRegistry; @@ -74,6 +77,20 @@ class ContainersTable extends Table { */ private $containerCache = null; + /** + * @var int|null + */ + private $semaphoreKey = null; + + /** + * @var \SysvSemaphore + * Provided by ext-sysvsem. + * Default on Ubuntu and Debian. + * For RHEL you have to install php-process + * + */ + private $semaphore; + /** * Initialize method * @@ -1229,4 +1246,30 @@ function ($v) { sort($visibleContainerIds); return $visibleContainerIds; } + + /** + * Will create a Semaphore with a limit of 1 to avoid multiple operations running concurrently on the containers table + * This method blocks (if necessary) until the semaphore can be acquired + * + * https://github.com/cakephp/cakephp/issues/14983#issuecomment-1613491168 + * @param bool $auto_release + * @return bool + */ + public function acquireLock(bool $auto_release = true) { + if ($this->semaphoreKey === null) { + $this->semaphoreKey = ftok(__FILE__, 'c'); + $this->semaphore = sem_get($this->semaphoreKey, 1, 0666, $auto_release); + } + + return sem_acquire($this->semaphore); + } + + /** + * @return bool + */ + public function releaseLock() { + if (!is_null($this->semaphore)) { + return sem_release($this->semaphore); + } + } } From 7a9c32711a5326a359cac0dee1c8043450fbab36 Mon Sep 17 00:00:00 2001 From: nook24 Date: Fri, 30 Jun 2023 17:23:04 +0200 Subject: [PATCH 2/4] ITC-3049 Fix style issue of progress bar in mass actions --- src/Template/Angular/acknowledge_host.php | 4 ++-- src/Template/Angular/acknowledge_service.php | 8 ++++---- src/Template/Angular/disable_host_flap_detection.php | 4 ++-- src/Template/Angular/disable_host_notifications.php | 6 +++--- .../Angular/disable_service_flap_detection.php | 6 +++--- src/Template/Angular/disable_service_notifications.php | 6 +++--- src/Template/Angular/downtime_host.php | 8 ++++---- src/Template/Angular/downtime_service.php | 8 ++++---- src/Template/Angular/enable_host_flap_detection.php | 6 +++--- src/Template/Angular/enable_host_notifications.php | 6 +++--- src/Template/Angular/enable_service_flap_detection.php | 6 +++--- src/Template/Angular/enable_service_notifications.php | 6 +++--- src/Template/Angular/executing.php | 6 +++--- src/Template/Angular/mass_activate.php | 8 ++++---- src/Template/Angular/mass_deactivate.php | 8 ++++---- src/Template/Angular/mass_delete.php | 8 ++++---- src/Template/Angular/mass_delete_acknowledgements.php | 8 ++++---- src/Template/Angular/mass_delete_host_downtimes.php | 8 ++++---- src/Template/Angular/mass_delete_service_downtimes.php | 8 ++++---- src/Template/Angular/reload_required.php | 10 +++++----- src/Template/Angular/reschedule_host.php | 6 +++--- src/Template/Angular/send_host_notification.php | 8 ++++---- src/Template/Angular/send_service_notification.php | 8 ++++---- src/Template/Angular/submit_host_result.php | 8 ++++---- src/Template/Angular/submit_service_result.php | 8 ++++---- 25 files changed, 88 insertions(+), 88 deletions(-) diff --git a/src/Template/Angular/acknowledge_host.php b/src/Template/Angular/acknowledge_host.php index 93f3522286..c275666bce 100644 --- a/src/Template/Angular/acknowledge_host.php +++ b/src/Template/Angular/acknowledge_host.php @@ -89,8 +89,8 @@ class="custom-control-input"

-
-
+
+
diff --git a/src/Template/Angular/acknowledge_service.php b/src/Template/Angular/acknowledge_service.php index 02dc387ec5..2c7ac9e3f6 100644 --- a/src/Template/Angular/acknowledge_service.php +++ b/src/Template/Angular/acknowledge_service.php @@ -66,12 +66,12 @@ class="custom-control-input" -
+

-
-
-
+
+
+
diff --git a/src/Template/Angular/disable_host_flap_detection.php b/src/Template/Angular/disable_host_flap_detection.php index 5a0067e90f..06651c1521 100644 --- a/src/Template/Angular/disable_host_flap_detection.php +++ b/src/Template/Angular/disable_host_flap_detection.php @@ -30,8 +30,8 @@
-
-
+
+
diff --git a/src/Template/Angular/disable_host_notifications.php b/src/Template/Angular/disable_host_notifications.php index ac79ec6ff5..3afc046d11 100644 --- a/src/Template/Angular/disable_host_notifications.php +++ b/src/Template/Angular/disable_host_notifications.php @@ -46,9 +46,9 @@ class="form-control"
-
-
-
+
+
+
diff --git a/src/Template/Angular/disable_service_flap_detection.php b/src/Template/Angular/disable_service_flap_detection.php index 1db65a86f7..c0942acffc 100644 --- a/src/Template/Angular/disable_service_flap_detection.php +++ b/src/Template/Angular/disable_service_flap_detection.php @@ -26,9 +26,9 @@
-
-
-
+
+
+
diff --git a/src/Template/Angular/disable_service_notifications.php b/src/Template/Angular/disable_service_notifications.php index 9299eb9cd8..7a8c29419d 100644 --- a/src/Template/Angular/disable_service_notifications.php +++ b/src/Template/Angular/disable_service_notifications.php @@ -29,9 +29,9 @@
-
-
-
+
+
+
diff --git a/src/Template/Angular/downtime_host.php b/src/Template/Angular/downtime_host.php index 5147bf197d..1bf5e1df41 100644 --- a/src/Template/Angular/downtime_host.php +++ b/src/Template/Angular/downtime_host.php @@ -112,12 +112,12 @@ class="col-md-offset-2 col-xs-12 col-md-10">
-
+

-
-
-
+
+
+
diff --git a/src/Template/Angular/downtime_service.php b/src/Template/Angular/downtime_service.php index 6574b3e82c..1f586aa4dd 100644 --- a/src/Template/Angular/downtime_service.php +++ b/src/Template/Angular/downtime_service.php @@ -86,12 +86,12 @@ class="col-md-offset-2 col-xs-12 col-md-10">
-
+

-
-
-
+
+
+
diff --git a/src/Template/Angular/enable_host_flap_detection.php b/src/Template/Angular/enable_host_flap_detection.php index aba7da8dde..7abfd98c4b 100644 --- a/src/Template/Angular/enable_host_flap_detection.php +++ b/src/Template/Angular/enable_host_flap_detection.php @@ -29,9 +29,9 @@
-
-
-
+
+
+
diff --git a/src/Template/Angular/enable_host_notifications.php b/src/Template/Angular/enable_host_notifications.php index 74831a1682..accd90fada 100644 --- a/src/Template/Angular/enable_host_notifications.php +++ b/src/Template/Angular/enable_host_notifications.php @@ -46,9 +46,9 @@ class="form-control"
-
-
-
+
+
+
diff --git a/src/Template/Angular/enable_service_flap_detection.php b/src/Template/Angular/enable_service_flap_detection.php index 41d83e2217..33c25b964e 100644 --- a/src/Template/Angular/enable_service_flap_detection.php +++ b/src/Template/Angular/enable_service_flap_detection.php @@ -26,9 +26,9 @@
-
-
-
+
+
+
diff --git a/src/Template/Angular/enable_service_notifications.php b/src/Template/Angular/enable_service_notifications.php index 141dc92bee..c2dcd2fb8d 100644 --- a/src/Template/Angular/enable_service_notifications.php +++ b/src/Template/Angular/enable_service_notifications.php @@ -29,9 +29,9 @@
-
-
-
+
+
+
diff --git a/src/Template/Angular/executing.php b/src/Template/Angular/executing.php index 3e002ea65b..3132d3d2fd 100644 --- a/src/Template/Angular/executing.php +++ b/src/Template/Angular/executing.php @@ -12,9 +12,9 @@
-
-
-
+
+
+
diff --git a/src/Template/Angular/mass_activate.php b/src/Template/Angular/mass_activate.php index 0d02f7d19d..e347fad2a8 100644 --- a/src/Template/Angular/mass_activate.php +++ b/src/Template/Angular/mass_activate.php @@ -30,12 +30,12 @@
-
+

-
-
-
+
+
+
diff --git a/src/Template/Angular/mass_deactivate.php b/src/Template/Angular/mass_deactivate.php index e29d0475d8..35c841dbfa 100644 --- a/src/Template/Angular/mass_deactivate.php +++ b/src/Template/Angular/mass_deactivate.php @@ -30,12 +30,12 @@
-
+

-
-
-
+
+
+
diff --git a/src/Template/Angular/mass_delete.php b/src/Template/Angular/mass_delete.php index eade13a5be..34c0dcaac2 100644 --- a/src/Template/Angular/mass_delete.php +++ b/src/Template/Angular/mass_delete.php @@ -45,12 +45,12 @@
-
+

-
-
-
+
+
+
diff --git a/src/Template/Angular/mass_delete_acknowledgements.php b/src/Template/Angular/mass_delete_acknowledgements.php index eb5ca0ead6..eb70126163 100644 --- a/src/Template/Angular/mass_delete_acknowledgements.php +++ b/src/Template/Angular/mass_delete_acknowledgements.php @@ -25,12 +25,12 @@
-
+

-
-
-
+
+
+
diff --git a/src/Template/Angular/mass_delete_host_downtimes.php b/src/Template/Angular/mass_delete_host_downtimes.php index 7122d78b47..2c05e2ccb4 100644 --- a/src/Template/Angular/mass_delete_host_downtimes.php +++ b/src/Template/Angular/mass_delete_host_downtimes.php @@ -29,12 +29,12 @@ class="custom-control-input"
-
+

-
-
-
+
+
+
diff --git a/src/Template/Angular/mass_delete_service_downtimes.php b/src/Template/Angular/mass_delete_service_downtimes.php index cb33160ac4..4196e7d208 100644 --- a/src/Template/Angular/mass_delete_service_downtimes.php +++ b/src/Template/Angular/mass_delete_service_downtimes.php @@ -15,12 +15,12 @@
-
+

-
-
-
+
+
+
diff --git a/src/Template/Angular/reload_required.php b/src/Template/Angular/reload_required.php index 20a5cb0cb0..7f9ab21a28 100644 --- a/src/Template/Angular/reload_required.php +++ b/src/Template/Angular/reload_required.php @@ -12,18 +12,18 @@
-
+
-
+
-
-
-
+
+
+
diff --git a/src/Template/Angular/reschedule_host.php b/src/Template/Angular/reschedule_host.php index ea991ce800..eb187d1e0b 100644 --- a/src/Template/Angular/reschedule_host.php +++ b/src/Template/Angular/reschedule_host.php @@ -27,9 +27,9 @@ class="form-control"
-
-
-
+
+
+
diff --git a/src/Template/Angular/send_host_notification.php b/src/Template/Angular/send_host_notification.php index 89dc51c709..e26508248a 100644 --- a/src/Template/Angular/send_host_notification.php +++ b/src/Template/Angular/send_host_notification.php @@ -52,12 +52,12 @@ class="custom-control-input"
-
+

-
-
-
+
+
+
diff --git a/src/Template/Angular/send_service_notification.php b/src/Template/Angular/send_service_notification.php index 762f29decb..c072db036a 100644 --- a/src/Template/Angular/send_service_notification.php +++ b/src/Template/Angular/send_service_notification.php @@ -53,12 +53,12 @@ class="custom-control-input"
-
+

-
-
-
+
+
+
diff --git a/src/Template/Angular/submit_host_result.php b/src/Template/Angular/submit_host_result.php index f9cf96f0a7..1b6f2fdee3 100644 --- a/src/Template/Angular/submit_host_result.php +++ b/src/Template/Angular/submit_host_result.php @@ -49,12 +49,12 @@ class="custom-control-input"
-
+

-
-
-
+
+
+
diff --git a/src/Template/Angular/submit_service_result.php b/src/Template/Angular/submit_service_result.php index b5eb14e224..915003f711 100644 --- a/src/Template/Angular/submit_service_result.php +++ b/src/Template/Angular/submit_service_result.php @@ -50,12 +50,12 @@ class="custom-control-input" for="hardStateForce">
-
+

-
-
-
+
+
+
From 023f0900abda8c1740c46536507dfd21fe86acba Mon Sep 17 00:00:00 2001 From: nook24 Date: Mon, 3 Jul 2023 12:28:18 +0200 Subject: [PATCH 3/4] ITC-3049 Add command to check and recover from orphaned containers --- .../Table/GrafanaUserdashboardsTable.php | 12 + .../MapModule/src/Model/Table/MapsTable.php | 32 +++ src/Command/ContainerRecoverCommand.php | 210 ++++++++++++++++ src/Model/Table/ContactgroupsTable.php | 12 + src/Model/Table/ContactsTable.php | 31 +++ src/Model/Table/ContainersTable.php | 228 ++++++++++++++++++ src/Model/Table/HostgroupsTable.php | 12 + src/Model/Table/InstantreportsTable.php | 12 + src/Model/Table/LocationsTable.php | 13 + src/Model/Table/ServicegroupsTable.php | 12 + .../Table/ServicetemplategroupsTable.php | 12 + src/Model/Table/UsercontainerrolesTable.php | 51 +++- src/Model/Table/UsersTable.php | 31 +++ .../Command/ContainerRecoverCommandTest.php | 50 ++++ 14 files changed, 708 insertions(+), 10 deletions(-) create mode 100644 src/Command/ContainerRecoverCommand.php create mode 100644 tests/TestCase/Command/ContainerRecoverCommandTest.php diff --git a/plugins/GrafanaModule/src/Model/Table/GrafanaUserdashboardsTable.php b/plugins/GrafanaModule/src/Model/Table/GrafanaUserdashboardsTable.php index 1ca40c9712..c27136b888 100644 --- a/plugins/GrafanaModule/src/Model/Table/GrafanaUserdashboardsTable.php +++ b/plugins/GrafanaModule/src/Model/Table/GrafanaUserdashboardsTable.php @@ -365,4 +365,16 @@ public function getGrafanaUserdashboardsWithPanelsAndMetricsById($id) { return $query->first(); } + + /** + * @param int $containerId + * @return array + */ + public function getOrphanedGrafanaUserdashboardsByContainerId(int $containerId){ + $query = $this->find() + ->where(['container_id' => $containerId]); + $result = $query->all(); + + return $result->toArray(); + } } diff --git a/plugins/MapModule/src/Model/Table/MapsTable.php b/plugins/MapModule/src/Model/Table/MapsTable.php index e6a30b2ac3..b7e21a028c 100644 --- a/plugins/MapModule/src/Model/Table/MapsTable.php +++ b/plugins/MapModule/src/Model/Table/MapsTable.php @@ -52,6 +52,7 @@ use Cake\Utility\Hash; use Cake\Validation\Validator; use itnovum\openITCOCKPIT\Core\DbBackend; +use itnovum\openITCOCKPIT\Core\FileDebugger; use itnovum\openITCOCKPIT\Core\Hoststatus; use itnovum\openITCOCKPIT\Core\HoststatusFields; use itnovum\openITCOCKPIT\Core\KeyValueStore; @@ -2274,4 +2275,35 @@ public function getMapeditorSettings($config) { } return json_decode($config, true); } + + /** + * @param int $containerId + * @return array + */ + public function getOrphanedMapsByContainerId(int $containerId) { + $query = $this->find() + ->innerJoinWith('Containers') + ->contain([ + 'Containers' => function (Query $query) use ($containerId) { + return $query->select([ + 'Containers.id', + ])->whereNotInList('Containers.id', [$containerId]); + } + ]) + ->where(['Containers.id' => $containerId]); + + $result = $query->all(); + $maps = $result->toArray(); + + // Check each map, if it as more than one container. + // If the map has more than 1 container, we can keep this map because is not orphaned + $orphanedMaps = []; + foreach ($maps as $map) { + if (empty($map->containers)) { + $orphanedMaps[] = $map; + } + } + + return $orphanedMaps; + } } diff --git a/src/Command/ContainerRecoverCommand.php b/src/Command/ContainerRecoverCommand.php new file mode 100644 index 0000000000..c6fbfd3b6f --- /dev/null +++ b/src/Command/ContainerRecoverCommand.php @@ -0,0 +1,210 @@ + +// +// This file is dual licensed +// +// 1. +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// + +// 2. +// If you purchased an openITCOCKPIT Enterprise Edition you can use this file +// under the terms of the openITCOCKPIT Enterprise Edition license agreement. +// License agreement and license key will be shipped with the order +// confirmation. + +declare(strict_types=1); + +namespace App\Command; + +use App\itnovum\openITCOCKPIT\Database\Backup; +use App\Model\Table\ContainersTable; +use Cake\Command\Command; +use Cake\Console\Arguments; +use Cake\Console\ConsoleIo; +use Cake\Console\ConsoleOptionParser; +use Cake\Core\Configure; +use Cake\ORM\TableRegistry; + +/** + * ContainerRecover command. + * + * Usage: + * oitc container_recover --check + * oitc container_recover --recover + */ +class ContainerRecoverCommand extends Command { + /** + * Hook method for defining this command's option parser. + * + * @see https://book.cakephp.org/4/en/console-commands/commands.html#defining-arguments-and-options + * @param \Cake\Console\ConsoleOptionParser $parser The parser to be defined + * @return \Cake\Console\ConsoleOptionParser The built parser. + */ + public function buildOptionParser(ConsoleOptionParser $parser): ConsoleOptionParser { + $parser = parent::buildOptionParser($parser); + + $parser->addOptions([ + 'check' => ['help' => 'Will check if any any errors are within the container tree', 'boolean' => true, 'default' => false], + 'recover' => ['help' => 'Will recover the container tree using the parent_id field', 'boolean' => true, 'default' => false], + ]); + + return $parser; + } + + /** + * Implement this method with your command's logic. + * + * @param \Cake\Console\Arguments $args The command arguments. + * @param \Cake\Console\ConsoleIo $io The console io + * @return null|void|int The exit code or null for success + */ + public function execute(Arguments $args, ConsoleIo $io) { + + /** @var ContainersTable $ContainersTable */ + $ContainersTable = TableRegistry::getTableLocator()->get('Containers'); + + // Run --check option + if ($args->getOption('check') === true) { + + $orphanedContainers = $ContainersTable->getOrphanedContainers(); + if (empty($orphanedContainers)) { + $io->success('No orphaned containers found.'); + $io->success('Nothing to do.'); + + // Exit command + return 0; + } + + + $io->error('Orphaned containers found! Checking if an automatically repair is possible...'); + $io->info('This is a read-only operation. No data is being changed.'); + $autoRepairPossible = true; + foreach ($orphanedContainers as $orphanedContainer) { + // This container has a parent_id that does not exist. + // Before it is safe to delete this container, we need to make sure that it is not in used by any object + // Such as hosts, host groups, service templates, service template groups etc... + $io->info(sprintf( + 'Found orphaned Container "%s" (ID: %s, Type: %s)', + $orphanedContainer['name'], + $orphanedContainer['id'], + $orphanedContainer['containertype_id'] + )); + + if ($ContainersTable->isOrphanedContainerInUse($orphanedContainer['id'])) { + $autoRepairPossible = false; + $io->error(sprintf( + 'The container "%s" (ID: %s, Type: %s) is in use by other objects. Please see the file /opt/openitc/frontend/logs/cli-error.log for more information', + $orphanedContainer['name'], + $orphanedContainer['id'], + $orphanedContainer['containertype_id'] + )); + } + } + + if ($autoRepairPossible === false) { + $io->hr(); + $io->out('Containers tree has operphand children.'); + $io->out('An automatically recovery is not possible due to the containers are used by other elements.'); + $io->out('Please contact commercial support or join our community Discord https://discord.gg/G8KhxKuQ9G'); + $io->hr(); + } else { + $io->hr(); + $io->success('Automatically repair is possible!'); + $io->out('Run "oitc container_recover --recover" to remove orphaned containers.'); + $io->out('A backup of your database will be created BEFORE any modifications are done.'); + $io->hr(); + } + + // Exit command with bad exit code due to errors + return 1; + } + + // Run --recover option + if ($args->getOption('recover') === true) { + // Create backup first + $io->info('Start backup of MySQL database...'); + Configure::load('nagios'); + $MysqlBackup = new Backup(); + $filename = Configure::read('nagios.export.backupTarget') . '/' . 'container_recover_' . date('d.m.y_H_i_s') . '.sql'; + $return = $MysqlBackup->createMysqlDump($filename); + if ($return['returncode'] === 0) { + $io->success('MySQL Backup created at: ' . $filename); + + $autoRepairPossible = true; + $orphanedContainers = $ContainersTable->getOrphanedContainers(); + + if(empty($orphanedContainers)){ + $io->success('No orphaned containers found.'); + $io->success('Nothing to do.'); + return 0; + } + + foreach ($orphanedContainers as $orphanedContainer) + if ($ContainersTable->isOrphanedContainerInUse($orphanedContainer['id'])) { + $autoRepairPossible = false; + } + + if ($autoRepairPossible === false) { + $io->error('Container is in use! Run the command "oitc container_recover --check"'); + $io->error('ABORTING - No data has ben changed.'); + return 1; + } + + // We have orphaned containers - by all are safe to delete + $io->info(sprintf('Found %s orphaned containers, but all are safe to delete', sizeof($orphanedContainers))); + $ContainersTable->removeBehavior('Tree'); + + $noErrors = true; + foreach ($orphanedContainers as $orphanedContainer) { + $entity = $ContainersTable->get($orphanedContainer['id']); + if ($ContainersTable->delete($entity)) { + $io->success(sprintf( + 'Orphaned Container "%s" (ID: %s, Type: %s) deleted successfully', + $orphanedContainer['name'], + $orphanedContainer['id'], + $orphanedContainer['containertype_id'] + )); + } else { + $noErrors = false; + $io->error(sprintf('Could not delete orphaned container "%s" (ID: %s, Type: %s)!!', + $orphanedContainer['name'], + $orphanedContainer['id'], + $orphanedContainer['containertype_id'] + )); + } + } + + if ($noErrors === true) { + $ContainersTable->addBehavior('Tree'); + $ContainersTable->recover(); + $io->hr(); + $io->success('Recovery successful'); + return 0; + } + + $io->hr(); + $io->error('Errors occurred - tree not recovered!'); + return 1; + } + + $io->error('Error while creating MySQL dump. EXIT NOW!'); + return 1; + } + + // Print help if no option is passed + // Valid options are --check or --recover + $this->displayHelp($this->getOptionParser(), $args, $io); + return 0; + } +} diff --git a/src/Model/Table/ContactgroupsTable.php b/src/Model/Table/ContactgroupsTable.php index f2bd5a2ded..4b8c6b87cd 100644 --- a/src/Model/Table/ContactgroupsTable.php +++ b/src/Model/Table/ContactgroupsTable.php @@ -667,4 +667,16 @@ public function getContactgroupsByContainerIdExact($containerId, $type = 'all', return $list; } + + /** + * @param int $containerId + * @return array + */ + public function getOrphanedContactgroupsByContainerId(int $containerId){ + $query = $this->find() + ->where(['container_id' => $containerId]); + $result = $query->all(); + + return $result->toArray(); + } } diff --git a/src/Model/Table/ContactsTable.php b/src/Model/Table/ContactsTable.php index 8fe70bd297..522d9655b6 100644 --- a/src/Model/Table/ContactsTable.php +++ b/src/Model/Table/ContactsTable.php @@ -1190,4 +1190,35 @@ public function getRequiredContainerIdsFoContact($contactId, array $containerIds return $requiredIds; } + /** + * @param int $containerId + * @return array + */ + public function getOrphanedContactsByContainerId(int $containerId) { + $query = $this->find() + ->innerJoinWith('Containers') + ->contain([ + 'Containers' => function (Query $query) use ($containerId) { + return $query->select([ + 'Containers.id', + ])->whereNotInList('Containers.id', [$containerId]); + } + ]) + ->where(['Containers.id' => $containerId]); + + $result = $query->all(); + $contacts = $result->toArray(); + + // Check each contact, if it as more than one container. + // If the contact has more than 1 container, we can keep this contact because is not orphaned + $orphanedContacts = []; + foreach ($contacts as $contact) { + if (empty($contact->containers)) { + $orphanedContacts[] = $contact; + } + } + + return $orphanedContacts; + } + } diff --git a/src/Model/Table/ContainersTable.php b/src/Model/Table/ContainersTable.php index 7517d98bc7..61188aecaa 100644 --- a/src/Model/Table/ContainersTable.php +++ b/src/Model/Table/ContainersTable.php @@ -17,6 +17,8 @@ use Cake\ORM\TableRegistry; use Cake\Utility\Hash; use Cake\Validation\Validator; +use CustomalertModule\Model\Table\CustomalertRulesTable; +use CustomalertModule\Model\Table\CustomalertsTable; use GrafanaModule\Model\Table\GrafanaUserdashboardsTable; use itnovum\openITCOCKPIT\Core\ContainerNestedSet; use MapModule\Model\Table\MapsTable; @@ -1272,4 +1274,230 @@ public function releaseLock() { return sem_release($this->semaphore); } } + + /** + * + * This method will check if the parent_id of all containers exists in the containers table + * and will return all containers that are orphaned (Where the parent_id does not exist in the containers table anymore) + * + * @return array + */ + public function getOrphanedContainers() { + $query = $this->find(); + $query->select([ + 'Containers.id', + 'Containers.name', + 'Containers.containertype_id', + 'orphaned' => $query->newExpr(' + SELECT containers_sub.id + FROM containers AS containers_sub + WHERE containers_sub.id = Containers.parent_id') + ]) + ->where([ + 'Containers.id > ' => ROOT_CONTAINER + ]) + ->having( + 'orphaned IS NULL' + ) + ->disableAutoFields() + ->disableHydration(); + + $result = $query->all(); + + return $result->toArray(); + } + + /** + * Checks if an orphaned container is used by any objects + * + * @param int $containerId + * @return bool false=Container not in use, true=Container is in use (bad!) + */ + public function isOrphanedContainerInUse(int $containerId) { + $inUse = false; + + /** @var TenantsTable $TenantsTable */ + $TenantsTable = TableRegistry::getTableLocator()->get('Tenants'); + if (!empty($TenantsTable->tenantsByContainerId($containerId))) { + Log::error(sprintf('container_id %s is used by tenants', $containerId)); + $inUse = true; + } + + /** @var LocationsTable $LocationsTable */ + $LocationsTable = TableRegistry::getTableLocator()->get('Locations'); + if (!empty($LocationsTable->getOrphanedLocationsByContainerId($containerId))) { + Log::error(sprintf('container_id %s is used by locations', $containerId)); + $inUse = true; + } + + // Containers / Nodes + if (!empty($this->getAllContainerByParentId($containerId))) { + Log::error(sprintf('container_id %s is used by nodes', $containerId)); + $inUse = true; + } + + /** @var $ContactgroupsTable ContactgroupsTable */ + $ContactgroupsTable = TableRegistry::getTableLocator()->get('Contactgroups'); + if (!empty($ContactgroupsTable->getOrphanedContactgroupsByContainerId($containerId))) { + Log::error(sprintf('container_id %s is used by contact group', $containerId)); + $inUse = true; + } + + /** @var HostgroupsTable $HostgroupsTable */ + $HostgroupsTable = TableRegistry::getTableLocator()->get('Hostgroups'); + if (!empty($HostgroupsTable->getOrphanedHostgroupsByContainerId($containerId))) { + Log::error(sprintf('container_id %s is used by host group', $containerId)); + $inUse = true; + } + + /** @var ServicegroupsTable $ServicegroupsTable */ + $ServicegroupsTable = TableRegistry::getTableLocator()->get('Servicegroups'); + if (!empty($ServicegroupsTable->getOrphanedServicegroupsByContainerId($containerId))) { + Log::error(sprintf('container_id %s is used by service group', $containerId)); + $inUse = true; + } + + /** @var ServicetemplategroupsTable $ServicetemplategroupsTable */ + $ServicetemplategroupsTable = TableRegistry::getTableLocator()->get('Servicetemplategroups'); + if (!empty($ServicetemplategroupsTable->getOrphanedServicetemplategroupsByContainerId($containerId))) { + Log::error(sprintf('container_id %s is used by service template group', $containerId)); + $inUse = true; + } + + /** @var $InstantreportsTable InstantreportsTable */ + $InstantreportsTable = TableRegistry::getTableLocator()->get('Instantreports'); + if (!empty($InstantreportsTable->getOrphanedInstantreportsByContainerId($containerId))) { + Log::error(sprintf('container_id %s is used by instant report', $containerId)); + $inUse = true; + } + + if (Plugin::isLoaded('DistributeModule')) { + /** @var \DistributeModule\Model\Table\SatellitesTable $SatellitesTable */ + $SatellitesTable = TableRegistry::getTableLocator()->get('DistributeModule.Satellites'); + + if (!empty($SatellitesTable->getOrphanedSatellitesByContainerId($containerId))) { + Log::error(sprintf('container_id %s is used by satellite', $containerId)); + $inUse = true; + } + } + + if (Plugin::isLoaded('AutoreportModule')) { + /** @var $AutoreportsTable AutoreportsTable */ + $AutoreportsTable = TableRegistry::getTableLocator()->get('AutoreportModule.Autoreports'); + + if (!empty($AutoreportsTable->getOrphanedAutoreportsByContainerId($containerId))) { + Log::error(sprintf('container_id %s is used by auto report', $containerId)); + $inUse = true; + } + } + + if (Plugin::isLoaded('GrafanaModule')) { + /** @var $GrafanaUserdashboardsTable GrafanaUserdashboardsTable */ + $GrafanaUserdashboardsTable = TableRegistry::getTableLocator()->get('GrafanaModule.GrafanaUserdashboards'); + + if (!empty($GrafanaUserdashboardsTable->getOrphanedGrafanaUserdashboardsByContainerId($containerId))) { + Log::error(sprintf('container_id %s is used by grafana user dashboard', $containerId)); + $inUse = true; + } + } + + if (Plugin::isLoaded('MapModule')) { + /** @var $MapsTable MapsTable */ + $MapsTable = TableRegistry::getTableLocator()->get('MapModule.Maps'); + + if (!empty($MapsTable->getOrphanedMapsByContainerId($containerId))) { + Log::error(sprintf('container_id %s is used by map', $containerId)); + $inUse = true; + } + } + + if (Plugin::isLoaded('CustomalertModule')) { + /** @var CustomalertRulesTable $CustomalertRulesTable */ + $CustomalertRulesTable = TableRegistry::getTableLocator()->get('CustomalertModule.CustomalertRules'); + if (!empty($CustomalertRulesTable->getOrphanedCustomAlertRulesByContainerId($containerId))) { + Log::error(sprintf('container_id %s is used by custom alert rule', $containerId)); + $inUse = true; + } + } + + /** @var HostsTable $HostsTable */ + $HostsTable = TableRegistry::getTableLocator()->get('Hosts'); + if (!empty($HostsTable->getHostsByContainerIdExact($containerId))) { + Log::error(sprintf('container_id %s is used by host', $containerId)); + $inUse = true; + } + + /** @var HosttemplatesTable $HosttemplatesTable */ + $HosttemplatesTable = TableRegistry::getTableLocator()->get('Hosttemplates'); + if (!empty($HosttemplatesTable->getHosttemplatesByContainerIdExact($containerId))) { + Log::error(sprintf('container_id %s is used by host template', $containerId)); + $inUse = true; + } + + /** @var ServicetemplatesTable $ServicetemplatesTable */ + $ServicetemplatesTable = TableRegistry::getTableLocator()->get('Servicetemplates'); + if (!empty($ServicetemplatesTable->getServicetemplatesByContainerIdExact($containerId))) { + Log::error(sprintf('container_id %s is used by service template', $containerId)); + $inUse = true; + } + + /** @var TimeperiodsTable $TimeperiodsTable */ + $TimeperiodsTable = TableRegistry::getTableLocator()->get('Timeperiods'); + if (!empty($TimeperiodsTable->getTimeperiodsByContainerIdExact($containerId))) { + Log::error(sprintf('container_id %s is used by time period', $containerId)); + $inUse = true; + } + + /** @var HostdependenciesTable $HostdependenciesTable */ + $HostdependenciesTable = TableRegistry::getTableLocator()->get('Hostdependencies'); + if (!empty($HostdependenciesTable->getHostdependenciesByContainerIdExact($containerId))) { + Log::error(sprintf('container_id %s is used by host dependency', $containerId)); + $inUse = true; + } + + /** @var $HostescalationsTable HostescalationsTable */ + $HostescalationsTable = TableRegistry::getTableLocator()->get('Hostescalations'); + if (!empty($HostescalationsTable->getHostescalationsByContainerIdExact($containerId))) { + Log::error(sprintf('container_id %s is used by host escalation', $containerId)); + $inUse = true; + } + + /** @var ServicedependenciesTable $ServicedependenciesTable */ + $ServicedependenciesTable = TableRegistry::getTableLocator()->get('Servicedependencies'); + if (!empty($ServicedependenciesTable->getServicedependenciesByContainerIdExact($containerId))) { + Log::error(sprintf('container_id %s is used by service dependency', $containerId)); + $inUse = true; + } + + /** @var $ServiceescalationsTable ServiceescalationsTable */ + $ServiceescalationsTable = TableRegistry::getTableLocator()->get('Serviceescalations'); + if (!empty($ServiceescalationsTable->getServiceescalationsByContainerIdExact($containerId))) { + Log::error(sprintf('container_id %s is used by service escalation', $containerId)); + $inUse = true; + } + + /** @var ContactsTable $ContactsTable */ + $ContactsTable = TableRegistry::getTableLocator()->get('Contacts'); + if (!empty($ContactsTable->getOrphanedContactsByContainerId($containerId))) { + Log::error(sprintf('container_id %s is used by contact', $containerId)); + $inUse = true; + } + + /** @var UsersTable $UsersTable */ + $UsersTable = TableRegistry::getTableLocator()->get('Users'); + if (!empty($UsersTable->getOrphanedUsersByContainerId($containerId))) { + Log::error(sprintf('container_id %s is used by user', $containerId)); + $inUse = true; + } + + /** @var UsercontainerrolesTable $UsercontainerrolesTable */ + $UsercontainerrolesTable = TableRegistry::getTableLocator()->get('Usercontainerroles'); + if (!empty($UsercontainerrolesTable->getOrphanedUsercontainerrolesByContainerId($containerId))) { + Log::error(sprintf('container_id %s is used by user container role', $containerId)); + $inUse = true; + } + + + return $inUse; + } } diff --git a/src/Model/Table/HostgroupsTable.php b/src/Model/Table/HostgroupsTable.php index 7129e81a9c..5f76032805 100644 --- a/src/Model/Table/HostgroupsTable.php +++ b/src/Model/Table/HostgroupsTable.php @@ -1295,4 +1295,16 @@ public function getHostgroupsByContainerIdAndHostIds($containerIds, $hostIds, $t return $return; } } + + /** + * @param int $containerId + * @return array + */ + public function getOrphanedHostgroupsByContainerId(int $containerId){ + $query = $this->find() + ->where(['container_id' => $containerId]); + $result = $query->all(); + + return $result->toArray(); + } } diff --git a/src/Model/Table/InstantreportsTable.php b/src/Model/Table/InstantreportsTable.php index 0cc9b5be12..b57a13b109 100644 --- a/src/Model/Table/InstantreportsTable.php +++ b/src/Model/Table/InstantreportsTable.php @@ -940,4 +940,16 @@ public function getInstantreportsByContainerIdExact($containerId, $type = 'all', return $list; } + /** + * @param int $containerId + * @return array + */ + public function getOrphanedInstantreportsByContainerId(int $containerId) { + $query = $this->find() + ->where(['container_id' => $containerId]); + $result = $query->all(); + + return $result->toArray(); + } + } diff --git a/src/Model/Table/LocationsTable.php b/src/Model/Table/LocationsTable.php index 498698dab3..e53e5f5a54 100644 --- a/src/Model/Table/LocationsTable.php +++ b/src/Model/Table/LocationsTable.php @@ -230,4 +230,17 @@ public function getLocationIdByContainerId($containerId, $MY_RIGHTS = []) { } return $result->get('id'); } + + /** + * @param int $containerId + * @return array + */ + public function getOrphanedLocationsByContainerId(int $containerId) { + $query = $this->find() + ->where(['container_id' => $containerId]); + $result = $query->all(); + + return $result->toArray(); + } + } diff --git a/src/Model/Table/ServicegroupsTable.php b/src/Model/Table/ServicegroupsTable.php index c8cf7bb47d..ab873351f9 100644 --- a/src/Model/Table/ServicegroupsTable.php +++ b/src/Model/Table/ServicegroupsTable.php @@ -1197,4 +1197,16 @@ public function getServicegroupsByContainerIdAndServiceIds($containerIds, $servi return $return; } } + + /** + * @param int $containerId + * @return array + */ + public function getOrphanedServicegroupsByContainerId(int $containerId){ + $query = $this->find() + ->where(['container_id' => $containerId]); + $result = $query->all(); + + return $result->toArray(); + } } diff --git a/src/Model/Table/ServicetemplategroupsTable.php b/src/Model/Table/ServicetemplategroupsTable.php index 854fb36654..fed768e8ff 100644 --- a/src/Model/Table/ServicetemplategroupsTable.php +++ b/src/Model/Table/ServicetemplategroupsTable.php @@ -724,4 +724,16 @@ public function getServicetemplategroupsByContainerId(array $containerIds) { return $servicetemplategroups; } + + /** + * @param int $containerId + * @return array + */ + public function getOrphanedServicetemplategroupsByContainerId(int $containerId){ + $query = $this->find() + ->where(['container_id' => $containerId]); + $result = $query->all(); + + return $result->toArray(); + } } diff --git a/src/Model/Table/UsercontainerrolesTable.php b/src/Model/Table/UsercontainerrolesTable.php index a4260d5d6d..90cfbf7c92 100644 --- a/src/Model/Table/UsercontainerrolesTable.php +++ b/src/Model/Table/UsercontainerrolesTable.php @@ -262,16 +262,16 @@ public function getUsercontainerRolesIndex(UsercontainerrolesFilter $Usercontain 'Containers' ] ]) - ->select([ - 'Users.id', - 'Users.firstname', - 'Users.lastname', - 'full_name' => $q->func()->concat([ - 'Users.firstname' => 'literal', - ' ', - 'Users.lastname' => 'literal' - ]) - ])->order('full_name'); + ->select([ + 'Users.id', + 'Users.firstname', + 'Users.lastname', + 'full_name' => $q->func()->concat([ + 'Users.firstname' => 'literal', + ' ', + 'Users.lastname' => 'literal' + ]) + ])->order('full_name'); return $q; } ]) @@ -407,4 +407,35 @@ public function getContainerPermissionsByLdapUserMemberOf($memberOfGroups = []) return $result; } + + /** + * @param int $containerId + * @return array + */ + public function getOrphanedUsercontainerrolesByContainerId(int $containerId) { + $query = $this->find() + ->innerJoinWith('Containers') + ->contain([ + 'Containers' => function (\Cake\ORM\Query $query) use ($containerId) { + return $query->select([ + 'Containers.id', + ])->whereNotInList('Containers.id', [$containerId]); + } + ]) + ->where(['Containers.id' => $containerId]); + + $result = $query->all(); + $usercontainerroles = $result->toArray(); + + // Check each user container role, if it as more than one container. + // If user container role has more than 1 container, we can keep this each user container role because is not orphaned + $orphanedUsercontainerroles = []; + foreach ($usercontainerroles as $usercontainerrole) { + if (empty($usercontainerrole->containers)) { + $orphanedUsercontainerroles[] = $usercontainerrole; + } + } + + return $orphanedUsercontainerroles; + } } diff --git a/src/Model/Table/UsersTable.php b/src/Model/Table/UsersTable.php index 07b4097d46..655c40e860 100644 --- a/src/Model/Table/UsersTable.php +++ b/src/Model/Table/UsersTable.php @@ -1323,4 +1323,35 @@ public function getLdapUsersForSync(bool $enableHydration = true) { return $query->toArray(); } + + /** + * @param int $containerId + * @return array + */ + public function getOrphanedUsersByContainerId(int $containerId) { + $query = $this->find() + ->innerJoinWith('Containers') + ->contain([ + 'Containers' => function (\Cake\ORM\Query $query) use ($containerId) { + return $query->select([ + 'Containers.id', + ])->whereNotInList('Containers.id', [$containerId]); + } + ]) + ->where(['Containers.id' => $containerId]); + + $result = $query->all(); + $users = $result->toArray(); + + // Check each user, if it as more than one container. + // If the user has more than 1 container, we can keep this user because is not orphaned + $orphanedUsers = []; + foreach ($users as $user) { + if (empty($user->containers)) { + $orphanedUsers[] = $user; + } + } + + return $orphanedUsers; + } } diff --git a/tests/TestCase/Command/ContainerRecoverCommandTest.php b/tests/TestCase/Command/ContainerRecoverCommandTest.php new file mode 100644 index 0000000000..25f983d388 --- /dev/null +++ b/tests/TestCase/Command/ContainerRecoverCommandTest.php @@ -0,0 +1,50 @@ +useCommandRunner(); + } + /** + * Test buildOptionParser method + * + * @return void + * @uses \App\Command\ContainerRecoverCommand::buildOptionParser() + */ + public function testBuildOptionParser(): void + { + $this->markTestIncomplete('Not implemented yet.'); + } + + /** + * Test execute method + * + * @return void + * @uses \App\Command\ContainerRecoverCommand::execute() + */ + public function testExecute(): void + { + $this->markTestIncomplete('Not implemented yet.'); + } +} From be3096f19839c239c31c1041864b70e7154fb18a Mon Sep 17 00:00:00 2001 From: nook24 Date: Mon, 3 Jul 2023 14:05:04 +0200 Subject: [PATCH 4/4] ITC-3049 Remove file debugger --- plugins/MapModule/src/Model/Table/MapsTable.php | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/MapModule/src/Model/Table/MapsTable.php b/plugins/MapModule/src/Model/Table/MapsTable.php index b7e21a028c..755f452b9c 100644 --- a/plugins/MapModule/src/Model/Table/MapsTable.php +++ b/plugins/MapModule/src/Model/Table/MapsTable.php @@ -52,7 +52,6 @@ use Cake\Utility\Hash; use Cake\Validation\Validator; use itnovum\openITCOCKPIT\Core\DbBackend; -use itnovum\openITCOCKPIT\Core\FileDebugger; use itnovum\openITCOCKPIT\Core\Hoststatus; use itnovum\openITCOCKPIT\Core\HoststatusFields; use itnovum\openITCOCKPIT\Core\KeyValueStore;