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

protect $import_blacklist from overwriting

Browse Source
This commit is contained in:
Sebastian Mendel
2005-12-06 14:51:49 +00:00
parent a49827a084
commit 5f3b086ed2
2 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -24,6 +24,7 @@ $Source$
- added PHP 5 constructor - added PHP 5 constructor
- added comments - added comments
- PEAR coding standard - PEAR coding standard
* libraries/grab_globals.lib.php: protect $import_blacklist from overwriting
2005-12-05 Sebastian Mendel <cybot_tm@users.sourceforge.net> 2005-12-05 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* libraries/common.lib.php: added PMA_array_merge_recursive() * libraries/common.lib.php: added PMA_array_merge_recursive()

48
libraries/grab_globals.lib.php
View File

@@ -74,7 +74,7 @@ if ( $__redirect || ! defined( 'PMA_NO_VARIABLES_IMPORT' ) ) {
/** /**
* copy values from one array to another, usally from a superglobal into $GLOBALS * copy values from one array to another, usally from a superglobal into $GLOBALS
* *
* @uses $GLOBALS['import_blacklist'] * @uses $GLOBALS['_import_blacklist']
* @uses preg_replace() * @uses preg_replace()
* @uses array_keys() * @uses array_keys()
* @uses array_unique() * @uses array_unique()
@@ -82,34 +82,34 @@ if ( $__redirect || ! defined( 'PMA_NO_VARIABLES_IMPORT' ) ) {
* @uses stripslashes() * @uses stripslashes()
* @param array $array values from * @param array $array values from
* @param array $target values to * @param array $target values to
* @param boolean $sanitize prevent importing key names in $import_blacklist * @param boolean $sanitize prevent importing key names in $_import_blacklist
*/ */
function PMA_gpc_extract($array, &$target, $sanitize = TRUE) { function PMA_gpc_extract($array, &$target, $sanitize = TRUE) {
if (!is_array($array)) { if (!is_array($array)) {
return FALSE; return FALSE;
} }
if ( $sanitize ) { if ( $sanitize ) {
$valid_variables = preg_replace( $GLOBALS['import_blacklist'], '', $valid_variables = preg_replace( $GLOBALS['_import_blacklist'], '',
array_keys( $array ) ); array_keys( $array ) );
$valid_variables = array_unique( $valid_variables ); $valid_variables = array_unique( $valid_variables );
} else { } else {
$valid_variables = array_keys( $array ); $valid_variables = array_keys( $array );
} }
$is_magic_quotes = get_magic_quotes_gpc(); $is_magic_quotes = get_magic_quotes_gpc();
foreach ( $valid_variables as $key ) { foreach ( $valid_variables as $key ) {
if ( strlen( $key ) === 0 ) { if ( strlen( $key ) === 0 ) {
continue; continue;
} }
if ( is_array( $array[$key] ) ) { if ( is_array( $array[$key] ) ) {
// there could be a variable coming from a cookie of // there could be a variable coming from a cookie of
// another application, with the same name as this array // another application, with the same name as this array
unset($target[$key]); unset($target[$key]);
PMA_gpc_extract($array[$key], $target[$key], FALSE); PMA_gpc_extract($array[$key], $target[$key], FALSE);
} elseif ($is_magic_quotes) { } elseif ($is_magic_quotes) {
$target[$key] = stripslashes($array[$key]); $target[$key] = stripslashes($array[$key]);
@@ -119,13 +119,13 @@ if ( $__redirect || ! defined( 'PMA_NO_VARIABLES_IMPORT' ) ) {
} }
return TRUE; return TRUE;
} }
/** /**
* @var array $import_blacklist variable names that should NEVER be imported * @var array $_import_blacklist variable names that should NEVER be imported
* from superglobals * from superglobals
*/ */
$import_blacklist = array( $_import_blacklist = array(
'/^cfg$/i', // PMA configuration '/^cfg$/i', // PMA configuration
'/^GLOBALS$/i', // the global scope '/^GLOBALS$/i', // the global scope
'/^str.*$/i', // PMA strings '/^str.*$/i', // PMA strings
@@ -134,15 +134,15 @@ if ( $__redirect || ! defined( 'PMA_NO_VARIABLES_IMPORT' ) ) {
'/^[0-9]+.*$/i', // numeric variable names '/^[0-9]+.*$/i', // numeric variable names
//'/^PMA_.*$/i', // other PMA variables //'/^PMA_.*$/i', // other PMA variables
); );
if (!empty($_GET)) { if (!empty($_GET)) {
PMA_gpc_extract($_GET, $GLOBALS); PMA_gpc_extract($_GET, $GLOBALS);
} // end if } // end if
if (!empty($_POST)) { if (!empty($_POST)) {
PMA_gpc_extract($_POST, $GLOBALS); PMA_gpc_extract($_POST, $GLOBALS);
} // end if (!empty($_POST)) } // end if (!empty($_POST))
if (!empty($_FILES)) { if (!empty($_FILES)) {
foreach ($_FILES AS $name => $value) { foreach ($_FILES AS $name => $value) {
$$name = $value['tmp_name']; $$name = $value['tmp_name'];
@@ -150,7 +150,7 @@ if ( $__redirect || ! defined( 'PMA_NO_VARIABLES_IMPORT' ) ) {
} }
unset( $name, $value ); unset( $name, $value );
} // end if } // end if
if (!empty($_SERVER)) { if (!empty($_SERVER)) {
$server_vars = array('PHP_SELF', 'HTTP_ACCEPT_LANGUAGE', 'HTTP_AUTHORIZATION'); $server_vars = array('PHP_SELF', 'HTTP_ACCEPT_LANGUAGE', 'HTTP_AUTHORIZATION');
foreach ( $server_vars as $current ) { foreach ( $server_vars as $current ) {
@@ -167,14 +167,14 @@ if ( $__redirect || ! defined( 'PMA_NO_VARIABLES_IMPORT' ) ) {
} }
unset( $server_vars, $current ); unset( $server_vars, $current );
} // end if } // end if
// Security fix: disallow accessing serious server files via "?goto=" // Security fix: disallow accessing serious server files via "?goto="
if (isset($goto) && strpos(' ' . $goto, '/') > 0 && substr($goto, 0, 2) != './') { if (isset($goto) && strpos(' ' . $goto, '/') > 0 && substr($goto, 0, 2) != './') {
unset($goto); unset($goto);
} // end if } // end if
unset( $import_blacklist ); unset( $_import_blacklist );
if ( ! empty( $__redirect ) ) { if ( ! empty( $__redirect ) ) {
// TODO: ensure that PMA_securePath() is defined and available // TODO: ensure that PMA_securePath() is defined and available
// for this script. Meanwhile we duplicate what this function does: // for this script. Meanwhile we duplicate what this function does:
@@ -183,7 +183,7 @@ if ( $__redirect || ! defined( 'PMA_NO_VARIABLES_IMPORT' ) ) {
} // end if ( ! empty( $__redirect ) ) } // end if ( ! empty( $__redirect ) )
} else { } else {
// Security fix: disallow accessing serious server files via "?goto=" // Security fix: disallow accessing serious server files via "?goto="
if ( isset( $_REQUEST['goto'] ) if ( isset( $_REQUEST['goto'] )
&& strpos( $_REQUEST['goto'], '\\' ) !== false && strpos( $_REQUEST['goto'], '\\' ) !== false
@@ -191,9 +191,9 @@ if ( $__redirect || ! defined( 'PMA_NO_VARIABLES_IMPORT' ) ) {
unset( $_REQUEST['goto'], $_GET['goto'], $_POST['goto'], unset( $_REQUEST['goto'], $_GET['goto'], $_POST['goto'],
$_COOKIE['goto'] ); $_COOKIE['goto'] );
} // end if } // end if
array_walk( $_SERVER, 'strip_tags' ); array_walk( $_SERVER, 'strip_tags' );
array_walk( $_ENV, 'strip_tags' ); array_walk( $_ENV, 'strip_tags' );
} }
?> ?>