[ticket/security-180] Make sure that redirect goes to full URL plus slash

SECURITY-180
This commit is contained in:
Marc Alexander 2015-04-11 16:41:20 +02:00
parent eed355b798
commit bca1b96b2e
2 changed files with 4 additions and 1 deletions

View file

@ -2580,7 +2580,7 @@ function redirect($url, $return = false, $disable_cd_check = false)
} }
// Make sure we don't redirect to external URLs // Make sure we don't redirect to external URLs
if (!$disable_cd_check && strpos($url, generate_board_url(true)) !== 0) if (!$disable_cd_check && strpos($url, generate_board_url(true) . '/') !== 0)
{ {
trigger_error('Tried to redirect to potentially insecure url.', E_USER_ERROR); trigger_error('Tried to redirect to potentially insecure url.', E_USER_ERROR);
} }

View file

@ -24,6 +24,9 @@ class phpbb_security_redirect_test extends phpbb_security_test_base
array("http://localhost/phpBB/memberlist.php\n\rConnection: close", 'Tried to redirect to potentially insecure url.', false), array("http://localhost/phpBB/memberlist.php\n\rConnection: close", 'Tried to redirect to potentially insecure url.', 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=', 'Tried to redirect to potentially insecure url.', false), array('http://localhost/phpBB/index.php;url=', 'Tried to redirect to potentially insecure url.', false),
array('https://foobar.com\@http://localhost/phpBB', false, 'http://localhost/phpBB'),
array('https://foobar.com\@localhost/troll/http://localhost/', 'Tried to redirect to potentially insecure url.', false),
array('http://localhost.foobar.com\@localhost/troll/http://localhost/', 'Tried to redirect to potentially insecure url.', false),
); );
} }