Improve URL validation in wp_validate_redirect().

SergeyBiryukov · SergeyBiryukov · commit c72f365ef54c · 2019-09-04T17:10:14.000Z
Merges [45971] to the 4.8 branch. Props vortfu, whyisjake, peterwilsoncc. git-svn-id: https://develop.svn.wordpress.org/branches/4.8@45976 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/src/wp-includes/pluggable.php b/src/wp-includes/pluggable.php
@@ -1333,6 +1333,14 @@ function wp_validate_redirect($location, $default = '') {
 	if ( isset($lp['scheme']) && !('http' == $lp['scheme'] || 'https' == $lp['scheme']) )
 		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'] ) ) ) {
 		return $default;
