mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-05 00:07:44 +02:00
Code Issues Releases Wiki Activity

Merge pull request #1290 from nickvergessen/ticket/11362

Browse Source 
Correctly sanitise the directory path in finder
This commit is contained in:
Nils Adermann
2013-04-24 09:45:34 -07:00
parent ab628cbdb9 16e70fa086
commit 3e32655c7f
13 changed files with 125 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
phpBB/includes/functions.php
View File

@@ -1049,31 +1049,33 @@ else
/**
* Eliminates useless . and .. components from specified path.
*
* Deprecated, use filesystem class instead
*
* @param string $path Path to clean
* @return string Cleaned path
*
* @deprecated
*/
function phpbb_clean_path($path)
{
$exploded = explode('/', $path);
$filtered = array();
foreach ($exploded as $part)
{
if ($part === '.' && !empty($filtered))
{
continue;
}
global $phpbb_container;
if ($part === '..' && !empty($filtered) && $filtered[sizeof($filtered) - 1] !== '..')
{
array_pop($filtered);
}
else
{
$filtered[] = $part;
}
if ($phpbb_container)
{
$phpbb_filesystem = $phpbb_container->get('filesystem');
}
$path = implode('/', $filtered);
return $path;
else
{
// The container is not yet loaded, use a new instance
if (!class_exists('phpbb_filesystem'))
{
global $phpbb_root_path, $phpEx;
require($phpbb_root_path . 'includes/filesystem.' . $phpEx);
}
$phpbb_filesystem = new phpbb_filesystem();
}
return $phpbb_filesystem->clean_path($path);
}
// functions used for building option fields