sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

General: wp_safe_redirect() and wp_redirect() shouldn't allow non-3xx status codes 

Redirects should use redirect status codes and if you attempt to call wp_safe_redirect or wp_redirect with a non redirect status it can lead to undesired behavior and head scratching.

Fixes #44317.
Props spenserhale, johnbillion, mjnewman for initial patch.



git-svn-id: https://develop.svn.wordpress.org/trunk@46641 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Aaron Jorbin 2019-11-03 22:08:56 +00:00
parent 84c794ba41
commit 40946e984a
2 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/wp-includes/pluggable.php
View File

@ -1215,6 +1215,7 @@ if ( ! function_exists( 'wp_redirect' ) ) :
*
* @since 1.5.1
* @since 5.1.0 The `$x_redirect_by` parameter was added.
* @since 5.4.0 On invalid status codes, wp_die() is called.
*
* @global bool $is_IIS
*
@ -1250,6 +1251,10 @@ if ( ! function_exists( 'wp_redirect' ) ) :
return false;
}
if ( 300 > $status || 399 < $status ) {
wp_die( __( 'HTTP redirect status code must be a redirection code, 3xx.' ) );
}
$location = wp_sanitize_redirect( $location );
if ( ! $is_IIS && PHP_SAPI != 'cgi-fcgi' ) {

47
tests/phpunit/tests/pluggable.php
View File

@ -5,6 +5,53 @@
*/
class Tests_Pluggable extends WP_UnitTestCase {
/**
* @dataProvider get_good_status_codes
*
* @ticket 44317
* @param string $location The path or URL to redirect to.
* @param int $status HTTP response status code to use.
*/
public function test_wp_redirect_good_status_code( $location, $status ) {
$this->assertTrue( wp_redirect( $location, $status ) );
}
public function get_good_status_codes() {
return [
// Expected Statuses
[ '/wp-admin', 301 ],
[ '/wp-admin', 302 ],
[ '/wp-admin', 307 ],
// Outliers that are valid
[ '/wp-admin', 300 ],
[ '/wp-admin', 399 ],
];
}
/**
* @expectedException WPDieException
* @dataProvider get_bad_status_codes
*
* @ticket 44317
* @param string $location The path or URL to redirect to.
* @param int $status HTTP response status code to use.
*/
public function test_wp_redirect_bad_status_code( $location, $status ) {
wp_redirect( $location, $status );
}
public function get_bad_status_codes() {
return [
// Tests for bad arguments
[ '/wp-admin', 404 ],
[ '/wp-admin', 410 ],
[ '/wp-admin', 500 ],
// Tests for condition.
[ '/wp-admin', 299 ],
[ '/wp-admin', 400 ],
];
}
/**
* Tests that the signatures of all functions in pluggable.php match their expected signature.
*