Changeset 58570

Timestamp:

06/25/2024 02:17:48 PM (3 months ago)

Author:

jorbin

Message:

Filesystem: Normalize allowed_files so comparison is apples to apples.

In [58470] a change was made to normalize the filename in validate_file, however this leads to instances where the list of files that are allowed aren't normalized such as in the theme editor. By normalizing the array, the comparison is apples to apples.

Fixes #61488.
Props jorbin, hellofromtonya, swissspidy, misulicus, script2see, Presskopp, audrasjb, peterwilsoncc, siliconforks, littler.chicken, paulkevan,

Location:

trunk

Files:

• src/wp-includes/functions.php (modified) (1 diff)
• tests/phpunit/tests/functions.php (modified) (2 diffs)

trunk/src/wp-includes/functions.php

@@ -6200 +6200 @@
     }
 
-    // Normalize path for Windows servers
+    // Normalize path for Windows servers.
     $file = wp_normalize_path( $file );
+    // Normalize path for $allowed_files as well so it's an apples to apples comparison.
+    $allowed_files = array_map( 'wp_normalize_path', $allowed_files );
 
     // `../` on its own is not allowed:

trunk/tests/phpunit/tests/functions.php

@@ -1794 +1794 @@
      *
      * @ticket 42016
+     * @ticket 61488
      * @dataProvider data_validate_file
      *
@@ -1912 +1913 @@
                 array( 'C:/WINDOWS/system32' ),
                 2,
+            ),
+
+            // Windows Path with allowed file
+            array(
+                'Apache24\htdocs\wordpress/wp-content/themes/twentyten/style.css',
+                array( 'Apache24\htdocs\wordpress/wp-content/themes/twentyten/style.css' ),
+                0,
             ),