diff options
| author | plegall <plg@piwigo.org> | 2013-02-11 21:52:29 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2013-02-11 21:52:29 +0000 |
| commit | ed1b88c5503f36353a186c60b299f14c4f3be498 (patch) | |
| tree | 5343907fcd8eb60d57db1dd32782cd216e730bc1 | |
| parent | 853dea3625dd757010897fac88575137cf0691bb (diff) | |
merge r20706 from branch 2.4 to trunk
bug 2843: filter $_GET['dl'], it must be a md5sum-like string and nothing else
git-svn-id: http://piwigo.org/svn/trunk@20707 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | install.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/install.php b/install.php index be217718c..a6d31be88 100644 --- a/install.php +++ b/install.php @@ -109,7 +109,11 @@ include(PHPWG_ROOT_PATH . 'include/config_default.inc.php'); @include(PHPWG_ROOT_PATH. 'local/config/config.inc.php'); defined('PWG_LOCAL_DIR') or define('PWG_LOCAL_DIR', 'local/'); +include(PHPWG_ROOT_PATH . 'include/functions.inc.php'); + // download database config file if exists +check_input_parameter('dl', $_GET, false, '/^[a-f0-9]{32}$/'); + if (!empty($_GET['dl']) && file_exists(PHPWG_ROOT_PATH.$conf['data_location'].'pwg_'.$_GET['dl'])) { $filename = PHPWG_ROOT_PATH.$conf['data_location'].'pwg_'.$_GET['dl']; @@ -156,7 +160,6 @@ if (@file_exists($config_file)) } include(PHPWG_ROOT_PATH . 'include/constants.php'); -include(PHPWG_ROOT_PATH . 'include/functions.inc.php'); include(PHPWG_ROOT_PATH . 'admin/include/functions.php'); include(PHPWG_ROOT_PATH . 'admin/include/languages.class.php'); @@ -284,6 +287,9 @@ define(\'DB_COLLATE\', \'\'); // writing the configuration file if ( !($fp = @fopen( $config_file, 'w' ))) { + // make sure nobody can list files of _data directory + secure_directory(PHPWG_ROOT_PATH.$conf['data_location']); + $tmp_filename = md5(uniqid(time())); $fh = @fopen( PHPWG_ROOT_PATH.$conf['data_location'] . 'pwg_' . $tmp_filename, 'w' ); @fputs($fh, $file_content, strlen($file_content)); |