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

Merge #16839 - Fix password management for Percona Server lacking PASSWORD function.

Browse Source
This commit is contained in:
William Desportes 2021-04-20 18:37:49 +02:00
commit 9d166afd58
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/classes/Server/Privileges.php
View File

@ -1038,7 +1038,8 @@ class Privileges
)); ));
// Use 'ALTER USER ...' syntax for MySQL 5.7.6+ // Use 'ALTER USER ...' syntax for MySQL 5.7.6+
if ($serverType === 'MySQL' if (
in_array($serverType, ['MySQL', 'Percona Server'], true)
&& $serverVersion >= 50706 && $serverVersion >= 50706
) { ) {
if ($authentication_plugin !== 'mysql_old_password') { if ($authentication_plugin !== 'mysql_old_password') {

19
libraries/classes/UserPassword.php
View File

@ -7,6 +7,7 @@ namespace PhpMyAdmin;
use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Html\Generator;
use PhpMyAdmin\Server\Privileges; use PhpMyAdmin\Server\Privileges;
use function strlen; use function strlen;
use function in_array;
/** /**
* Functions for user password * Functions for user password
@ -86,19 +87,18 @@ class UserPassword
$sql_query = 'SET password = ' $sql_query = 'SET password = '
. ($password == '' ? '\'\'' : $hashing_function . '(\'***\')'); . ($password == '' ? '\'\'' : $hashing_function . '(\'***\')');
if ($serverType === 'MySQL' $isPerconaOrMySql = in_array($serverType, ['MySQL', 'Percona Server'], true);
&& $serverVersion >= 50706 if ($isPerconaOrMySql && $serverVersion >= 50706
) { ) {
$sql_query = 'ALTER USER \'' . $dbi->escapeString($username) $sql_query = 'ALTER USER \'' . $dbi->escapeString($username)
. '\'@\'' . $dbi->escapeString($hostname) . '\'@\'' . $dbi->escapeString($hostname)
. '\' IDENTIFIED WITH ' . $orig_auth_plugin . ' BY ' . '\' IDENTIFIED WITH ' . $orig_auth_plugin . ' BY '
. ($password == '' ? '\'\'' : '\'***\''); . ($password == '' ? '\'\'' : '\'***\'');
} elseif (($serverType === 'MySQL' } elseif (
&& $serverVersion >= 50507) ($isPerconaOrMySql && $serverVersion >= 50507)
|| ($serverType === 'MariaDB' || ($serverType === 'MariaDB' && $serverVersion >= 50200)
&& $serverVersion >= 50200)
) { ) {
// For MySQL versions 5.5.7+ and MariaDB versions 5.2+, // For MySQL and Percona versions 5.5.7+ and MariaDB versions 5.2+,
// explicitly set value of `old_passwords` so that // explicitly set value of `old_passwords` so that
// it does not give an error while using // it does not give an error while using
// the PASSWORD() function // the PASSWORD() function
@ -171,7 +171,10 @@ class UserPassword
$serverType = Util::getServerType(); $serverType = Util::getServerType();
$serverVersion = $dbi->getVersion(); $serverVersion = $dbi->getVersion();
if ($serverType === 'MySQL' && $serverVersion >= 50706) { if (
in_array($serverType, ['MySQL', 'Percona Server'], true)
&& $serverVersion >= 50706
) {
$local_query = 'ALTER USER \'' . $dbi->escapeString($username) $local_query = 'ALTER USER \'' . $dbi->escapeString($username)
. '\'@\'' . $dbi->escapeString($hostname) . '\'' . '\'@\'' . $dbi->escapeString($hostname) . '\''
. ' IDENTIFIED with ' . $orig_auth_plugin . ' BY ' . ' IDENTIFIED with ' . $orig_auth_plugin . ' BY '