mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00
Code Issues Releases Wiki Activity

Merge pull request #8 from phpbb/ticket/security-169

Browse Source 
[ticket/security-169] Stop loop through referer dir in top directory
This commit is contained in:
Joas Schilling 2014-11-22 15:51:48 +01:00
commit a3b18d87dd
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/phpbb/path_helper.php
View File

@ -282,10 +282,16 @@ class path_helper
$referer_dir = dirname($referer_dir);
}
while (strpos($absolute_board_url, $referer_dir) !== 0)
while (($dir_position = strpos($absolute_board_url, $referer_dir)) !== 0)
{
$fixed_root_path .= '../';
$referer_dir = dirname($referer_dir);
// Just return phpbb_root_path if we reach the top directory
if ($referer_dir === '.')
{
return $this->phpbb_root_path;
}
}
$fixed_root_path .= substr($absolute_board_url, strlen($referer_dir) + 1);

15
tests/path_helper/path_helper_test.php
View File

@ -411,6 +411,21 @@ class phpbb_path_helper_test extends phpbb_test_case
'http://www.phpbb.com/community',
'../community/',
),
array(
'http://www.phpbb.com/foobar',
'http://www.phpbb.com',
'',
),
array(
'http://www.foobar.com',
'http://www.phpbb.com',
'/www.phpbb.com/',
),
array(
'foobar',
'http://www.phpbb.com/community',
'',
)
);
}