diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-04-28 21:55:15 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-04-28 21:55:15 +0200 |
| commit | 2fb7ef26686f37a7f51367b47e9c8b0b7485d824 (patch) | |
| tree | da61cbe26c1c7c720ec09d7479db2d5cf321b0ae /phpBB/includes/functions.php | |
| parent | 6d8df7332cac920b5e8dd7dedf971789d30bc3cb (diff) | |
| parent | 1a3350619f428d9d69d196c52128727e27ef2f04 (diff) | |
| download | forums-2fb7ef26686f37a7f51367b47e9c8b0b7485d824.tar forums-2fb7ef26686f37a7f51367b47e9c8b0b7485d824.tar.gz forums-2fb7ef26686f37a7f51367b47e9c8b0b7485d824.tar.bz2 forums-2fb7ef26686f37a7f51367b47e9c8b0b7485d824.tar.xz forums-2fb7ef26686f37a7f51367b47e9c8b0b7485d824.zip | |
Merge branch 'prep-release-3.0.14' into 3.0.x
* prep-release-3.0.14:
[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
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 8 |
1 files changed, 7 insertions, 1 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) { |