makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11997] Correctly redirect to front controllers

Browse source 
We currently do a lot of checks in order to prevent users from getting to
a 404 page. However, this logic relies on checking if a file or folder exists.
Due to the front controllers and the URL rewriting in 3.1, it is no longer
possible to rely on existing files for redirecting. This patch will take
care of properly redirecting users to front controller files. An incorrect
link will cause users to get a 404 error though.

PHPBB3-11997
This commit is contained in:
Marc Alexander 2013-11-08 23:12:42 +01:00
parent 082a467cc8
commit 60dda5577d
2 changed files with 21 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
phpBB/includes/functions.php
View file

@ -999,7 +999,9 @@ function phpbb_own_realpath($path)
// @internal The slash in is_dir() gets around an open_basedir restriction
if (!@file_exists($resolved) || (!@is_dir($resolved . '/') && !is_file($resolved)))
{
return false;
// In order to allow proper URL rewriting we need to allow
// paths that are non-existent
//return false;
}
// Put the slashes back to the native operating systems slashes
@ -2696,20 +2698,6 @@ function redirect($url, $return = false, $disable_cd_check = false)
// Relative uri
$pathinfo = pathinfo($url);
if (!$disable_cd_check && !file_exists($pathinfo['dirname'] . '/'))
{
$url = str_replace('../', '', $url);
$pathinfo = pathinfo($url);
if (!file_exists($pathinfo['dirname'] . '/'))
{
// fallback to "last known user page"
// at least this way we know the user does not leave the phpBB root
$url = generate_board_url() . '/' . $user->page['page'];
$failover_flag = true;
}
}
if (!$failover_flag)
{
// Is the uri pointing to the current directory?
@ -2723,14 +2711,7 @@ function redirect($url, $return = false, $disable_cd_check = false)
$url = substr($url, 1);
}
if ($user->page['page_dir'])
{
$url = generate_board_url() . '/' . $user->page['page_dir'] . '/' . $url;
}
else
{
$url = generate_board_url() . '/' . $url;
}
$url = generate_board_url() . '/' . $url;
}
else
{
@ -2741,8 +2722,9 @@ function redirect($url, $return = false, $disable_cd_check = false)
$root_dirs = array_diff_assoc($root_dirs, $intersection);
$page_dirs = array_diff_assoc($page_dirs, $intersection);
$root_dirs_size = sizeof($root_dirs) - 2;
$dir = str_repeat('../', sizeof($root_dirs)) . implode('/', $page_dirs);
$dir = (($root_dirs_size > 0) ? str_repeat('../', $root_dirs_size) : '') . implode('/', $page_dirs);
// Strip / from the end
if ($dir && substr($dir, -1, 1) == '/')

16
tests/security/redirect_test.php
View file

@ -21,8 +21,22 @@ class phpbb_security_redirect_test extends phpbb_security_test_base
array('bad://localhost/phpBB/index.php', 'INSECURE_REDIRECT', false),
array('http://www.otherdomain.com/somescript.php', false, 'http://localhost/phpBB'),
array("http://localhost/phpBB/memberlist.php\n\rConnection: close", 'INSECURE_REDIRECT', false),
array('javascript:test', false, 'http://localhost/phpBB/../javascript:test'),
array('javascript:test', false, 'http://localhost/phpBB/javascript:test'),
array('http://localhost/phpBB/index.php;url=', 'INSECURE_REDIRECT', false),
array('http://localhost/phpBB/app.php/foobar', false, 'http://localhost/phpBB/app.php/foobar'),
array('./app.php/foobar', false, 'http://localhost/phpBB/app.php/foobar'),
array('app.php/foobar', false, 'http://localhost/phpBB/app.php/foobar'),
array('./../app.php/foobar', false, 'http://localhost/phpBB/app.php/foobar'),
array('./../app.php/foo/bar', false, 'http://localhost/phpBB/app.php/foo/bar'),
array('./../foo/bar', false, 'http://localhost/phpBB/foo/bar'),
array('app.php/', false, 'http://localhost/phpBB/app.php/'),
array('./app.php/', false, 'http://localhost/phpBB/app.php/'),
array('foobar', false, 'http://localhost/phpBB/foobar'),
array('./foobar', false, 'http://localhost/phpBB/foobar'),
array('foo/bar', false, 'http://localhost/phpBB/foo/bar'),
array('./foo/bar', false, 'http://localhost/phpBB/foo/bar'),
array('./../index.php', false, 'http://localhost/phpBB/index.php'),
array('../index.php', false, 'http://localhost/phpBB/index.php'),
);
}