[mxbb-commits] core/install mx_install.php,1.54,1.55

[Andrew N. \(MHobbit\) <men...@us...>]

Update of /cvsroot/mxbb/core/install
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17628/install

Modified Files:
	mx_install.php 
Log Message:
Security updates for the globals et all... perhaps include() for mxBB's common.php would do, in the future....

Index: mx_install.php
===================================================================
RCS file: /cvsroot/mxbb/core/install/mx_install.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** mx_install.php	25 Nov 2005 03:05:26 -0000	1.54
--- mx_install.php	27 Nov 2005 02:14:47 -0000	1.55
***************
*** 90,97 ****
  set_magic_quotes_runtime(0); // Disable magic_quotes_runtime
  
! // The following code (unsetting globals) was contributed by Matt Kavanagh
  
  // PHP5 with register_long_arrays off?
! if (!isset($HTTP_POST_VARS) && isset($_POST))
  {
  	$HTTP_POST_VARS = $_POST;
--- 90,98 ----
  set_magic_quotes_runtime(0); // Disable magic_quotes_runtime
  
! // The following code (unsetting globals)
! // Thanks to Matt Kavanagh and Stefan Esser for providing feedback as well as patch files
  
  // PHP5 with register_long_arrays off?
! if (@phpversion() >= '5.0.0' && (!ini_get('register_long_arrays') || @ini_get('register_long_arrays') == '0' || strtolower(@ini_get('register_long_arrays')) == 'off'))
  {
  	$HTTP_POST_VARS = $_POST;
***************
*** 109,135 ****
  }
  
! if (@phpversion() < '4.0.0')
  {
! 	// PHP3 path; in PHP3, globals are _always_ registered
! 	
! 	// We 'flip' the array of variables to test like this so that
! 	// we can validate later with isset($test[$var]) (no in_array())
! 	$test = array('HTTP_GET_VARS' => NULL, 'HTTP_POST_VARS' => NULL, 'HTTP_COOKIE_VARS' => NULL, 'HTTP_SERVER_VARS' => NULL, 'HTTP_ENV_VARS' => NULL, 'HTTP_POST_FILES' => NULL, 'phpEx' => NULL, 'phpbb_root_path' => NULL);
  
! 	// Loop through each input array
! 	@reset($test);
! 	while (list($input,) = @each($test))
! 	{
! 		while (list($var,) = @each($$input))
! 		{
! 			// Validate the variable to be unset
! 			if (!isset($test[$var]) && $var != 'test' && $var != 'input')
! 			{
! 				unset($$var);
! 			}
! 		}
! 	}
  }
! else if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on')
  {
  	// PHP4+ path
--- 110,126 ----
  }
  
! // Protect against GLOBALS tricks
! if (isset($HTTP_POST_VARS['GLOBALS']) || isset($HTTP_POST_FILES['GLOBALS']) || isset($HTTP_GET_VARS['GLOBALS']) || isset($HTTP_COOKIE_VARS['GLOBALS']))
  {
! 	die("Hacking attempt");
! }
  
! // Protect against HTTP_SESSION_VARS tricks
! if (isset($HTTP_SESSION_VARS) && !is_array($HTTP_SESSION_VARS))
! {
! 	die("Hacking attempt");
  }
! 
! if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on')
  {
  	// PHP4+ path
***************
*** 139,143 ****
  	// is not an array, it will actually fail. So we check if
  	// HTTP_SESSION_VARS has been initialised.
! 	if (!isset($HTTP_SESSION_VARS))
  	{
  		$HTTP_SESSION_VARS = array();
--- 130,134 ----
  	// is not an array, it will actually fail. So we check if
  	// HTTP_SESSION_VARS has been initialised.
! 		if (!isset($HTTP_SESSION_VARS) || !is_array($HTTP_SESSION_VARS))
  	{
  		$HTTP_SESSION_VARS = array();
***************
*** 158,162 ****
  		}
  	}
!    
  	unset($input);
  }
--- 149,153 ----
  		}
  	}
! 
  	unset($input);
  }