From d2d697a45f3ff93c3fed792fc786423d0bd5efb2 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Thu, 27 Mar 2003 18:55:36 +0000 Subject: [PATCH] bug #708292 --- ChangeLog | 4 +++ server_privileges.php3 | 71 ++++++++++++++---------------------------- 2 files changed, 28 insertions(+), 47 deletions(-) diff --git a/ChangeLog b/ChangeLog index a27f2526c..c5ba4f804 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - Changelog $Id$ $Source$ +2003-03-25 Alexander M. Turek + * server_privileges.php3, lang/*.inc.php3: Fixed bug #708292 (Support for + host-based privileges). + 2003-03-27 Marc Delisle * sql.php3: avoid long delays when browsing big tables (MySQL 4) diff --git a/server_privileges.php3 b/server_privileges.php3 index fff35b32d..f63511a30 100644 --- a/server_privileges.php3 +++ b/server_privileges.php3 @@ -153,11 +153,7 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = TRUE, $indent = } if (isset($GLOBALS['username'])) { $username = $GLOBALS['username']; - if (empty($GLOBALS['hostname'])) { - $hostname = '%'; - } else { - $hostname = $GLOBALS['hostname']; - } + $hostname = $GLOBALS['hostname']; if ($db == '*') { $sql_query = 'SELECT * FROM `user` WHERE `User` = "' . $username . '" AND `Host` = "' . $hostname . '";'; } else if ($table == '*') { @@ -507,7 +503,7 @@ function PMA_displayLoginInformationFields($mode = 'new', $indent = 0) } echo $spaces . ' onchange="if (this.value == \'any\') { hostname.value = \'%\'; } else if (this.value == \'localhost\') { hostname.value = \'localhost\'; } ' . (empty($thishost) ? '' : 'else if (this.value == \'thishost\') { hostname.value = \'' . addslashes(htmlspecialchars($thishost)) . '\'; } ') - . 'else if (this.value == \'userdefined\') { hostname.focus(); hostname.select(); }">' . "\n"; + . 'else if (this.value == \'hosttable\') { hostname.value = \'\'; } else if (this.value == \'userdefined\') { hostname.focus(); hostname.select(); }">' . "\n"; unset($row); echo $spaces . ' ' . "\n" . $spaces . ' ' . "\n"; @@ -515,11 +511,12 @@ function PMA_displayLoginInformationFields($mode = 'new', $indent = 0) echo $spaces . ' ' . "\n"; } unset($thishost); - echo $spaces . ' ' . "\n" + echo $spaces . ' ' . "\n" + . $spaces . ' ' . "\n" . $spaces . ' ' . "\n" . $spaces . ' ' . "\n" . $spaces . ' ' . "\n" - . $spaces . ' ' . "\n" + . $spaces . ' ' . "\n" . $spaces . ' ' . "\n" . $spaces . '' . "\n" . $spaces . '' . "\n" @@ -558,9 +555,6 @@ function PMA_displayLoginInformationFields($mode = 'new', $indent = 0) * Changes / copies a user, part I */ if (!empty($change_copy)) { - if (empty($old_hostname)) { - $old_hostname = '%'; - } $local_query = 'SELECT * FROM `mysql`.`user` WHERE `User` = "' . $old_username . '" AND `Host` = "' . $old_hostname . '";'; $res = PMA_mysql_query($local_query, $userlink) or PMA_mysqlDie(PMA_mysql_error($userlink), $local_query); if (!$res) { @@ -591,6 +585,9 @@ if (!empty($adduser_submit) || !empty($change_copy)) { case 'localhost': $hostname = 'localhost'; break; + case 'hosttable': + $hostname = ''; + break; case 'thishost': $res = PMA_mysql_query('SELECT USER();', $userlink) or PMA_mysqlDie(PMA_mysql_error($userlink), 'SELECT USER();'); $row = PMA_mysql_fetch_row($res); @@ -739,9 +736,6 @@ if (!empty($change_copy)) { * Updates privileges */ if (!empty($update_privs)) { - if (empty($hostname)) { - $hostname = '%'; - } if (PMA_MYSQL_INT_VERSION >= 32211) { $db_and_table = empty($dbname) ? '*.*' : PMA_backquote($dbname) . '.' . (empty($tablename) ? '*' : PMA_backquote($tablename)); $sql_query0 = 'REVOKE ALL PRIVILEGES ON ' . $db_and_table . ' FROM "' . $username . '"@"' . $hostname . '";'; @@ -791,9 +785,6 @@ if (!empty($update_privs)) { * Revokes Privileges */ if (!empty($revokeall)) { - if (empty($hostname)) { - $hostname = '%'; - } if (PMA_MYSQL_INT_VERSION >= 32211) { $db_and_table = PMA_backquote($dbname) . '.' . (empty($tablename) ? '*' : PMA_backquote($tablename)); $sql_query0 = 'REVOKE ALL PRIVILEGES ON ' . $db_and_table . ' FROM "' . $username . '"@"' . $hostname . '";'; @@ -815,9 +806,6 @@ if (!empty($revokeall)) { * Updates the password */ if (!empty($change_pw)) { - if (empty($hostname)) { - $hostname = '%'; - } if ($nopass == 1) { $sql_query = 'SET PASSWORD FOR "' . $username . '"@"' . $hostname . '" = ""'; PMA_mysql_query($sql_query, $userlink) or PMA_mysqlDie(PMA_mysql_error($userlink)); @@ -1060,11 +1048,8 @@ if (empty($adduser) && empty($checkprivs)) { } } else { // A user was selected -> display the user's properties - if (!isset($hostname)) { - $hostname = '%'; - } echo '

