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

DBUtils: Make sure to use string types for hex/binary formats

Browse Source
This commit is contained in:
Yonas Habteab 2022-06-09 10:13:48 +02:00
parent d454113941
commit 91272870a3
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/Icinga/Util/DBUtils.php
View File

@ -70,7 +70,7 @@ class DBUtils
*/
public static function getBinaryExpr($uuid)
{
if (! self::isPgsql() || ! self::isBinary($uuid)) {
if (! self::isPgsql() || (! is_string($uuid) || ! self::isBinary($uuid))) {
return $uuid;
}
@ -86,7 +86,7 @@ class DBUtils
*/
public static function binary2Hex($uuid)
{
if (! self::isPgsql() || ! self::isBinary($uuid)) {
if (! self::isPgsql() || (! is_string($uuid) || ! self::isBinary($uuid))) {
return $uuid;
}
@ -108,11 +108,11 @@ class DBUtils
/**
* Get whether the given data is a binary string
*
* @param $data
* @param string $data
*
* @return bool
*/
public static function isBinary($data): bool
public static function isBinary(string $data): bool
{
// Stolen from php.net
$data = preg_replace('/\s/', '', $data ?? '');
@ -130,6 +130,10 @@ class DBUtils
public static function transformValues(array &$values): void
{
foreach ($values as &$value) {
if (! is_string($value)) {
continue;
}
$value = DBUtils::binary2Hex($value);
}
}