Changeset 53934

Timestamp:

08/23/2022 07:57:17 PM (4 years ago)

Author:

antpb

Message:

Media: Account for Windows when normalizing file paths.
Previously, Windows paths in the path_is_absolute function resulted in incorrect URIs. This patch adjusts for forward slashes and adds tests for the get_attached_file function.
Props Whissi, SergeyBiryukov, desrosj, stevenlinx, birgire, davidbaumwald, costdev, peterwilsoncc, audrasjb, hellofromTonya, johnbillion.
Fixes #36308.

Location:

trunk

Files:

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

trunk/src/wp-includes/functions.php

@@ -2084 +2084 @@
  *
  * @since 2.5.0
+ * @since 6.1.0 Allows normalized Windows paths (forward slashes).
  *
  * @param string $path File path.
@@ -2111 +2112 @@
         // Windows allows absolute paths like this.
         if ( preg_match( '#^[a-zA-Z]:\\\\#', $path ) ) {
+                return true;
+        }
+
+        // Normalized Windows paths for local filesystem and network shares (forward slashes).
+        if ( preg_match( '#(^[a-zA-Z]+:/|^//[\w!@\#\$%\^\(\)\-\'{}\.~]{1,15})#', $path ) ) {
                 return true;
         }

trunk/src/wp-includes/post.php

@@ -725 +725 @@
 
         // If the file is relative, prepend upload dir.
-        if ( $file && 0 !== strpos( $file, '/' ) && ! preg_match( '|^.:\\\|', $file ) ) {
+        if ( $file ) {
                 $uploads = wp_get_upload_dir();
+
                 if ( false === $uploads['error'] ) {
-                        $file = $uploads['basedir'] . "/$file";
+                        $file = path_join( $uploads['basedir'], $file );
                 }
         }

trunk/tests/phpunit/tests/functions.php

@@ -106 +106 @@
                         'C:\\WINDOWS',
                         '\\\\sambashare\\foo',
+                        'c:/',
+                        'c://',
+                        '//',
+                        'c:/FOO',
+                        '//FOO',
+                        'C:/WWW/Sites/demo/htdocs/wordpress/wp-content/uploads/2016/03/example.jpg',
+                        '//ComputerName/ShareName/SubfolderName/example.txt',
                 );
                 foreach ( $absolute_paths as $path ) {
@@ -120 +127 @@
                         '../',
                         '../foo.bar',
+                        'foo.bar',
                         'foo/bar',
                         'foo',
                         'FOO',
                         '..\\WINDOWS',
+                        '..//WINDOWS',
+                        'c:',
+                        'C:',
                 );
                 foreach ( $relative_paths as $path ) {