tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

IdoQuery: Accept any character in custom var names 

fixes #4342
This commit is contained in:
Johannes Meyer 2021-04-06 10:30:14 +02:00
parent 867b2af12d
commit fe51f8c968
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
View File

@ -17,6 +17,7 @@ use Icinga\Exception\ProgrammingError;
use Icinga\Exception\QueryException;
use Icinga\Web\Session;
use Icinga\Module\Monitoring\Data\ColumnFilterIterator;
use Zend_Db_Select;
/**
* Base class for Ido Queries
@ -1181,7 +1182,13 @@ abstract class IdoQuery extends DbQuery
{
// TODO: This is not generic enough yet
list($type, $name) = $this->customvarNameToTypeName($customvar);
$alias = ($type === 'host' ? 'hcv_' : 'scv_') . $name;
$alias = ($type === 'host' ? 'hcv_' : 'scv_') . preg_replace('~[^a-zA-Z0-9_]~', '_', $name);
// We're replacing any problematic char with an underscore, which will lead to duplicates, this avoids them
$from = $this->select->getPart(Zend_Db_Select::FROM);
for ($i = 2; array_key_exists($alias, $from); $i++) {
$alias = $alias . '_' . $i;
}
$this->customVars[strtolower($customvar)] = $alias;
@ -1220,7 +1227,7 @@ abstract class IdoQuery extends DbQuery
protected function customvarNameToTypeName($customvar)
{
$customvar = strtolower($customvar);
if (! preg_match('~^_(host|service)_([a-zA-Z0-9_]+)$~', $customvar, $m)) {
if (! preg_match('~^_(host|service)_(.+)$~', $customvar, $m)) {
throw new ProgrammingError(
'Got invalid custom var: "%s"',
$customvar