holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix PHP 8.1 throws \mysqli_sql_exception or \PDOException for SQL errors

Browse Source 
- change them to our regular Api\Db\Exception
- for prop(find|patch) explicitly catch PDOException to deal more graceful with non-ascii prop-names
This commit is contained in:
ralf 2022-05-10 12:36:25 +02:00
parent c4e0989bf9
commit 9a0cc36366
3 changed files with 61 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
api/src/Db.php
View File

@ -798,13 +798,20 @@ class Db
return 0;
}
}
if ($num_rows > 0)
try
{
$rs = $this->Link_ID->SelectLimit($Query_String,$num_rows,(int)$offset,$inputarr);
if ($num_rows > 0)
{
$rs = $this->Link_ID->SelectLimit($Query_String, $num_rows, (int)$offset, $inputarr);
}
else
{
$rs = $this->Link_ID->Execute($Query_String, $inputarr);
}
}
else
{
$rs = $this->Link_ID->Execute($Query_String,$inputarr);
// PHP 8.1 mysqli throws its own exception
catch(\mysqli_sql_exception $e) {
throw new Db\Exception($e->getMessage(), $e->getCode(), $e);
}
$this->Row = 0;
$this->Errno = $this->Link_ID->ErrorNo();

6
api/src/Db/Exception.php
View File

@ -27,10 +27,10 @@ class Exception extends \egw_exception_db
* @param string $msg =null message, default "Database error!"
* @param int $code =100
*/
function __construct($msg=null,$code=100)
function __construct($msg=null, $code=100, \Exception $previous=null)
{
if (is_null($msg)) $msg = lang('Database error!');
parent::__construct($msg,$code);
parent::__construct($msg, $code, $previous);
}
}
}

78
api/src/Vfs/Sqlfs/StreamWrapper.php
View File

@ -1944,44 +1944,52 @@ GROUP BY A.fs_id';
return false; // permission denied
}
$ins_stmt = $del_stmt = null;
foreach($props as &$prop)
{
if(!array_key_exists('name', $prop))
{
return false; // Name is missing
}
if (!isset($prop['ns'])) $prop['ns'] = Vfs::DEFAULT_PROP_NAMESPACE;
if (!isset($prop['val']) || self::$pdo_type != 'mysql') // for non mysql, we have to delete the prop anyway, as there's no REPLACE!
try {
foreach ($props as &$prop)
{
if (!isset($del_stmt))
if (!array_key_exists('name', $prop))
{
$del_stmt = self::$pdo->prepare('DELETE FROM '.self::PROPS_TABLE.' WHERE fs_id=:fs_id AND prop_namespace=:prop_namespace AND prop_name=:prop_name');
return false; // Name is missing
}
$del_stmt->execute(array(
'fs_id' => $id,
'prop_namespace' => $prop['ns'],
'prop_name' => $prop['name'],
));
}
if (isset($prop['val']))
{
if (!isset($ins_stmt))
if (!isset($prop['ns'])) $prop['ns'] = Vfs::DEFAULT_PROP_NAMESPACE;
if (!isset($prop['val']) || self::$pdo_type != 'mysql') // for non mysql, we have to delete the prop anyway, as there's no REPLACE!
{
$ins_stmt = self::$pdo->prepare((self::$pdo_type == 'mysql' ? 'REPLACE' : 'INSERT').
' INTO '.self::PROPS_TABLE.' (fs_id,prop_namespace,prop_name,prop_value) VALUES (:fs_id,:prop_namespace,:prop_name,:prop_value)');
if (!isset($del_stmt))
{
$del_stmt = self::$pdo->prepare('DELETE FROM ' . self::PROPS_TABLE . ' WHERE fs_id=:fs_id AND prop_namespace=:prop_namespace AND prop_name=:prop_name');
}
$del_stmt->execute(array(
'fs_id' => $id,
'prop_namespace' => $prop['ns'],
'prop_name' => $prop['name'],
));
}
if (!$ins_stmt->execute(array(
'fs_id' => $id,
'prop_namespace' => $prop['ns'],
'prop_name' => $prop['name'],
'prop_value' => $prop['val'],
)))
if (isset($prop['val']))
{
return false;
if (!isset($ins_stmt))
{
$ins_stmt = self::$pdo->prepare((self::$pdo_type == 'mysql' ? 'REPLACE' : 'INSERT') .
' INTO ' . self::PROPS_TABLE . ' (fs_id,prop_namespace,prop_name,prop_value) VALUES (:fs_id,:prop_namespace,:prop_name,:prop_value)');
}
if (!$ins_stmt->execute(array(
'fs_id' => $id,
'prop_namespace' => $prop['ns'],
'prop_name' => $prop['name'],
'prop_value' => $prop['val'],
)))
{
return false;
}
}
}
}
// catch exception for inserting or deleting non-ascii prop_names
catch (\PDOException $e) {
_egw_log_exception($e);
return false;
}
return true;
}
@ -2014,10 +2022,16 @@ GROUP BY A.fs_id';
(!is_null($ns) ? ' AND prop_namespace=?' : '');
if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
$stmt = self::$pdo->prepare($query);
$stmt->setFetchMode(\PDO::FETCH_ASSOC);
$stmt->execute(!is_null($ns) ? array($ns) : array());
try {
$stmt = self::$pdo->prepare($query);
$stmt->setFetchMode(\PDO::FETCH_ASSOC);
$stmt->execute(!is_null($ns) ? array($ns) : array());
}
// cat exception trying to search for non-ascii prop_name
catch (\PDOException $e) {
_egw_log_exception($e);
return [];
}
$props = array();
foreach($stmt as $row)
{