diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-04-28 21:54:50 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-04-28 21:54:50 +0200 |
| commit | 1a3350619f428d9d69d196c52128727e27ef2f04 (patch) | |
| tree | 64416c9495b523161265bd733853e51ec30b867e | |
| parent | d833f290694e7545c0c4168cbf6c565bd52c43ba (diff) | |
| parent | 18fc621d73757ef793fba08f7da4e048b293a059 (diff) | |
| download | forums-1a3350619f428d9d69d196c52128727e27ef2f04.tar forums-1a3350619f428d9d69d196c52128727e27ef2f04.tar.gz forums-1a3350619f428d9d69d196c52128727e27ef2f04.tar.bz2 forums-1a3350619f428d9d69d196c52128727e27ef2f04.tar.xz forums-1a3350619f428d9d69d196c52128727e27ef2f04.zip | |
Merge remote-tracking branch 'phpbb-security/ticket/security-180' into prep-release-3.0.14
* phpbb-security/ticket/security-180:
[ticket/security-180] Add tests for redirecting to main URL
[ticket/security-180] Always fail when redirecting to an insecure URL
[ticket/security-180] Make sure that redirect goes to full URL plus slash
[ticket/security-180] Check if redirect URL contains board URL
| -rw-r--r-- | phpBB/includes/functions.php | 8 | ||||
| -rw-r--r-- | tests/security/redirect_test.php | 9 |
2 files changed, 14 insertions, 3 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 4ae6e7a018..2cef973a28 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2492,7 +2492,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) 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] == '/') @@ -2579,6 +2579,12 @@ function redirect($url, $return = false, $disable_cd_check = false) } } + // Make sure we don't redirect to external URLs + if (!$disable_cd_check && strpos($url, generate_board_url(true) . '/') !== 0) + { + trigger_error('Tried to redirect to potentially insecure url.', E_USER_ERROR); + } + // Make sure no linebreaks are there... to prevent http response splitting for PHP < 4.4.2 if (strpos(urldecode($url), "\n") !== false || strpos(urldecode($url), "\r") !== false || strpos($url, ';') !== false) { diff --git a/tests/security/redirect_test.php b/tests/security/redirect_test.php index 872a331dc7..9a24ba5d65 100644 --- a/tests/security/redirect_test.php +++ b/tests/security/redirect_test.php @@ -18,12 +18,17 @@ class phpbb_security_redirect_test extends phpbb_security_test_base { // array(Input -> redirect(), expected triggered error (else false), expected returned result url (else false)) return array( - array('data://x', false, 'http://localhost/phpBB'), + array('data://x', 'Tried to redirect to potentially insecure url.', false), array('bad://localhost/phpBB/index.php', 'Tried to redirect to potentially insecure url.', false), - array('http://www.otherdomain.com/somescript.php', false, 'http://localhost/phpBB'), + array('http://www.otherdomain.com/somescript.php', '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('http://localhost/phpBB/index.php;url=', 'Tried to redirect to potentially insecure url.', false), + array('https://foobar.com\@http://localhost/phpBB', 'Tried to redirect to potentially insecure url.', false), + 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), + array('http://localhost/phpBB', false, 'http://localhost/phpBB'), + array('http://localhost/phpBB/', false, 'http://localhost/phpBB/'), ); } |