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

moved stuff from grab_globals into common.inc.php (preprare removal of grab_globals)

Browse Source 
check/init global required variables like: $lang, $server, $db, $table, $convcharset, $goto
introduced $goto-whitelist
PEAR coding standard
This commit is contained in:
Sebastian Mendel
2005-12-12 12:48:00 +00:00
parent 75b4afbe4e
commit e3ff258e16
2 changed files with 611 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

837
libraries/common.lib.php
View File

File diff suppressed because it is too large Load Diff

128
libraries/grab_globals.lib.php
View File

@@ -13,26 +13,6 @@
*/ */
/** /**
* check if a subform is submitted
*/
$__redirect = NULL;
if ( isset( $_POST['usesubform'] ) ) {
// if a subform is present and should be used
// the rest of the form is deprecated
$subform_id = key( $_POST['usesubform'] );
$subform = $_POST['subform'][$subform_id];
$_POST = $subform;
if ( isset( $_POST['redirect'] )
&& $_POST['redirect'] != basename( $_SERVER['PHP_SELF'] ) ) {
$__redirect = $_POST['redirect'];
unset( $_POST['redirect'] );
} // end if ( isset( $_POST['redirect'] ) )
unset( $subform_id, $subform );
} // end if ( isset( $_POST['usesubform'] ) )
// end check if a subform is submitted
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']
@@ -45,129 +25,99 @@ if ( $__redirect || ! defined( 'PMA_NO_VARIABLES_IMPORT' ) ) {
* @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)) { {
return FALSE; if ( ! is_array($array) ) {
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]);
} else { } else {
$target[$key] = $array[$key]; $target[$key] = $array[$key];
} }
} }
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
'/^db$/i', // page to display
'/^table$/i', // page to display
'/^goto$/i', // page to display
'/^lang$/i', // selected language
'/^server$/i', // selected server
'/^convcharset$/i', // PMA convert charset
'/^collation_connection$/i', //
'/^set_theme$/i', //
'/^GLOBALS$/i', // the global scope '/^GLOBALS$/i', // the global scope
'/^str.*$/i', // PMA strings '/^str.*$/i', // PMA localized strings
'/^_.*$/i', // PMA does not use variables starting with _ from extern '/^_.*$/i', // PMA does not use variables starting with _ from extern
'/^.*\s+.*$/i', // no whitespaces anywhere '/^.*\s+.*$/i', // no whitespaces anywhere
'/^[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 }
if (!empty($_POST)) { if ( ! empty( $_POST ) ) {
PMA_gpc_extract($_POST, $GLOBALS); PMA_gpc_extract($_POST, $GLOBALS);
} // 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'];
${$name . '_name'} = $value['name']; ${$name . '_name'} = $value['name'];
} }
unset( $name, $value ); unset( $name, $value );
} // 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 ) {
// its not important HOW we detect html tags // its not important HOW we detect html tags
// its more important to prevent XSS // its more important to prevent XSS
// so its not important if we result in an invalid string, // so its not important if we result in an invalid string,
// its even better than a XSS capable string // its even better than a XSS capable string
if ( isset( $_SERVER[$current] ) && false === strpos( $_SERVER[$current], '<' ) ) { if ( isset( $_SERVER[$current] ) && false === strpos($_SERVER[$current], '<') ) {
$$current = $_SERVER[$current]; $$current = $_SERVER[$current];
// already importet by register_globals? // already importet by register_globals?
} elseif ( ! isset( $$current ) || false !== strpos( $$current, '<' ) ) { } elseif ( ! isset( $$current ) || false !== strpos($$current, '<') ) {
$$current = ''; $$current = '';
} }
} }
unset( $server_vars, $current ); unset( $server_vars, $current );
} // end if } // end if
// Security fix: disallow accessing serious server files via "?goto=" unset( $_import_blacklist );
if (isset($goto) && strpos(' ' . $goto, '/') > 0 && substr($goto, 0, 2) != './') {
unset($goto);
} // end if
unset( $_import_blacklist );
if ( ! empty( $__redirect ) ) {
// TODO: ensure that PMA_securePath() is defined and available
// for this script. Meanwhile we duplicate what this function does:
require('./' . preg_replace('@\.\.*@','.',$__redirect));
exit();
} // end if ( ! empty( $__redirect ) )
} else {
// Security fix: disallow accessing serious server files via "?goto="
if ( isset( $_REQUEST['goto'] )
&& strpos( $_REQUEST['goto'], '\\' ) !== false
&& strpos( $_REQUEST['goto'], '/' ) !== false ) {
unset( $_REQUEST['goto'], $_GET['goto'], $_POST['goto'],
$_COOKIE['goto'] );
} // end if
/**
* Recursive wrapper around strip_tags to process also arrays.
*
* @param mixed array or string to strip tags
*/
function array_strip_tags(&$item) {
if (is_array($item)) {
array_walk($item, 'array_strip_tags');
} else {
strip_tags($item);
}
}
array_walk( $_SERVER, 'array_strip_tags' );
array_walk( $_ENV, 'array_strip_tags' );
}
?> ?>