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

undefined index

Browse Source
This commit is contained in:
Marc Delisle
2006-11-18 11:30:58 +00:00
parent 9afece0d52
commit 74d1c7de63
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -5,6 +5,9 @@ phpMyAdmin - ChangeLog
$Id$ $Id$
$Source$ $Source$
2006-11-18 Marc Delisle <lem9@users.sourceforge.net>
* index.php, libraries/common.lib.php: undefined index
2006-11-17 Michal Čihař <michal@cihar.com> 2006-11-17 Michal Čihař <michal@cihar.com>
* sql.php, libraries/display_tbl.lib.php: Force pos to be integer to avoid * sql.php, libraries/display_tbl.lib.php: Force pos to be integer to avoid
XSS. XSS.

2
index.php
View File

@@ -88,7 +88,7 @@ if (! isset($GLOBALS['db']) || ! strlen($GLOBALS['db'])) {
$url_query = PMA_generate_common_url($_GET); $url_query = PMA_generate_common_url($_GET);
if (is_string($GLOBALS['target']) && !empty($GLOBALS['target']) && in_array($GLOBALS['target'], $goto_whitelist)) { if (isset($GLOBALS['target']) && is_string($GLOBALS['target']) && !empty($GLOBALS['target']) && in_array($GLOBALS['target'], $goto_whitelist)) {
$main_target = $GLOBALS['target']; $main_target = $GLOBALS['target'];
} }

12
libraries/common.lib.php
View File

@@ -2885,7 +2885,7 @@ if (PMA_checkPageValidity($_REQUEST['back'], $goto_whitelist)) {
* Check whether user supplied token is valid, if not remove any * Check whether user supplied token is valid, if not remove any
* possibly dangerous stuff from request. * possibly dangerous stuff from request.
*/ */
if (!is_string($_REQUEST['token']) || empty($_REQUEST['token']) || $_SESSION[' PMA_token '] != $_REQUEST['token']) { if ((isset($_REQUEST['token']) && !is_string($_REQUEST['token'])) || empty($_REQUEST['token']) || $_SESSION[' PMA_token '] != $_REQUEST['token']) {
/* List of parameters which are allowed from unsafe source */ /* List of parameters which are allowed from unsafe source */
$allow_list = array( $allow_list = array(
'db', 'table', 'lang', 'server', 'convcharset', 'collation_connection', 'target', 'db', 'table', 'lang', 'server', 'convcharset', 'collation_connection', 'target',
@@ -2910,22 +2910,22 @@ if (!is_string($_REQUEST['token']) || empty($_REQUEST['token']) || $_SESSION[' P
unset($GLOBALS[$key]); unset($GLOBALS[$key]);
} else { } else {
// we require it to be a string // we require it to be a string
if (is_string($_REQUEST[$key])) { if (isset($_REQUEST[$key]) && is_string($_REQUEST[$key])) {
$_REQUEST[$key] = htmlspecialchars($_REQUEST[$key], ENT_QUOTES); $_REQUEST[$key] = htmlspecialchars($_REQUEST[$key], ENT_QUOTES);
} else { } else {
unset($_REQUEST[$key]); unset($_REQUEST[$key]);
} }
if (is_string($_POST[$key])) { if (isset($_POST[$key]) && is_string($_POST[$key])) {
$_POST[$key] = htmlspecialchars($_POST[$key], ENT_QUOTES); $_POST[$key] = htmlspecialchars($_POST[$key], ENT_QUOTES);
} else { } else {
unset($_POST[$key]); unset($_POST[$key]);
} }
if (is_string($_COOKIE[$key])) { if (isset($_COOKIE[$key]) && is_string($_COOKIE[$key])) {
$_COOKIE[$key] = htmlspecialchars($_COOKIE[$key], ENT_QUOTES); $_COOKIE[$key] = htmlspecialchars($_COOKIE[$key], ENT_QUOTES);
} else { } else {
unset($_COOKIE[$key]); unset($_COOKIE[$key]);
} }
if (is_string($_GET[$key])) { if (isset($_GET[$key]) && is_string($_GET[$key])) {
$_GET[$key] = htmlspecialchars($_GET[$key], ENT_QUOTES); $_GET[$key] = htmlspecialchars($_GET[$key], ENT_QUOTES);
} else { } else {
unset($_GET[$key]); unset($_GET[$key]);
@@ -3167,7 +3167,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
* present a choice of servers in the case that there are multiple servers * present a choice of servers in the case that there are multiple servers
* and '$cfg['ServerDefault'] = 0' is set. * and '$cfg['ServerDefault'] = 0' is set.
*/ */
if (is_string($_REQUEST['sever']) && ! empty($_REQUEST['server']) && ! empty($cfg['Servers'][$_REQUEST['server']])) { if (isset($_REQUEST['server']) && is_string($_REQUEST['server']) && ! empty($_REQUEST['server']) && ! empty($cfg['Servers'][$_REQUEST['server']])) {
$GLOBALS['server'] = $_REQUEST['server']; $GLOBALS['server'] = $_REQUEST['server'];
$cfg['Server'] = $cfg['Servers'][$GLOBALS['server']]; $cfg['Server'] = $cfg['Servers'][$GLOBALS['server']];
} else { } else {