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

Merge #16481 - Fix #16477 - No Option to enter TABLE specific permissions when database name contains _ (underscore)

Browse Source 
Fixes: #16477
Pull-request: #16481
Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2020-11-15 22:34:10 +01:00
commit c5d7a8d3c6
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
3 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1582,12 +1582,12 @@ class Privileges
];
switch ($linktype) {
case 'edit':
$params['dbname'] = $dbname;
$params['dbname'] = Util::escapeMysqlWildcards($dbname);
$params['tablename'] = $tablename;
$params['routinename'] = $routinename;
break;
case 'revoke':
$params['dbname'] = $dbname;
$params['dbname'] = Util::escapeMysqlWildcards($dbname);
$params['tablename'] = $tablename;
$params['routinename'] = $routinename;
$params['revokeall'] = 1;
@ -2054,6 +2054,7 @@ class Privileges
];
$databases = [];
$escaped_databases = [];
if (! empty($pred_db_array)) {
foreach ($pred_db_array as $current_db) {
if (in_array($current_db, $databases_to_skip)) {
@ -2067,11 +2068,12 @@ class Privileges
if (in_array($current_db_escaped, $foundRows)) {
continue;
}
$databases[] = $current_db;
$escaped_databases[] = $current_db_escaped;
}
}
$data['databases'] = $databases;
$data['escaped_databases'] = $escaped_databases;
} elseif ($type === 'table') {
$result = @$this->dbi->tryQuery(
'SHOW TABLES FROM ' . Util::backquote($dbname),
@ -2840,6 +2842,7 @@ class Privileges
$dbname = null;
$tablename = null;
$routinename = null;
$return_db = null;
if (isset($_REQUEST['username'])) {
$username = (string) $_REQUEST['username'];
@ -2907,12 +2910,14 @@ class Privileges
if (isset($dbname)) {
if (is_array($dbname)) {
$db_and_table = $dbname;
$return_db = $dbname;
foreach ($db_and_table as $key => $db_name) {
$db_and_table[$key] .= '.';
}
} else {
$unescaped_db = Util::unescapeMysqlWildcards($dbname);
$db_and_table = Util::backquote($unescaped_db) . '.';
$return_db = $unescaped_db;
}
if (isset($tablename)) {
$db_and_table .= Util::backquote($tablename);
@ -2938,7 +2943,7 @@ class Privileges
return [
$username,
$hostname,
$dbname ?? null,
$return_db,
$tablename ?? null,
$routinename ?? null,
$db_and_table,

2
templates/server/privileges/privileges_summary.twig
View File

@ -56,7 +56,7 @@
{%- if databases is not empty %}
<select name="pred_dbname[]" multiple="multiple">
{% for database in databases %}
<option value="{{ database|escape_mysql_wildcards }}">
<option value="{{ escaped_databases[loop.index0]|escape_mysql_wildcards }}">
{{ database }}
</option>
{% endfor %}

27
test/classes/Server/PrivilegesTest.php
View File

@ -190,6 +190,33 @@ class PrivilegesTest extends AbstractTestCase
$this->assertTrue(
$dbname_is_wildcard
);
// Escaped database
$_POST['pred_tablename'] = 'PMA_pred__tablename';
$_POST['pred_dbname'] = ['PMA\_pred\_dbname'];
[,,
$dbname,
$tablename,
$routinename,
$db_and_table,
$dbname_is_wildcard,
] = $this->serverPrivileges->getDataForDBInfo();
$this->assertEquals(
'PMA_pred_dbname',
$dbname
);
$this->assertEquals(
'PMA_pred__tablename',
$tablename
);
$this->assertEquals(
'`PMA_pred_dbname`.`PMA_pred__tablename`',
$db_and_table
);
$this->assertEquals(
false,
$dbname_is_wildcard
);
}
/**