' . "\n" - . ' ' . $strUser . ' \'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname) . '\'' . "\n"; + . ' ' . $strUser . ' \'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname) . '\'' . "\n"; if (!empty($dbname)) { echo ' - ' . $strDatabase . ' ' . htmlspecialchars($dbname) . '' . "\n"; if (!empty($tablename)) { @@ -1084,10 +1069,8 @@ if (empty($adduser) && empty($checkprivs)) { . '
  • ' . "\n" . '
    ' . "\n" . PMA_generate_common_hidden_inputs('', '', 3) - . ' ' . "\n"; - if ($hostname != '%') { - echo ' ' . "\n"; - } + . ' ' . "\n" + . ' ' . "\n"; if (!empty($dbname)) { echo ' ' . "\n"; if (!empty($tablename)) { @@ -1140,8 +1123,8 @@ if (empty($adduser) && empty($checkprivs)) { echo ' ' . $strNo . '' . "\n"; } echo ' ' . $strYes . '' . "\n" - . ' ' . $strEdit . '' . "\n" - . ' ' . $strRevoke . '' . "\n" + . ' ' . $strEdit . '' . "\n" + . ' ' . $strRevoke . '' . "\n" . ' ' . "\n"; $row2 = PMA_mysql_fetch_array($res2, MYSQL_ASSOC); $useBgcolorOne = !$useBgcolorOne; @@ -1166,8 +1149,8 @@ if (empty($adduser) && empty($checkprivs)) { echo $strNo; } echo '' . "\n" - . ' ' . $strEdit . '' . "\n" - . ' ' . $strRevoke . '' . "\n" + . ' ' . $strEdit . '' . "\n" + . ' ' . $strRevoke . '' . "\n" . ' ' . "\n"; $useBgcolorOne = !$useBgcolorOne; } // end while @@ -1182,8 +1165,8 @@ if (empty($adduser) && empty($checkprivs)) { echo ' ' . $strNo . '' . "\n"; } echo ' ' . $strYes . '' . "\n" - . ' ' . $strEdit . '' . "\n" - . ' ' . $strRevoke . '' . "\n" + . ' ' . $strEdit . '' . "\n" + . ' ' . $strRevoke . '' . "\n" . ' ' . "\n"; $row2 = PMA_mysql_fetch_array($res2, MYSQL_ASSOC); $useBgcolorOne = !$useBgcolorOne; @@ -1201,10 +1184,8 @@ if (empty($adduser) && empty($checkprivs)) { . ' ' . "\n" . ' ' . "\n" . PMA_generate_common_hidden_inputs('', '', 6) - . ' ' . "\n"; - if ($hostname != '%') { - echo ' ' . "\n"; - } + . ' ' . "\n" + . ' ' . "\n"; if (empty($dbname)) { echo ' ' . "\n"; $res = PMA_mysql_query('SHOW DATABASES;', $userlink) or PMA_mysqlDie(PMA_mysql_error($userlink), 'SHOW DATABASES;'); @@ -1263,10 +1244,8 @@ if (empty($adduser) && empty($checkprivs)) { echo '
  • ' . "\n" . ' ' . "\n" . PMA_generate_common_hidden_inputs('', '', 3) - . ' ' . "\n"; - if ($hostname != '%') { - echo ' ' . "\n"; - } + . ' ' . "\n" + . ' ' . "\n"; echo ' ' . $strChangePassword . '
    ' . "\n" . ' ' . "\n" . ' ' . "\n" @@ -1295,10 +1274,8 @@ if (empty($adduser) && empty($checkprivs)) { echo '
  • ' . "\n" . ' ' . "\n" . PMA_generate_common_hidden_inputs('', '', 3) - . ' ' . "\n"; - if ($hostname != '%') { - echo ' ' . "\n"; - } + . ' ' . "\n" + . ' ' . "\n"; echo ' ' . $strChangeCopyUser . '
    ' . "\n" . '
    • ' . "\n"; PMA_displayLoginInformationFields('change', 3); @@ -1470,7 +1447,7 @@ if (empty($adduser) && empty($checkprivs)) { . ' ' . "\n"; } echo ' ' . "\n"
    ' . "\n" - . ' ' . "\n" + . ' ' . "\n" . ' ' . $strEdit . "\n" . ' ' . "\n" . '