Changeset 45133

Timestamp:

04/08/2019 01:09:01 AM (8 years ago)

Author:

pento

Message:

Canonical: Ensure redirect query keys are URL encoded.

This prevents an infinite redirect loop when a request containing URL-encoded characters triggers is_404().

Props soulseekah, wrwrwr0.
Fixes #43745.

Location:

trunk

Files:

• src/wp-includes/canonical.php (modified) (1 diff)
• tests/phpunit/tests/canonical.php (modified) (1 diff)

trunk/src/wp-includes/canonical.php

@@ -389 +389 @@
                 }
 
-                $_parsed_query = rawurlencode_deep( $_parsed_query );
+                $_parsed_query = array_combine(
+                        rawurlencode_deep( array_keys( $_parsed_query ) ),
+                        rawurlencode_deep( array_values( $_parsed_query ) )
+                );
                 $redirect_url  = add_query_arg( $_parsed_query, $redirect_url );
         }

trunk/tests/phpunit/tests/canonical.php

@@ -214 +214 @@
                 );
         }
+
+        /**
+         * @ticket 43745
+         */
+        public function test_utf8_query_keys_canonical() {
+                $p = self::factory()->post->create(
+                        array(
+                                'post_type' => 'page',
+                        )
+                );
+                update_option( 'show_on_front', 'page' );
+                update_option( 'page_on_front', $p );
+
+                $this->go_to( get_permalink( $p ) );
+
+                $url = redirect_canonical( add_query_arg( '%D0%BA%D0%BE%D0%BA%D0%BE%D0%BA%D0%BE', 1, site_url( '/' ) ), false );
+                $this->assertNull( $url );
+
+                delete_option( 'page_on_front' );
+        }
 }