gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #18873 from MauricioFauth/mysqli-exception

Browse Source 
Remove trigger_error from Dbal\DbiMysqli::connect()
This commit is contained in:
Maurício Meneghini Fauth 2023-12-29 23:04:46 -03:00 committed by GitHub
commit 56fb83a615
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 49 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpstan-baseline.neon
View File

@ -7460,11 +7460,6 @@ parameters:
count: 1
path: src/Dbal/DbalInterface.php
-
message: "#^Parameter \\#1 \\$haystack of function stripos expects string, string\\|null given\\.$#"
count: 1
path: src/Dbal/DbiMysqli.php
-
message: "#^Method PhpMyAdmin\\\\Dbal\\\\MysqliResult\\:\\:fetchAllAssoc\\(\\) should return array\\<int, array\\<string\\|null\\>\\> but returns array\\.$#"
count: 1

6
psalm-baseline.xml
View File

@ -5273,12 +5273,6 @@
<DeprecatedMethod>
<code>Config::getInstance()</code>
</DeprecatedMethod>
<PossiblyNullArgument>
<code>$errorMessage</code>
</PossiblyNullArgument>
<PossiblyNullOperand>
<code>$errorMessage</code>
</PossiblyNullOperand>
</file>
<file src="src/Dbal/MysqliResult.php">
<InvalidReturnStatement>

10
src/DatabaseInterface.php
View File

@ -7,6 +7,7 @@ namespace PhpMyAdmin;
use PhpMyAdmin\Config\Settings\Server;
use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Dbal\Connection;
use PhpMyAdmin\Dbal\ConnectionException;
use PhpMyAdmin\Dbal\DbalInterface;
use PhpMyAdmin\Dbal\DbiExtension;
use PhpMyAdmin\Dbal\DbiMysqli;
@ -1636,7 +1637,14 @@ class DatabaseInterface implements DbalInterface
// Do not show location and backtrace for connection errors
$errorHandler = ErrorHandler::getInstance();
$errorHandler->setHideLocation(true);
$result = $this->extension->connect($server);
try {
$result = $this->extension->connect($server);
} catch (ConnectionException $exception) {
trigger_error($exception->getMessage(), E_USER_WARNING);
return null;
}
$errorHandler->setHideLocation(false);
if ($result !== null) {

11
src/Dbal/ConnectionException.php Normal file
View File

@ -0,0 +1,11 @@
<?php
declare(strict_types=1);
namespace PhpMyAdmin\Dbal;
use Exception;
class ConnectionException extends Exception
{
}

2
src/Dbal/DbiExtension.php
View File

@ -17,6 +17,8 @@ interface DbiExtension
{
/**
* Connects to the database server.
*
* @throws ConnectionException
*/
public function connect(Server $server): Connection|null;

61
src/Dbal/DbiMysqli.php
View File

@ -21,11 +21,9 @@ use function mysqli_get_client_info;
use function mysqli_init;
use function mysqli_report;
use function sprintf;
use function stripos;
use function trigger_error;
use function str_contains;
use function strtolower;
use const E_USER_ERROR;
use const E_USER_WARNING;
use const MYSQLI_CLIENT_COMPRESS;
use const MYSQLI_CLIENT_SSL;
use const MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT;
@ -106,35 +104,18 @@ class DbiMysqli implements DbiExtension
$server->socket,
$clientFlags,
);
} catch (mysqli_sql_exception) {
/**
* Switch to SSL if server asked us to do so, unfortunately
* there are more ways MySQL server can tell this:
*
* - MySQL 8.0 and newer should return error 3159
* - #2001 - SSL Connection is required. Please specify SSL options and retry.
* - #9002 - SSL connection is required. Please specify SSL options and retry.
*/
// phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
$errorNumber = $mysqli->connect_errno;
// phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
$errorMessage = $mysqli->connect_error;
if (
! $server->ssl
&& ($errorNumber == 3159
|| (($errorNumber == 2001 || $errorNumber == 9002)
&& stripos($errorMessage, 'SSL Connection is required') !== false))
) {
trigger_error(
__('SSL connection enforced by server, automatically enabling it.'),
E_USER_WARNING,
);
} catch (mysqli_sql_exception $exception) {
$errorNumber = $exception->getCode();
$errorMessage = $exception->getMessage();
if (! $server->ssl && $this->isSslRequiredByServer($errorNumber, $errorMessage)) {
return self::connect($server->withSSL(true));
}
mysqli_report(MYSQLI_REPORT_OFF);
if ($errorNumber === 1045 && $server->hideConnectionErrors) {
trigger_error(
throw new ConnectionException(
sprintf(
__(
'Error 1045: Access denied for user. Additional error information'
@ -143,15 +124,12 @@ class DbiMysqli implements DbiExtension
'[code][doc@cfg_Servers_hide_connection_errors]'
. '$cfg[\'Servers\'][$i][\'hide_connection_errors\'][/doc][/code]',
),
E_USER_ERROR,
$errorNumber,
$exception,
);
} else {
trigger_error($errorNumber . ': ' . $errorMessage, E_USER_WARNING);
}
mysqli_report(MYSQLI_REPORT_OFF);
return null;
throw new ConnectionException($errorNumber . ': ' . $errorMessage, $errorNumber, $exception);
}
$mysqli->options(MYSQLI_OPT_LOCAL_INFILE, (int) defined('PMA_ENABLE_LDI'));
@ -356,4 +334,19 @@ class DbiMysqli implements DbiExtension
// phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
return $mysqli->warning_count;
}
/**
* Switch to SSL if server asked us to do so, unfortunately
* there are more ways MySQL server can tell this:
*
* - MySQL 8.0 and newer should return error 3159
* - #2001 - SSL Connection is required. Please specify SSL options and retry.
* - #9002 - SSL connection is required. Please specify SSL options and retry.
*/
private function isSslRequiredByServer(int $errorNumber, string $errorMessage): bool
{
return $errorNumber === 3159
|| ($errorNumber === 2001 || $errorNumber === 9002)
&& str_contains(strtolower($errorMessage), 'ssl connection is required');
}
}