Skip to content

Harden storage filter column handling #566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rello merged 1 commit into from
Feb 6, 2026
Merged

Harden storage filter column handling #566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

### Fixes
- Dark Mode: Settings element does not adapt text color #565
- Harden filter column handling to block unsupported identifiers


## 6.0.2 - 2025-12-30
Expand Down
39 changes: 32 additions & 7 deletions lib/Db/StorageMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ class StorageMapper
private $db;
private $logger;
const TABLE_NAME = 'analytics_facts';
private const FILTERABLE_COLUMNS = [
'dimension1',
'dimension2',
'timestamp',
'value',
];

public function __construct(
$userId,
Expand Down Expand Up @@ -150,6 +156,10 @@ public function read(int $dataset, $options = '')
// add the where clauses depending on the filter selection of the
if (isset($options['filter'])) {
foreach ($options['filter'] as $key => $value) {
$column = $this->getAllowedFilterColumn($key);
if ($column === null) {
continue;
}

// Remove quotes from each element
// quotes are required when filter has a comma e.g. 'home, office" and needs to be evaluated as one select
Expand All @@ -163,22 +173,22 @@ public function read(int $dataset, $options = '')
}

if ($value['option'] === 'EQ') {
$sql->andWhere($sql->expr()->eq($key, $sql->createNamedParameter($valueNoQuotes)));
$sql->andWhere($sql->expr()->eq($column, $sql->createNamedParameter($valueNoQuotes)));
} elseif ($value['option'] === 'GT') {
$sql->andWhere($sql->expr()->gt($key, $sql->createNamedParameter($valueNoQuotes)));
$sql->andWhere($sql->expr()->gt($column, $sql->createNamedParameter($valueNoQuotes)));
} elseif ($value['option'] === 'LT') {
$sql->andWhere($sql->expr()->lt($key, $sql->createNamedParameter($valueNoQuotes)));
$sql->andWhere($sql->expr()->lt($column, $sql->createNamedParameter($valueNoQuotes)));
} elseif ($value['option'] === 'IN') {
// Use regex to split by comma or semicolon, keeping quoted strings together
preg_match_all("/'(?:[^'\\\\]|\\\\.)*'|[^,;]+/", $value['value'], $matches);
$valuesArray = array_map(function($v) {
return trim($v, " '");
}, $matches[0]);

$sql->andWhere($sql->expr()->in($key, $sql->createParameter('inValues')));
$sql->andWhere($sql->expr()->in($column, $sql->createParameter('inValues')));
$sql->setParameter('inValues', $valuesArray, IQueryBuilder::PARAM_STR_ARRAY);
} elseif ($value['option'] === 'LIKE') {
$sql->andWhere($sql->expr()->like($key, $sql->createNamedParameter('%' . $valueNoQuotes . '%')));
$sql->andWhere($sql->expr()->like($column, $sql->createNamedParameter('%' . $valueNoQuotes . '%')));
} elseif ($value['option'] === 'BETWEEN') {
// Between is used for filters on quarters
// Support both array and comma-separated string formats
Expand All @@ -192,8 +202,8 @@ public function read(int $dataset, $options = '')
}
$sql->andWhere(
$sql->expr()->andX(
$sql->expr()->gte($key, $sql->createNamedParameter($start)),
$sql->expr()->lte($key, $sql->createNamedParameter($end))
$sql->expr()->gte($column, $sql->createNamedParameter($start)),
$sql->expr()->lte($column, $sql->createNamedParameter($end))
)
);
}
Expand Down Expand Up @@ -370,6 +380,11 @@ public function getRecordCount(int $datasetId, ?string $user_id = null)
*/
protected function sqlWhere(IQueryBuilder $sql, $column, $option, $value)
{
$column = $this->getAllowedFilterColumn($column);
if ($column === null) {
return;
}

if ($option === 'EQ') {
$sql->andWhere($sql->expr()->eq($column, $sql->createNamedParameter($value)));
} elseif ($option === 'GT') {
Expand All @@ -383,4 +398,14 @@ protected function sqlWhere(IQueryBuilder $sql, $column, $option, $value)
$sql->andWhere($sql->expr()->like($column, $sql->createNamedParameter('%' . $value . '%')));
}
}

private function getAllowedFilterColumn(string $column): ?string
{
if (in_array($column, self::FILTERABLE_COLUMNS, true)) {
return $column;
}

$this->logger->warning('Blocked unsupported filter column', ['column' => $column]);
return null;
}
}