Show box for creating database only if user has privileges to do so (bug #1167892).
This commit is contained in:
Michal Čihař
@@ -9,6 +9,9 @@ $Source$
|
||||
* libraries/common.lib.php: Use eval for config file including to catch
|
||||
parse errors (bug #1223319), on error page display config file that
|
||||
actually failed.
|
||||
* main.php, server_databases.php, libraries/check_user_privileges.lib.php,
|
||||
libraries/display_create_database.lib.php: Show box for creating
|
||||
database only if user has privileges to do so (bug #1167892).
|
||||
|
||||
2005-07-12 Marc Delisle <lem9@users.sourceforge.net>
|
||||
* sql.php: for Insert row and Export, use post when the query is too big
|
||||
|
||||
130
libraries/check_user_privileges.lib.php
Normal file
130
libraries/check_user_privileges.lib.php
Normal file
@@ -0,0 +1,130 @@
|
||||
<?php
|
||||
/* $Id$ */
|
||||
// vim: expandtab sw=4 ts=4 sts=4:
|
||||
|
||||
// Get user's global privileges ($dbh and $userlink are links to MySQL
|
||||
// defined in the "common.lib.php" library)
|
||||
// Note: if no controluser is defined, $dbh contains $userlink
|
||||
|
||||
$is_create_priv = FALSE;
|
||||
$is_process_priv = TRUE;
|
||||
$is_reload_priv = FALSE;
|
||||
$db_to_create = '';
|
||||
|
||||
// We were trying to find if user if superuser with 'USE mysql'
|
||||
// but users with the global priv CREATE TEMPORARY TABLES or LOCK TABLES
|
||||
// can do a 'USE mysql' (even if they cannot see the tables)
|
||||
$is_superuser = PMA_DBI_try_query('SELECT COUNT(*) FROM mysql.user', $userlink, PMA_DBI_QUERY_STORE);
|
||||
|
||||
function PMA_analyseShowGrant($rs_usr, &$is_create_priv, &$db_to_create, &$is_reload_priv) {
|
||||
|
||||
$re0 = '(^|(\\\\\\\\)+|[^\])'; // non-escaped wildcards
|
||||
$re1 = '(^|[^\])(\\\)+'; // escaped wildcards
|
||||
while ($row = PMA_DBI_fetch_row($rs_usr)) {
|
||||
$show_grants_dbname = substr($row[0], strpos($row[0], ' ON ') + 4,(strpos($row[0], '.', strpos($row[0], ' ON ')) - strpos($row[0], ' ON ') - 4));
|
||||
$show_grants_dbname = ereg_replace('^`(.*)`','\\1', $show_grants_dbname);
|
||||
$show_grants_str = substr($row[0],6,(strpos($row[0],' ON ')-6));
|
||||
if (($show_grants_str == 'ALL') || ($show_grants_str == 'ALL PRIVILEGES') || ($show_grants_str == 'CREATE') || strpos($show_grants_str, 'CREATE')) {
|
||||
if ($show_grants_dbname == '*') {
|
||||
$is_create_priv = TRUE;
|
||||
$is_reload_priv = TRUE;
|
||||
$db_to_create = '';
|
||||
break;
|
||||
} // end if
|
||||
else if ( (ereg($re0 . '%|_', $show_grants_dbname)
|
||||
&& !ereg('\\\\%|\\\\_', $show_grants_dbname))
|
||||
|| (!PMA_DBI_try_query('USE ' . ereg_replace($re1 .'(%|_)', '\\1\\3', $show_grants_dbname)) && substr(PMA_DBI_getError(), 1, 4) != 1044)
|
||||
) {
|
||||
$db_to_create = ereg_replace($re0 . '%', '\\1...', ereg_replace($re0 . '_', '\\1?', $show_grants_dbname));
|
||||
$db_to_create = ereg_replace($re1 . '(%|_)', '\\1\\3', $db_to_create);
|
||||
$is_create_priv = TRUE;
|
||||
break;
|
||||
} // end elseif
|
||||
} // end if
|
||||
} // end while
|
||||
} // end function
|
||||
|
||||
// Detection for some CREATE privilege.
|
||||
|
||||
// Since MySQL 4.1.2, we can easily detect current user's grants
|
||||
// using $userlink (no control user needed)
|
||||
// and we don't have to try any other method for detection
|
||||
|
||||
if (PMA_MYSQL_INT_VERSION >= 40102) {
|
||||
$rs_usr = PMA_DBI_try_query('SHOW GRANTS', $userlink, PMA_DBI_QUERY_STORE);
|
||||
if ($rs_usr) {
|
||||
PMA_analyseShowGrant($rs_usr,$is_create_priv, $db_to_create, $is_reload_priv);
|
||||
PMA_DBI_free_result($rs_usr);
|
||||
unset($rs_usr);
|
||||
}
|
||||
} else {
|
||||
|
||||
// Before MySQL 4.1.2, we first try to find a priv in mysql.user. Hopefuly
|
||||
// the controluser is correctly defined; but here, $dbh could contain
|
||||
// $userlink so maybe the SELECT will fail
|
||||
|
||||
if (!$is_create_priv) {
|
||||
$local_query = 'SELECT Create_priv, Reload_priv FROM mysql.user WHERE ' . PMA_convert_using('User') . ' = ' . PMA_convert_using(PMA_sqlAddslashes($mysql_cur_user), 'quoted') . ' OR ' . PMA_convert_using('User') . ' = ' . PMA_convert_using('', 'quoted') . ';';
|
||||
$rs_usr = PMA_DBI_try_query($local_query, $dbh); // Debug: or PMA_mysqlDie('', $local_query, FALSE);
|
||||
if ($rs_usr) {
|
||||
while ($result_usr = PMA_DBI_fetch_assoc($rs_usr)) {
|
||||
if (!$is_create_priv) {
|
||||
$is_create_priv = ($result_usr['Create_priv'] == 'Y');
|
||||
}
|
||||
if (!$is_reload_priv) {
|
||||
$is_reload_priv = ($result_usr['Reload_priv'] == 'Y');
|
||||
}
|
||||
} // end while
|
||||
PMA_DBI_free_result($rs_usr);
|
||||
unset($rs_usr, $result_usr);
|
||||
} // end if
|
||||
} // end if
|
||||
|
||||
// If the user has Create priv on a inexistant db, show him in the dialog
|
||||
// the first inexistant db name that we find, in most cases it's probably
|
||||
// the one he just dropped :)
|
||||
if (!$is_create_priv) {
|
||||
$local_query = 'SELECT DISTINCT Db FROM mysql.db WHERE ' . PMA_convert_using('Create_priv') . ' = ' . PMA_convert_using('Y', 'quoted') . ' AND (' . PMA_convert_using('User') . ' = ' .PMA_convert_using(PMA_sqlAddslashes($mysql_cur_user), 'quoted') . ' OR ' . PMA_convert_using('User') . ' = ' . PMA_convert_using('', 'quoted') . ');';
|
||||
$rs_usr = PMA_DBI_try_query($local_query, $dbh, PMA_DBI_QUERY_STORE);
|
||||
if ($rs_usr) {
|
||||
$re0 = '(^|(\\\\\\\\)+|[^\])'; // non-escaped wildcards
|
||||
$re1 = '(^|[^\])(\\\)+'; // escaped wildcards
|
||||
while ($row = PMA_DBI_fetch_assoc($rs_usr)) {
|
||||
if (ereg($re0 . '(%|_)', $row['Db'])
|
||||
|| (!PMA_DBI_try_query('USE ' . ereg_replace($re1 . '(%|_)', '\\1\\3', $row['Db'])) && substr(PMA_DBI_getError(), 1, 4) != 1044)) {
|
||||
$db_to_create = ereg_replace($re0 . '%', '\\1...', ereg_replace($re0 . '_', '\\1?', $row['Db']));
|
||||
$db_to_create = ereg_replace($re1 . '(%|_)', '\\1\\3', $db_to_create);
|
||||
$is_create_priv = TRUE;
|
||||
break;
|
||||
} // end if
|
||||
} // end while
|
||||
PMA_DBI_free_result($rs_usr);
|
||||
unset($rs_usr, $row, $re0, $re1);
|
||||
} // end if
|
||||
else {
|
||||
// Finally, let's try to get the user's privileges by using SHOW
|
||||
// GRANTS...
|
||||
// Maybe we'll find a little CREATE priv there :)
|
||||
$rs_usr = PMA_DBI_try_query('SHOW GRANTS FOR ' . $mysql_cur_user_and_host . ';', $dbh, PMA_DBI_QUERY_STORE);
|
||||
if (!$rs_usr) {
|
||||
// OK, now we'd have to guess the user's hostname, but we
|
||||
// only try out the 'username'@'%' case.
|
||||
$rs_usr = PMA_DBI_try_query('SHOW GRANTS FOR ' . $mysql_cur_user . ';', $dbh, PMA_DBI_QUERY_STORE);
|
||||
}
|
||||
unset($local_query);
|
||||
if ($rs_usr) {
|
||||
PMA_analyseShowGrant($rs_usr,$is_create_priv, $db_to_create, $is_reload_priv);
|
||||
PMA_DBI_free_result($rs_usr);
|
||||
unset($rs_usr);
|
||||
} // end if
|
||||
} // end elseif
|
||||
} // end if
|
||||
} // end else (MySQL < 4.1.2)
|
||||
|
||||
// If disabled, don't show it
|
||||
if (!$cfg['SuggestDBName']) {
|
||||
$db_to_create = '';
|
||||
}
|
||||
|
||||
?>
|
||||
|
||||
35
libraries/display_create_database.lib.php
Normal file
35
libraries/display_create_database.lib.php
Normal file
@@ -0,0 +1,35 @@
|
||||
<?php
|
||||
/* $Id$ */
|
||||
// vim: expandtab sw=4 ts=4 sts=4:
|
||||
|
||||
// Displays form for creating database (if user has priveleges for that)
|
||||
|
||||
require_once('./libraries/check_user_privileges.lib.php');
|
||||
|
||||
if ($is_create_priv) {
|
||||
// The user is allowed to create a db
|
||||
?>
|
||||
<form method="post" action="db_create.php"><b>
|
||||
<?php echo $strCreateNewDatabase . ' ' . PMA_showMySQLDocu('Reference', 'CREATE_DATABASE'); ?></b><br />
|
||||
<?php echo PMA_generate_common_hidden_inputs('', '', 5); ?>
|
||||
<input type="hidden" name="reload" value="1" />
|
||||
<input type="text" name="db" value="<?php echo $db_to_create; ?>" maxlength="64" class="textfield" />
|
||||
<?php
|
||||
if (PMA_MYSQL_INT_VERSION >= 40101) {
|
||||
require_once('./libraries/mysql_charsets.lib.php');
|
||||
echo PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'db_collation', NULL, NULL, TRUE, 5);
|
||||
}
|
||||
?>
|
||||
<input type="submit" value="<?php echo $strCreate; ?>" id="buttonGo" />
|
||||
</form>
|
||||
<?php
|
||||
} else {
|
||||
?>
|
||||
<!-- db creation no privileges message -->
|
||||
<b><?php echo $strCreateNewDatabase . ': ' . PMA_showMySQLDocu('Reference', 'CREATE_DATABASE'); ?></b><br />
|
||||
<?php
|
||||
echo '<span class="noPrivileges">'
|
||||
. ($cfg['ErrorIconic'] ? '<img src="' . $pmaThemeImage . 's_error2.png" width="11" height="11" hspace="2" border="0" align="middle" />' : '')
|
||||
. '' . $strNoPrivileges .'</span>';
|
||||
} // end create db form or message
|
||||
?>
|
||||
151
main.php
151
main.php
@@ -159,128 +159,8 @@ if (!$cfg['LeftDisplayServers']) {
|
||||
$is_superuser = FALSE;
|
||||
|
||||
if ($server > 0) {
|
||||
// Get user's global privileges ($dbh and $userlink are links to MySQL
|
||||
// defined in the "common.lib.php" library)
|
||||
// Note: if no controluser is defined, $dbh contains $userlink
|
||||
|
||||
$is_create_priv = FALSE;
|
||||
$is_process_priv = TRUE;
|
||||
$is_reload_priv = FALSE;
|
||||
$db_to_create = '';
|
||||
|
||||
// We were trying to find if user if superuser with 'USE mysql'
|
||||
// but users with the global priv CREATE TEMPORARY TABLES or LOCK TABLES
|
||||
// can do a 'USE mysql' (even if they cannot see the tables)
|
||||
$is_superuser = PMA_DBI_try_query('SELECT COUNT(*) FROM mysql.user', $userlink, PMA_DBI_QUERY_STORE);
|
||||
|
||||
function PMA_analyseShowGrant($rs_usr, &$is_create_priv, &$db_to_create, &$is_reload_priv) {
|
||||
|
||||
$re0 = '(^|(\\\\\\\\)+|[^\])'; // non-escaped wildcards
|
||||
$re1 = '(^|[^\])(\\\)+'; // escaped wildcards
|
||||
while ($row = PMA_DBI_fetch_row($rs_usr)) {
|
||||
$show_grants_dbname = substr($row[0], strpos($row[0], ' ON ') + 4,(strpos($row[0], '.', strpos($row[0], ' ON ')) - strpos($row[0], ' ON ') - 4));
|
||||
$show_grants_dbname = ereg_replace('^`(.*)`','\\1', $show_grants_dbname);
|
||||
$show_grants_str = substr($row[0],6,(strpos($row[0],' ON ')-6));
|
||||
if (($show_grants_str == 'ALL') || ($show_grants_str == 'ALL PRIVILEGES') || ($show_grants_str == 'CREATE') || strpos($show_grants_str, 'CREATE')) {
|
||||
if ($show_grants_dbname == '*') {
|
||||
$is_create_priv = TRUE;
|
||||
$is_reload_priv = TRUE;
|
||||
$db_to_create = '';
|
||||
break;
|
||||
} // end if
|
||||
else if ( (ereg($re0 . '%|_', $show_grants_dbname)
|
||||
&& !ereg('\\\\%|\\\\_', $show_grants_dbname))
|
||||
|| (!PMA_DBI_try_query('USE ' . ereg_replace($re1 .'(%|_)', '\\1\\3', $show_grants_dbname)) && substr(PMA_DBI_getError(), 1, 4) != 1044)
|
||||
) {
|
||||
$db_to_create = ereg_replace($re0 . '%', '\\1...', ereg_replace($re0 . '_', '\\1?', $show_grants_dbname));
|
||||
$db_to_create = ereg_replace($re1 . '(%|_)', '\\1\\3', $db_to_create);
|
||||
$is_create_priv = TRUE;
|
||||
break;
|
||||
} // end elseif
|
||||
} // end if
|
||||
} // end while
|
||||
} // end function
|
||||
|
||||
// Detection for some CREATE privilege.
|
||||
|
||||
// Since MySQL 4.1.2, we can easily detect current user's grants
|
||||
// using $userlink (no control user needed)
|
||||
// and we don't have to try any other method for detection
|
||||
|
||||
if (PMA_MYSQL_INT_VERSION >= 40102) {
|
||||
$rs_usr = PMA_DBI_try_query('SHOW GRANTS', $userlink, PMA_DBI_QUERY_STORE);
|
||||
if ($rs_usr) {
|
||||
PMA_analyseShowGrant($rs_usr,$is_create_priv, $db_to_create, $is_reload_priv);
|
||||
PMA_DBI_free_result($rs_usr);
|
||||
unset($rs_usr);
|
||||
}
|
||||
} else {
|
||||
|
||||
// Before MySQL 4.1.2, we first try to find a priv in mysql.user. Hopefuly
|
||||
// the controluser is correctly defined; but here, $dbh could contain
|
||||
// $userlink so maybe the SELECT will fail
|
||||
|
||||
if (!$is_create_priv) {
|
||||
$local_query = 'SELECT Create_priv, Reload_priv FROM mysql.user WHERE ' . PMA_convert_using('User') . ' = ' . PMA_convert_using(PMA_sqlAddslashes($mysql_cur_user), 'quoted') . ' OR ' . PMA_convert_using('User') . ' = ' . PMA_convert_using('', 'quoted') . ';';
|
||||
$rs_usr = PMA_DBI_try_query($local_query, $dbh); // Debug: or PMA_mysqlDie('', $local_query, FALSE);
|
||||
if ($rs_usr) {
|
||||
while ($result_usr = PMA_DBI_fetch_assoc($rs_usr)) {
|
||||
if (!$is_create_priv) {
|
||||
$is_create_priv = ($result_usr['Create_priv'] == 'Y');
|
||||
}
|
||||
if (!$is_reload_priv) {
|
||||
$is_reload_priv = ($result_usr['Reload_priv'] == 'Y');
|
||||
}
|
||||
} // end while
|
||||
PMA_DBI_free_result($rs_usr);
|
||||
unset($rs_usr, $result_usr);
|
||||
} // end if
|
||||
} // end if
|
||||
|
||||
// If the user has Create priv on a inexistant db, show him in the dialog
|
||||
// the first inexistant db name that we find, in most cases it's probably
|
||||
// the one he just dropped :)
|
||||
if (!$is_create_priv) {
|
||||
$local_query = 'SELECT DISTINCT Db FROM mysql.db WHERE ' . PMA_convert_using('Create_priv') . ' = ' . PMA_convert_using('Y', 'quoted') . ' AND (' . PMA_convert_using('User') . ' = ' .PMA_convert_using(PMA_sqlAddslashes($mysql_cur_user), 'quoted') . ' OR ' . PMA_convert_using('User') . ' = ' . PMA_convert_using('', 'quoted') . ');';
|
||||
$rs_usr = PMA_DBI_try_query($local_query, $dbh, PMA_DBI_QUERY_STORE);
|
||||
if ($rs_usr) {
|
||||
$re0 = '(^|(\\\\\\\\)+|[^\])'; // non-escaped wildcards
|
||||
$re1 = '(^|[^\])(\\\)+'; // escaped wildcards
|
||||
while ($row = PMA_DBI_fetch_assoc($rs_usr)) {
|
||||
if (ereg($re0 . '(%|_)', $row['Db'])
|
||||
|| (!PMA_DBI_try_query('USE ' . ereg_replace($re1 . '(%|_)', '\\1\\3', $row['Db'])) && substr(PMA_DBI_getError(), 1, 4) != 1044)) {
|
||||
$db_to_create = ereg_replace($re0 . '%', '\\1...', ereg_replace($re0 . '_', '\\1?', $row['Db']));
|
||||
$db_to_create = ereg_replace($re1 . '(%|_)', '\\1\\3', $db_to_create);
|
||||
$is_create_priv = TRUE;
|
||||
break;
|
||||
} // end if
|
||||
} // end while
|
||||
PMA_DBI_free_result($rs_usr);
|
||||
unset($rs_usr, $row, $re0, $re1);
|
||||
} // end if
|
||||
else {
|
||||
// Finally, let's try to get the user's privileges by using SHOW
|
||||
// GRANTS...
|
||||
// Maybe we'll find a little CREATE priv there :)
|
||||
$rs_usr = PMA_DBI_try_query('SHOW GRANTS FOR ' . $mysql_cur_user_and_host . ';', $dbh, PMA_DBI_QUERY_STORE);
|
||||
if (!$rs_usr) {
|
||||
// OK, now we'd have to guess the user's hostname, but we
|
||||
// only try out the 'username'@'%' case.
|
||||
$rs_usr = PMA_DBI_try_query('SHOW GRANTS FOR ' . $mysql_cur_user . ';', $dbh, PMA_DBI_QUERY_STORE);
|
||||
}
|
||||
unset($local_query);
|
||||
if ($rs_usr) {
|
||||
PMA_analyseShowGrant($rs_usr,$is_create_priv, $db_to_create, $is_reload_priv);
|
||||
PMA_DBI_free_result($rs_usr);
|
||||
unset($rs_usr);
|
||||
} // end if
|
||||
} // end elseif
|
||||
} // end if
|
||||
} // end else (MySQL < 4.1.2)
|
||||
|
||||
if (!$cfg['SuggestDBName']) {
|
||||
$db_to_create = '';
|
||||
}
|
||||
require_once('./libraries/check_user_privileges.lib.php');
|
||||
|
||||
$common_url_query = PMA_generate_common_url();
|
||||
|
||||
@@ -309,34 +189,7 @@ function PMA_analyseShowGrant($rs_usr, &$is_create_priv, &$db_to_create, &$is_re
|
||||
?>
|
||||
<!-- db creation form -->
|
||||
<td valign="top" align="<?php echo $cell_align_left; ?>" nowrap="nowrap">
|
||||
<?php
|
||||
if ($is_create_priv) {
|
||||
// The user is allowed to create a db
|
||||
?>
|
||||
<form method="post" action="db_create.php"><b>
|
||||
<?php echo $strCreateNewDatabase . ' ' . PMA_showMySQLDocu('Reference', 'CREATE_DATABASE'); ?></b><br />
|
||||
<?php echo PMA_generate_common_hidden_inputs('', '', 5); ?>
|
||||
<input type="hidden" name="reload" value="1" />
|
||||
<input type="text" name="db" value="<?php echo $db_to_create; ?>" maxlength="64" class="textfield" />
|
||||
<?php
|
||||
if (PMA_MYSQL_INT_VERSION >= 40101) {
|
||||
require_once('./libraries/mysql_charsets.lib.php');
|
||||
echo PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'db_collation', NULL, NULL, TRUE, 5);
|
||||
}
|
||||
?>
|
||||
<input type="submit" value="<?php echo $strCreate; ?>" id="buttonGo" />
|
||||
</form>
|
||||
<?php
|
||||
} else {
|
||||
?>
|
||||
<!-- db creation no privileges message -->
|
||||
<b><?php echo $strCreateNewDatabase . ': ' . PMA_showMySQLDocu('Reference', 'CREATE_DATABASE'); ?></b><br />
|
||||
<?php
|
||||
echo '<span class="noPrivileges">'
|
||||
. ($cfg['ErrorIconic'] ? '<img src="' . $pmaThemeImage . 's_error2.png" width="11" height="11" hspace="2" border="0" align="middle" />' : '')
|
||||
. '' . $strNoPrivileges .'</span>';
|
||||
} // end create db form or message
|
||||
?>
|
||||
<?php require('./libraries/display_create_database.lib.php'); ?>
|
||||
</td>
|
||||
</tr>
|
||||
<?php
|
||||
|
||||
@@ -398,23 +398,7 @@ if (count($statistics) > 0) {
|
||||
/**
|
||||
* Create new database.
|
||||
*/
|
||||
?>
|
||||
|
||||
<form method="post" action="db_create.php"><b>
|
||||
<?php echo $strCreateNewDatabase . ' ' . PMA_showMySQLDocu('Reference', 'CREATE_DATABASE'); ?></b><br />
|
||||
<?php echo PMA_generate_common_hidden_inputs('', '', 5); ?>
|
||||
<input type="hidden" name="reload" value="1" />
|
||||
<input type="text" name="db" value="" maxlength="64" class="textfield" />
|
||||
<?php
|
||||
if (PMA_MYSQL_INT_VERSION >= 40101) {
|
||||
require_once('./libraries/mysql_charsets.lib.php');
|
||||
echo PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'db_collation', NULL, NULL, TRUE, 5);
|
||||
}
|
||||
?>
|
||||
<input type="submit" value="<?php echo $strCreate; ?>" id="buttonGo" />
|
||||
</form>
|
||||
|
||||
<?php
|
||||
require('./libraries/display_create_database.lib.php');
|
||||
|
||||
/**
|
||||
* Sends the footer
|
||||
|
||||
Reference in New Issue
Block a user