Changeset 40192

Timestamp:

03/06/2017 01:44:57 PM (10 years ago)

Author:

aaroncampbell

Message:

Strip control characters before validating redirect.

Merges [40183] to 3.9 branch.

Location:

branches/3.9

Files:

• . (modified) (1 prop)
• src/wp-includes/pluggable.php (modified) (1 diff)
• tests/phpunit/tests/formatting/redirect.php (modified) (2 diffs)

branches/3.9/src/wp-includes/pluggable.php

@@ -1186 +1186 @@
  **/
 function wp_validate_redirect($location, $default = '') {
-        $location = trim( $location );
+        $location = trim( $location, " \t\n\r\0\x08\x0B" );
         // browsers will assume 'http' is your protocol, and will obey a redirect to a URL starting with '//'
         if ( substr($location, 0, 2) == '//' )

branches/3.9/tests/phpunit/tests/formatting/redirect.php

@@ -54 +54 @@
                         array( 'http://user:@example.com/', 'http://user:@example.com/' ),
                         array( 'http://user:pass@example.com/', 'http://user:pass@example.com/' ),
+                        array( " \t\n\r\0\x08\x0Bhttp://example.com", 'http://example.com' ),
+                        array( " \t\n\r\0\x08\x0B//example.com", 'http://example.com' ),
                 );
         }
@@ -65 +67 @@
                         // non-safelisted domain
                         array( 'http://non-safelisted.example/' ),
+
+                        // non-safelisted domain (leading whitespace)
+                        array( " \t\n\r\0\x08\x0Bhttp://non-safelisted.example.com" ),
+                        array( " \t\n\r\0\x08\x0B//non-safelisted.example.com" ),
 
                         // unsupported schemes