aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-04-11 16:47:50 +0200
committerAndreas Fischer <bantu@phpbb.com>2015-04-28 22:08:15 +0200
commit89723b17d9c0a2984bcd52e41d8aabbbe03528d9 (patch)
tree3b066e6e2a86a3057ea53b2df0fdb81ca332b913 /tests/security
parentMerge branch 'prep-release-3.0.14' into prep-release-3.1.4 (diff)
parent[ticket/security-180] Make sure that redirect goes to full URL plus slash (diff)
downloadphpbb-89723b17d9c0a2984bcd52e41d8aabbbe03528d9.tar.gz
phpbb-89723b17d9c0a2984bcd52e41d8aabbbe03528d9.tar.bz2
phpbb-89723b17d9c0a2984bcd52e41d8aabbbe03528d9.zip
Merge branch 'ticket/security-180' into ticket/security-180-asc
Conflicts: tests/security/redirect_test.php
Diffstat (limited to 'tests/security')
-rw-r--r--tests/security/redirect_test.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/security/redirect_test.php b/tests/security/redirect_test.php
index 21fb103ed1..0631365292 100644
--- a/tests/security/redirect_test.php
+++ b/tests/security/redirect_test.php
@@ -51,6 +51,9 @@ 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\@localhost/troll/http://localhost/', false, 'INSECURE_REDIRECT', false),
+ array('http://localhost.foobar.com\@localhost/troll/http://localhost/', false, 'INSECURE_REDIRECT', false),
);
}