tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-31 01:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Controller: Validate restriction columns

Browse Source
This commit is contained in:
Johannes Meyer 2015-06-18 16:42:27 +02:00
parent 1cabe95506
commit fb9641fb3c
2 changed files with 72 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
library/Icinga/Data/Filter/FilterChain.php
View File

@ -4,6 +4,7 @@
namespace Icinga\Data\Filter; namespace Icinga\Data\Filter;
use Icinga\Exception\ProgrammingError; use Icinga\Exception\ProgrammingError;
use Icinga\Exception\QueryException;
/** /**
* FilterChain * FilterChain
@ -18,6 +19,8 @@ abstract class FilterChain extends Filter
protected $operatorSymbol; protected $operatorSymbol;
protected $allowedColumns;
public function hasId($id) public function hasId($id)
{ {
foreach ($this->filters() as $filter) { foreach ($this->filters() as $filter) {
@ -116,6 +119,12 @@ abstract class FilterChain extends Filter
return $this->operatorSymbol; return $this->operatorSymbol;
} }
public function setAllowedFilterColumns(array $columns)
{
$this->allowedColumns = $columns;
return $this;
}
public function listFilteredColumns() public function listFilteredColumns()
{ {
$columns = array(); $columns = array();
@ -196,11 +205,41 @@ abstract class FilterChain extends Filter
public function addFilter(Filter $filter) public function addFilter(Filter $filter)
{ {
if (! empty($this->allowedColumns)) {
$this->validateFilterColumns($filter);
}
$this->filters[] = $filter; $this->filters[] = $filter;
$filter->setId($this->getId() . '-' . $this->count()); $filter->setId($this->getId() . '-' . $this->count());
return $this; return $this;
} }
protected function validateFilterColumns(Filter $filter)
{
if ($filter->isExpression()) {
$valid = false;
foreach ($this->allowedColumns as $column) {
if (is_callable($column)) {
if (call_user_func($column, $filter->getColumn())) {
$valid = true;
break;
}
} elseif ($filter->getColumn() === $column) {
$valid = true;
break;
}
}
if (! $valid) {
throw new QueryException('Invalid filter column provided: %s', $filter->getColumn());
}
} else {
foreach ($filter->filters() as $subFilter) {
$this->validateFilterColumns($subFilter);
}
}
}
public function &filters() public function &filters()
{ {
return $this->filters; return $this->filters;

37
modules/monitoring/library/Monitoring/Controller.php
View File

@ -3,6 +3,8 @@
namespace Icinga\Module\Monitoring; namespace Icinga\Module\Monitoring;
use Icinga\Exception\ConfigurationError;
use Icinga\Exception\QueryException;
use Icinga\Data\Filter\Filter; use Icinga\Data\Filter\Filter;
use Icinga\Data\Filterable; use Icinga\Data\Filterable;
use Icinga\File\Csv; use Icinga\File\Csv;
@ -52,16 +54,45 @@ class Controller extends IcingaWebController
* Apply a restriction on the given data view * Apply a restriction on the given data view
* *
* @param string $restriction The name of restriction * @param string $restriction The name of restriction
* @param Filterable $filterable The filterable to restrict * @param Filterable $view The filterable to restrict
* *
* @return Filterable The filterable * @return Filterable The filterable
*/ */
protected function applyRestriction($restriction, Filterable $view) protected function applyRestriction($restriction, Filterable $view)
{ {
$restrictions = Filter::matchAny(); $restrictions = Filter::matchAny();
foreach ($this->getRestrictions($restriction) as $filter) { $restrictions->setAllowedFilterColumns(array(
$restrictions->addFilter(Filter::fromQueryString($filter)); 'host_name',
'hostgroup_name',
'service_description',
'servicegroup_name',
function ($c) {
return preg_match('/^_(?:host|service)_/', $c);
} }
));
foreach ($this->getRestrictions($restriction) as $filter) {
try {
$restrictions->addFilter(Filter::fromQueryString($filter));
} catch (QueryException $e) {
throw new ConfigurationError(
$this->translate(
'Cannot apply restriction %s using the filter %s. You can only use the following columns: %s'
),
$restriction,
$filter,
implode(', ', array(
'host_name',
'hostgroup_name',
'service_description',
'servicegroup_name',
'_(host|service)_<customvar-name>'
)),
$e
);
}
}
$view->applyFilter($restrictions); $view->applyFilter($restrictions);
return $view; return $view;
} }