Introduce CommandForm#filterGrantedOn()

Icinga · Jul 25, 2023 · a4a4f9e · a4a4f9e
1 parent c73c171
commit a4a4f9e
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 34 deletions.
diff --git a/application/forms/Command/CommandForm.php b/application/forms/Command/CommandForm.php
@@ -5,9 +5,11 @@
 namespace Icinga\Module\Icingadb\Forms\Command;
 
 use Exception;
+use Generator;
 use Icinga\Application\Logger;
 use Icinga\Module\Icingadb\Command\IcingaCommand;
 use Icinga\Module\Icingadb\Command\Transport\CommandTransport;
+use Icinga\Module\Icingadb\Common\Auth;
 use Icinga\Web\Notification;
 use Icinga\Web\Session;
 use ipl\Html\Form;
@@ -17,6 +19,7 @@
 
 abstract class CommandForm extends Form
 {
+    use Auth;
     use CsrfCounterMeasure;
 
     protected $defaultAttributes = ['class' => 'icinga-form icinga-controls'];
@@ -124,4 +127,21 @@ protected function sendCommand(IcingaCommand $command)
     {
         (new CommandTransport())->send($command);
     }
+
+    /**
+     * Yield the $objects the currently logged in user has the permission $permission for
+     *
+     * @param string      $permission
+     * @param Traversable $objects
+     *
+     * @return Generator
+     */
+    protected function filterGrantedOn(string $permission, Traversable $objects): Generator
+    {
+        foreach ($objects as $object) {
+            if ($this->isGrantedOn($permission, $object)) {
+                yield $object;
+            }
+        }
+    }
 }
diff --git a/application/forms/Command/Instance/ToggleInstanceFeaturesForm.php b/application/forms/Command/Instance/ToggleInstanceFeaturesForm.php
@@ -5,16 +5,13 @@
 namespace Icinga\Module\Icingadb\Forms\Command\Instance;
 
 use Icinga\Module\Icingadb\Command\Instance\ToggleInstanceFeatureCommand;
