diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-04-23 22:23:21 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-04-28 22:12:03 +0200 |
| commit | 416728fc172b03e06b376ca7efb085af27985dbb (patch) | |
| tree | d72eca610d512b0ca957fbc20b7749f28070e39d | |
| parent | ec207d0a71ba2c15e7cdcb2b59acd93aaa011223 (diff) | |
| parent | 18fc621d73757ef793fba08f7da4e048b293a059 (diff) | |
| download | forums-416728fc172b03e06b376ca7efb085af27985dbb.tar forums-416728fc172b03e06b376ca7efb085af27985dbb.tar.gz forums-416728fc172b03e06b376ca7efb085af27985dbb.tar.bz2 forums-416728fc172b03e06b376ca7efb085af27985dbb.tar.xz forums-416728fc172b03e06b376ca7efb085af27985dbb.zip | |
Merge branch 'ticket/security-180' into ticket/security-180-asc
Conflicts:
tests/security/redirect_test.php
| -rw-r--r-- | phpBB/includes/functions.php | 2 | ||||
| -rw-r--r-- | tests/security/redirect_test.php | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index fcfed8b2a4..e00231c360 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -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) 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 0631365292..a88fc63858 100644 --- a/tests/security/redirect_test.php +++ b/tests/security/redirect_test.php @@ -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)) 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('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('javascript:test', false, false, 'http://localhost/phpBB/javascript:test'), 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', true, false, 'http://localhost/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('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) { - $this->setExpectedTriggerError(E_USER_ERROR, $expected_error); + $this->setExpectedTriggerError(E_USER_ERROR, $user->lang[$expected_error]); } $result = redirect($test, true, $disable_cd_check); |