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

Merge branch 'ticket/security-180' into ticket/security-180-asc

Browse source 
Conflicts:
	tests/security/redirect_test.php
This commit is contained in:
Marc Alexander 2015-04-23 22:23:21 +02:00 • committed by Andreas Fischer
commit 416728fc17
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/functions.php
View file

@ -2309,7 +2309,7 @@ function redirect($url, $return = false, $disable_cd_check = false)
// Attention: only able to redirect within the same domain if $disable_cd_check is false (yourdomain.com -> www.yourdomain.com will not work) // Attention: only able to redirect within the same domain if $disable_cd_check is false (yourdomain.com -> www.yourdomain.com will not work)
if (!$disable_cd_check && $url_parts['host'] !== $user->host) if (!$disable_cd_check && $url_parts['host'] !== $user->host)
{ {
$url = generate_board_url(); trigger_error('Tried to redirect to potentially insecure url.', E_USER_ERROR);
} }
} }
else if ($url[0] == '/') else if ($url[0] == '/')

10
tests/security/redirect_test.php
View file

@ -23,9 +23,9 @@ class phpbb_security_redirect_test extends phpbb_security_test_base
{ {
// array(Input -> redirect(), expected triggered error (else false), expected returned result url (else false)) // array(Input -> redirect(), expected triggered error (else false), expected returned result url (else false))
return array( return array(
array('data://x', false, false, 'http://localhost/phpBB'), array('data://x', false, 'INSECURE_REDIRECT', false),
array('bad://localhost/phpBB/index.php', false, 'INSECURE_REDIRECT', false), array('bad://localhost/phpBB/index.php', false, 'INSECURE_REDIRECT', false),
array('http://www.otherdomain.com/somescript.php', false, false, 'http://localhost/phpBB'), array('http://www.otherdomain.com/somescript.php', false, 'INSECURE_REDIRECT', false),
array("http://localhost/phpBB/memberlist.php\n\rConnection: close", false, 'INSECURE_REDIRECT', false), array("http://localhost/phpBB/memberlist.php\n\rConnection: close", false, 'INSECURE_REDIRECT', false),
array('javascript:test', false, false, 'http://localhost/phpBB/javascript:test'), array('javascript:test', false, false, 'http://localhost/phpBB/javascript:test'),
array('http://localhost/phpBB/index.php;url=', false, 'INSECURE_REDIRECT', false), array('http://localhost/phpBB/index.php;url=', false, 'INSECURE_REDIRECT', false),
@ -51,9 +51,11 @@ class phpbb_security_redirect_test extends phpbb_security_test_base
array('../index.php', false, false, 'http://localhost/index.php'), array('../index.php', false, false, 'http://localhost/index.php'),
array('../index.php', true, false, 'http://localhost/index.php'), array('../index.php', true, false, 'http://localhost/index.php'),
array('./index.php', false, false, 'http://localhost/phpBB/index.php'), array('./index.php', false, false, 'http://localhost/phpBB/index.php'),
array('https://foobar.com\@http://localhost/phpBB', false, false, 'http://localhost/phpBB'), array('https://foobar.com\@http://localhost/phpBB', false, 'INSECURE_REDIRECT', false),
array('https://foobar.com\@localhost/troll/http://localhost/', false, 'INSECURE_REDIRECT', false), array('https://foobar.com\@localhost/troll/http://localhost/', false, 'INSECURE_REDIRECT', false),
array('http://localhost.foobar.com\@localhost/troll/http://localhost/', false, 'INSECURE_REDIRECT', false), array('http://localhost.foobar.com\@localhost/troll/http://localhost/', false, 'INSECURE_REDIRECT', false),
array('http://localhost/phpBB', false, false, 'http://localhost/phpBB'),
array('http://localhost/phpBB/', false, false, 'http://localhost/phpBB/'),
); );
} }
@ -108,7 +110,7 @@ class phpbb_security_redirect_test extends phpbb_security_test_base
if ($expected_error !== false) if ($expected_error !== false)
{ {
$this->setExpectedTriggerError(E_USER_ERROR, $expected_error); $this->setExpectedTriggerError(E_USER_ERROR, $user->lang[$expected_error]);
} }
$result = redirect($test, true, $disable_cd_check); $result = redirect($test, true, $disable_cd_check);