Ticket #47980: 47980.diff

src/wp-includes/pluggable.php

@@ -1418 +1418 @@
                         $path = '';
                         if ( ! empty( $_SERVER['REQUEST_URI'] ) ) {
                                 $path = dirname( parse_url( 'http://placeholder' . $_SERVER['REQUEST_URI'], PHP_URL_PATH ) . '?' );
+                                $path = wp_normalize_path( $path );
                         }
                         $location = '/' . ltrim( $path . '/', '/' ) . $location;
                 }

tests/phpunit/tests/formatting/redirect.php

@@ -58 +58 @@
                 $this->assertEquals( false, wp_validate_redirect( $url, false ) );
         }
 
+        /**
+         * @ticket 47980
+         * @dataProvider relative_url_provider
+         */
+        function test_wp_validate_redirect_relative_url( $current_uri, $url, $expected ) {
+                // Backup the global.
+                $unset = false;
+                if ( ! isset( $_SERVER['REQUEST_URI'] ) ) {
+                        $unset = true;
+                } else {
+                        $backup_request_uri = $_SERVER['REQUEST_URI'];
+                }
+
+                // Set the global to current URI.
+                $_SERVER['REQUEST_URI'] = $current_uri;
+
+                $this->assertEquals( $expected, wp_validate_redirect( $url, false ) );
+
+                // Delete or reset the global as required.
+                if ( $unset ) {
+                        unset( $_SERVER['REQUEST_URI'] );
+                } else {
+                        $_SERVER['REQUEST_URI'] = $backup_request_uri;
+                }
+        }
+
         function valid_url_provider() {
                 return array(
                         array( 'http://example.com', 'http://example.com' ),
@@ -141 +167 @@
                         array( 'http://user.pass@#example.com/' ),
                 );
         }
+
+        /**
+         * Data provider for test_wp_validate_redirect_relative_url.
+         *
+         * @return array[] {
+         *      string Current URI (ie path and query string only).
+         *      string Redirect requested.
+         *      string Expected destination.
+         * }
+         */
+        function relative_url_provider() {
+                return array(
+                        array(
+                                '/wp-admin/settings.php?page=my-plugin',
+                                './settings.php?page=my-plugin',
+                                '/wp-admin/./settings.php?page=my-plugin',
+                        ),
+                        array(
+                                '/wp-admin/settings.php?page=my-plugin',
+                                '/wp-login.php',
+                                '/wp-login.php',
+                        ),
+                        array(
+                                '/wp-admin/settings.php?page=my-plugin',
+                                '../wp-admin/admin.php?page=my-plugin',
+                                '/wp-admin/../wp-admin/admin.php?page=my-plugin',
+                        ),
+                        array(
+                                '/2019/10/13/my-post',
+                                '../../',
+                                '/2019/10/13/../../',
+                        ),
+                        array(
+                                '/2019/10/13/my-post',
+                                '/',
+                                '/',
+                        ),
+                );
+        }
 }