-use Icinga\Module\Icingadb\Common\Auth;
 use Icinga\Module\Icingadb\Forms\Command\CommandForm;
 use Icinga\Web\Notification;
 use ipl\Web\FormDecorator\IcingaFormDecorator;
 use Traversable;
 
 class ToggleInstanceFeaturesForm extends CommandForm
 {
-    use Auth;
-
     protected $features;
 
     protected $featureStatus;

diff --git a/application/forms/Command/Object/AcknowledgeProblemForm.php b/application/forms/Command/Object/AcknowledgeProblemForm.php
@@ -8,7 +8,6 @@
 use DateTime;
 use Icinga\Application\Config;
 use Icinga\Module\Icingadb\Command\Object\AcknowledgeProblemCommand;
-use Icinga\Module\Icingadb\Common\Auth;
 use Icinga\Module\Icingadb\Forms\Command\CommandForm;
 use Icinga\Module\Icingadb\Model\Host;
 use Icinga\Web\Notification;
@@ -22,8 +21,6 @@
 
 class AcknowledgeProblemForm extends CommandForm
 {
-    use Auth;
-
     public function __construct()
     {
         $this->on(self::ON_SUCCESS, function () {

diff --git a/application/forms/Command/Object/AddCommentForm.php b/application/forms/Command/Object/AddCommentForm.php
@@ -8,7 +8,6 @@
 use DateTime;
 use Icinga\Application\Config;
 use Icinga\Module\Icingadb\Command\Object\AddCommentCommand;
-use Icinga\Module\Icingadb\Common\Auth;
 use Icinga\Module\Icingadb\Forms\Command\CommandForm;
 use Icinga\Module\Icingadb\Model\Host;
 use Icinga\Web\Notification;
@@ -22,8 +21,6 @@
 
 class AddCommentForm extends CommandForm
 {
-    use Auth;
-
     public function __construct()
     {
         $this->on(self::ON_SUCCESS, function () {

diff --git a/application/forms/Command/Object/CheckNowForm.php b/application/forms/Command/Object/CheckNowForm.php
@@ -5,16 +5,13 @@
 namespace Icinga\Module\Icingadb\Forms\Command\Object;
 
 use Icinga\Module\Icingadb\Command\Object\ScheduleCheckCommand;
-use Icinga\Module\Icingadb\Common\Auth;
 use Icinga\Module\Icingadb\Forms\Command\CommandForm;
 use Icinga\Web\Notification;
 use ipl\Web\Widget\Icon;
 use Traversable;
 
 class CheckNowForm extends CommandForm
 {
-    use Auth;
-
     protected $defaultAttributes = ['class' => 'inline'];
 
     public function __construct()

diff --git a/application/forms/Command/Object/DeleteCommentForm.php b/application/forms/Command/Object/DeleteCommentForm.php
@@ -5,7 +5,6 @@
 namespace Icinga\Module\Icingadb\Forms\Command\Object;
 
 use Icinga\Module\Icingadb\Command\Object\DeleteCommentCommand;
-use Icinga\Module\Icingadb\Common\Auth;
 use Icinga\Module\Icingadb\Forms\Command\CommandForm;
 use Icinga\Web\Notification;
 use ipl\Web\Common\RedirectOption;
@@ -14,7 +13,6 @@
 
 class DeleteCommentForm extends CommandForm
 {
-    use Auth;
     use RedirectOption;
 
     protected $defaultAttributes = ['class' => 'inline'];

diff --git a/application/forms/Command/Object/DeleteDowntimeForm.php b/application/forms/Command/Object/DeleteDowntimeForm.php
@@ -5,7 +5,6 @@
 namespace Icinga\Module\Icingadb\Forms\Command\Object;
 
 use Icinga\Module\Icingadb\Command\Object\DeleteDowntimeCommand;
-use Icinga\Module\Icingadb\Common\Auth;
 use Icinga\Module\Icingadb\Forms\Command\CommandForm;
 use Icinga\Web\Notification;
 use ipl\Web\Common\RedirectOption;
@@ -14,7 +13,6 @@
 
 class DeleteDowntimeForm extends CommandForm
 {
-    use Auth;
     use RedirectOption;
 
     protected $defaultAttributes = ['class' => 'inline'];

diff --git a/application/forms/Command/Object/ProcessCheckResultForm.php b/application/forms/Command/Object/ProcessCheckResultForm.php
@@ -5,7 +5,6 @@
 namespace Icinga\Module\Icingadb\Forms\Command\Object;
 
 use Icinga\Module\Icingadb\Command\Object\ProcessCheckResultCommand;
-use Icinga\Module\Icingadb\Common\Auth;
 use Icinga\Module\Icingadb\Forms\Command\CommandForm;
 use Icinga\Module\Icingadb\Model\Host;
 use Icinga\Web\Notification;
@@ -19,8 +18,6 @@
 
 class ProcessCheckResultForm extends CommandForm
 {
-    use Auth;
-
     public function __construct()
     {
         $this->on(self::ON_SUCCESS, function () {

diff --git a/application/forms/Command/Object/RemoveAcknowledgementForm.php b/application/forms/Command/Object/RemoveAcknowledgementForm.php
@@ -5,7 +5,6 @@
 namespace Icinga\Module\Icingadb\Forms\Command\Object;
 
 use Icinga\Module\Icingadb\Command\Object\RemoveAcknowledgementCommand;
-use Icinga\Module\Icingadb\Common\Auth;
 use Icinga\Module\Icingadb\Forms\Command\CommandForm;
 use Icinga\Module\Icingadb\Model\Host;
 use Icinga\Web\Notification;
@@ -14,8 +13,6 @@
 
 class RemoveAcknowledgementForm extends CommandForm
 {
-    use Auth;
-
     public function __construct()
     {
         $this->on(self::ON_SUCCESS, function () {

diff --git a/application/forms/Command/Object/ScheduleCheckForm.php b/application/forms/Command/Object/ScheduleCheckForm.php
@@ -7,7 +7,6 @@
 use DateInterval;
 use DateTime;
 use Icinga\Module\Icingadb\Command\Object\ScheduleCheckCommand;
-use Icinga\Module\Icingadb\Common\Auth;
 use Icinga\Module\Icingadb\Forms\Command\CommandForm;
 use Icinga\Module\Icingadb\Model\Host;
 use Icinga\Web\Notification;
@@ -20,8 +19,6 @@
 
 class ScheduleCheckForm extends CommandForm
 {
-    use Auth;
-
     public function __construct()
     {
         $this->on(self::ON_SUCCESS, function () {

diff --git a/application/forms/Command/Object/ScheduleServiceDowntimeForm.php b/application/forms/Command/Object/ScheduleServiceDowntimeForm.php
@@ -8,7 +8,6 @@
 use DateTime;
 use Icinga\Application\Config;
 use Icinga\Module\Icingadb\Command\Object\ScheduleServiceDowntimeCommand;
-use Icinga\Module\Icingadb\Common\Auth;
 use Icinga\Module\Icingadb\Forms\Command\CommandForm;
 use Icinga\Web\Notification;
 use ipl\Html\Attributes;
@@ -21,8 +20,6 @@
 
 class ScheduleServiceDowntimeForm extends CommandForm
 {
-    use Auth;
-
     /** @var DateTime downtime start */
     protected $start;
 

diff --git a/application/forms/Command/Object/SendCustomNotificationForm.php b/application/forms/Command/Object/SendCustomNotificationForm.php
@@ -6,7 +6,6 @@
 
 use Icinga\Application\Config;
 use Icinga\Module\Icingadb\Command\Object\SendCustomNotificationCommand;
-use Icinga\Module\Icingadb\Common\Auth;
 use Icinga\Module\Icingadb\Forms\Command\CommandForm;
 use Icinga\Module\Icingadb\Model\Host;
 use Icinga\Web\Notification;
@@ -19,8 +18,6 @@
 
 class SendCustomNotificationForm extends CommandForm
 {
-    use Auth;
-
     public function __construct()
     {
         $this->on(self::ON_SUCCESS, function () {

diff --git a/application/forms/Command/Object/ToggleObjectFeaturesForm.php b/application/forms/Command/Object/ToggleObjectFeaturesForm.php
@@ -5,7 +5,6 @@
 namespace Icinga\Module\Icingadb\Forms\Command\Object;
 
 use Icinga\Module\Icingadb\Command\Object\ToggleObjectFeatureCommand;
-use Icinga\Module\Icingadb\Common\Auth;
 use Icinga\Module\Icingadb\Forms\Command\CommandForm;
 use Icinga\Web\Notification;
 use ipl\Html\FormElement\CheckboxElement;
@@ -15,8 +14,6 @@
 
 class ToggleObjectFeaturesForm extends CommandForm
 {
-    use Auth;
-
     const LEAVE_UNCHANGED = 'noop';
 
     protected $features;