Changeset 36444 for trunk/src/wp-includes/pluggable.php

Timestamp:

02/02/2016 03:10:09 PM (11 years ago)

Author:

ocean90

Message:

Better validation of the URL used in HTTP redirects.

File:

• trunk/src/wp-includes/pluggable.php (modified) (1 diff)

trunk/src/wp-includes/pluggable.php

@@ -1337 +1337 @@
                 return $default;
 
-        // Reject if scheme is set but host is not. This catches urls like https:host.com for which parse_url does not set the host field.
-        if ( isset($lp['scheme'])  && !isset($lp['host']) )
+        // Reject if certain components are set but host is not. This catches urls like https:host.com for which parse_url does not set the host field.
+        if ( ! isset( $lp['host'] ) && ( isset( $lp['scheme'] ) || isset( $lp['user'] ) || isset( $lp['pass'] ) || isset( $lp['port'] ) ) ) {
                 return $default;
+        }
+
+        // Reject malformed components parse_url() can return on odd inputs.
+        foreach ( array( 'user', 'pass', 'host' ) as $component ) {
+                if ( isset( $lp[ $component ] ) && strpbrk( $lp[ $component ], ':/?#@' ) ) {
+                        return $default;
+                }
+        }
 
         $wpp = parse_url(home_url());