Restrict /graph/*

refs #11

application/controllers/GraphController.php

@@ -6,11 +6,11 @@ use Icinga\Exception\Http\HttpBadRequestException;
 use Icinga\Exception\Http\HttpNotFoundException;
 use Icinga\Module\Graphite\GraphiteQuery;
 use Icinga\Module\Graphite\GraphTemplate;
+use Icinga\Module\Graphite\Web\Controller\MonitoringAwareController;
 use Icinga\Module\Graphite\Web\Widget\GraphsTrait;
-use Icinga\Web\Controller;
 use Icinga\Web\UrlParams;
 
-class GraphController extends Controller
+class GraphController extends MonitoringAwareController
 {
     use GraphsTrait;
 
@@ -42,8 +42,30 @@ class GraphController extends Controller
      */
     protected $geometryParams = [];
 
+    public function init()
+    {
+        parent::init();
+
+        $this->filterParams = clone $this->getRequest()->getUrl()->getParams();
+
+        foreach ($this->geometryParamsNames as $paramName) {
+            $this->geometryParams[$paramName] = $this->filterParams->shift($paramName);
+        }
+    }
+
     public function hostAction()
     {
+        $host = $this->applyMonitoringRestriction(
+            $this->backend->select()->from('hoststatus', ['host_name'])
+        )
+            ->where('host_name', $this->filterParams->getRequired('hostname'))
+            ->limit(1) // just to be sure to save a few CPU cycles
+            ->fetchRow();
+
+        if ($host === false) {
+            throw new HttpNotFoundException('%s', $this->translate('No such host'));
+        }
+
         $this->service = false;
 
         $this->supplyImage();
@@ -51,6 +73,18 @@ class GraphController extends Controller
 
     public function serviceAction()
     {
+        $service = $this->applyMonitoringRestriction(
+            $this->backend->select()->from('servicestatus', ['host_name', 'service_description'])
+        )
+            ->where('host_name', $this->filterParams->getRequired('hostname'))
+            ->where('service_description', $this->filterParams->getRequired('service'))
+            ->limit(1) // just to be sure to save a few CPU cycles
+            ->fetchRow();
+
+        if ($service === false) {
+            throw new HttpNotFoundException('%s', $this->translate('No such service'));
+        }
+
         $this->supplyImage();
     }
 
@@ -59,12 +93,6 @@ class GraphController extends Controller
      */
     protected function supplyImage()
     {
-        $this->filterParams = clone $this->getRequest()->getUrl()->getParams();
-
-        foreach ($this->geometryParamsNames as $paramName) {
-            $this->geometryParams[$paramName] = $this->filterParams->shift($paramName);
-        }
-
         $this->collectTemplates();
         $this->collectGraphiteQueries();
 

application/controllers/ListController.php

@@ -3,14 +3,14 @@
 namespace Icinga\Module\Graphite\Controllers;
 
 use Icinga\Module\Graphite\Forms\TimeRangePicker\TimeRangePickerTrait as TimeRangePicker;
+use Icinga\Module\Graphite\Web\Controller\MonitoringAwareController;
 use Icinga\Module\Graphite\Web\Controller\TimeRangePickerTrait;
-use Icinga\Module\Monitoring\Controller;
 use Icinga\Module\Monitoring\DataView\DataView;
 use Icinga\Web\Url;
 use Icinga\Web\Widget\Tabextension\DashboardAction;
 use Icinga\Web\Widget\Tabextension\MenuAction;
 
-class ListController extends Controller
+class ListController extends MonitoringAwareController
 {
     use TimeRangePickerTrait;
 
@@ -28,8 +28,10 @@ class ListController extends Controller
             mt('monitoring', 'List hosts')
         );
 
-        $this->view->hosts = $hosts = $this->backend->select()->from('hoststatus', ['host_name', 'host_display_name']);
-        $this->applyRestriction('monitoring/filter/objects', $hosts);
+        $this->view->hosts = $hosts = $this->applyMonitoringRestriction(
+            $this->backend->select()->from('hoststatus', ['host_name', 'host_display_name'])
+        );
+
         $this->filterQuery($hosts);
         $this->setupPaginationControl($hosts);
         $this->setupLimitControl();
@@ -47,13 +49,15 @@ class ListController extends Controller
             mt('monitoring', 'List services')
         );
 
-        $this->view->services = $services = $this->backend->select()->from('servicestatus', [
-            'host_name',
-            'host_display_name',
-            'service_description',
-            'service_display_name'
-        ]);
-        $this->applyRestriction('monitoring/filter/objects', $services);
+        $this->view->services = $services = $this->applyMonitoringRestriction(
+            $this->backend->select()->from('servicestatus', [
+                'host_name',
+                'host_display_name',
+                'service_description',
+                'service_display_name'
+            ])
+        );
+
         $this->filterQuery($services);
         $this->setupPaginationControl($services);
         $this->setupLimitControl();

library/Graphite/Web/Controller/MonitoringAwareController.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Icinga\Module\Graphite\Web\Controller;
+
+use Icinga\Module\Monitoring\Controller;
+use Icinga\Module\Monitoring\DataView\DataView;
+
+abstract class MonitoringAwareController extends Controller
+{
+    /**
+     * Restrict the given monitored object query for the currently authenticated user
+     *
+     * @param   DataView    $dataView
+     *
+     * @return  DataView                The given data view
+     */
+    protected function applyMonitoringRestriction(DataView $dataView)
+    {
+        $this->applyRestriction('monitoring/filter/objects', $dataView);
+
+        return $dataView;
+    }
+}