diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-04-11 17:08:28 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-04-11 17:08:28 +0200 |
| commit | ee658bfe7bd284573d199c3c2a76007c5509695d (patch) | |
| tree | 5252d1b2b57a246f9bb456cc7aa0c604d8a9a8a4 | |
| parent | bca1b96b2e9235bbb4a3e7a104dd79e7f3761679 (diff) | |
| download | forums-ee658bfe7bd284573d199c3c2a76007c5509695d.tar forums-ee658bfe7bd284573d199c3c2a76007c5509695d.tar.gz forums-ee658bfe7bd284573d199c3c2a76007c5509695d.tar.bz2 forums-ee658bfe7bd284573d199c3c2a76007c5509695d.tar.xz forums-ee658bfe7bd284573d199c3c2a76007c5509695d.zip | |
[ticket/security-180] Always fail when redirecting to an insecure URL
SECURITY-180
| -rw-r--r-- | phpBB/includes/functions.php | 2 | ||||
| -rw-r--r-- | tests/security/redirect_test.php | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index a6a98954de..f2bc63cf23 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] == '/') diff --git a/tests/security/redirect_test.php b/tests/security/redirect_test.php index 46ec5c8edb..9161bcbfe8 100644 --- a/tests/security/redirect_test.php +++ b/tests/security/redirect_test.php @@ -18,13 +18,13 @@ 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', false, 'http://localhost/phpBB'), + 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), ); |