tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-23 05:44:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Implement validation for filter and sort columns

Browse Source
This commit is contained in:
Alexander Fuhr 2014-10-06 11:32:15 +02:00
parent 36681bb55a
commit e96065e065
1 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
modules/monitoring/library/Monitoring/DataView/DataView.php
View File

@ -6,12 +6,14 @@ namespace Icinga\Module\Monitoring\DataView;
use Countable; use Countable;
use Icinga\Data\Filter\Filter; use Icinga\Data\Filter\Filter;
use Icinga\Data\Filter\FilterMatch;
use Icinga\Data\SimpleQuery; use Icinga\Data\SimpleQuery;
use Icinga\Data\Browsable; use Icinga\Data\Browsable;
use Icinga\Data\PivotTable; use Icinga\Data\PivotTable;
use Icinga\Data\Sortable; use Icinga\Data\Sortable;
use Icinga\Data\ConnectionInterface; use Icinga\Data\ConnectionInterface;
use Icinga\Data\Filterable; use Icinga\Data\Filterable;
use Icinga\Exception\QueryException;
use Icinga\Web\Request; use Icinga\Web\Request;
use Icinga\Web\Url; use Icinga\Web\Url;
use Icinga\Module\Monitoring\Backend; use Icinga\Module\Monitoring\Backend;
@ -206,13 +208,13 @@ public function dump()
if ($sortRules !== null) { if ($sortRules !== null) {
if ($column === null) { if ($column === null) {
$sortColumns = reset($sortRules); $sortColumns = reset($sortRules);
if (!isset($sortColumns['columns'])) { if (! isset($sortColumns['columns'])) {
$sortColumns['columns'] = array(key($sortRules)); $sortColumns['columns'] = array(key($sortRules));
} }
} else { } else {
if (isset($sortRules[$column])) { if (isset($sortRules[$column])) {
$sortColumns = $sortRules[$column]; $sortColumns = $sortRules[$column];
if (!isset($sortColumns['columns'])) { if (! isset($sortColumns['columns'])) {
$sortColumns['columns'] = array($column); $sortColumns['columns'] = array($column);
} }
} else { } else {
@ -227,6 +229,13 @@ public function dump()
$order = (strtoupper($order) === self::SORT_ASC) ? 'ASC' : 'DESC'; $order = (strtoupper($order) === self::SORT_ASC) ? 'ASC' : 'DESC';
foreach ($sortColumns['columns'] as $column) { foreach ($sortColumns['columns'] as $column) {
if (! $this->isValidFilterTarget($column)) {
throw new QueryException(
t('The sort column "%s" is not allowed in "%s".'),
$column,
get_class($this)
);
}
$this->query->order($column, $order); $this->query->order($column, $order);
} }
$this->isSorted = true; $this->isSorted = true;
@ -289,15 +298,44 @@ public function dump()
*/ */
public function getQuery() public function getQuery()
{ {
if (! $this->isSorted) { $this->sort(); } if (! $this->isSorted) {
$this->order();
}
return $this->query; return $this->query;
} }
public function applyFilter(Filter $filter) public function applyFilter(Filter $filter)
{ {
$this->validateFilterColumns($filter);
return $this->addFilter($filter); return $this->addFilter($filter);
} }
/**
* Validates recursive the Filter columns against the isValidFilterTarget() method
*
* @param Filter $filter
*
* @throws \Icinga\Data\Filter\FilterException
*/
public function validateFilterColumns(Filter $filter)
{
if ($filter instanceof FilterMatch) {
if (! $this->isValidFilterTarget($filter->getColumn())) {
throw new QueryException(
t('The filter column "%s" is not allowed here.'),
$filter->getColumn()
);
}
}
if (method_exists($filter, 'filters')) {
foreach ($filter->filters() as $filter) {
$this->validateFilterColumns($filter);
}
}
}
public function clearFilter() public function clearFilter()
{ {
$this->query->clearFilter(); $this->query->clearFilter();