Changeset 45984 for branches/4.1

Timestamp:

09/04/2019 05:13:43 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Improve URL validation in wp_validate_redirect().

Merges [45971] to the 4.1 branch.
Props vortfu, whyisjake, peterwilsoncc.

Location:

branches/4.1

Files:

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

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

@@ -1260 +1260 @@
         return $default;
 
+    if ( ! isset( $lp['host'] ) && ! empty( $lp['path'] ) && '/' !== $lp['path'][0] ) {
+        $path = '';
+        if ( ! empty( $_SERVER['REQUEST_URI'] ) ) {
+            $path = dirname( parse_url( 'http://placeholder' . $_SERVER['REQUEST_URI'], PHP_URL_PATH ) . '?' );
+        }
+        $location = '/' . ltrim( $path . '/', '/' ) . $location;
+    }
+
     // 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'] ) ) ) {