Changeset 43399 for branches/4.3/src/wp-includes/functions.php

Timestamp:

07/05/2018 03:02:04 PM (8 years ago)

Author:

johnbillion

Message:

Media: Limit thumbnail file deletions to the same directory as the original file.

Merges [43393] into the 4.3 branch.

File:

• branches/4.3/src/wp-includes/functions.php (modified) (3 diffs)

branches/4.3/src/wp-includes/functions.php

@@ -1591 +1591 @@
  * Normalize a filesystem path.
  *
- * Replaces backslashes with forward slashes for Windows systems, and ensures
- * no duplicate slashes exist.
+ * On windows systems, replaces backslashes with forward slashes
+ * and forces upper-case drive letters.
+ * Allows for two leading slashes for Windows network shares, but
+ * ensures that all other duplicate slashes are reduced to a single.
  *
  * @since 3.9.0
+ * @since 4.4.0 Ensures upper-case drive letters on Windows systems.
+ * @since 4.5.0 Allows for Windows network shares.
+ * @since 4.9.7 Allows for PHP file wrappers.
  *
  * @param string $path Path to normalize.
@@ -1600 +1605 @@
  */
 function wp_normalize_path( $path ) {
+        $wrapper = '';
+        if ( wp_is_stream( $path ) ) {
+                list( $wrapper, $path ) = explode( '://', $path, 2 );
+                $wrapper .= '://';
+        }
+
+        // Standardise all paths to use /
         $path = str_replace( '\\', '/', $path );
-        $path = preg_replace( '|/+|','/', $path );
-        return $path;
+
+        // Replace multiple slashes down to a singular, allowing for network shares having two slashes.
+        $path = preg_replace( '|(?<=.)/+|', '/', $path );
+
+        // Windows paths should uppercase the drive letter
+        if ( ':' === substr( $path, 1, 1 ) ) {
+                $path = ucfirst( $path );
+        }
+
+        return $wrapper . $path;
 }
 
@@ -5010 +5030 @@
 
 /**
+ * Deletes a file if its path is within the given directory.
+ *
+ * @since 4.9.7
+ *
+ * @param string $file      Absolute path to the file to delete.
+ * @param string $directory Absolute path to a directory.
+ * @return bool True on success, false on failure.
+ */
+function wp_delete_file_from_directory( $file, $directory ) {
+        $real_file = realpath( wp_normalize_path( $file ) );
+        $real_directory = realpath( wp_normalize_path( $directory ) );
+
+        if ( false === $real_file || false === $real_directory || strpos( wp_normalize_path( $real_file ), trailingslashit( wp_normalize_path( $real_directory ) ) ) !== 0 ) {
+                return false;
+        }
+
+        wp_delete_file( $file );
+
+        return true;
+}
+
+/**
  * Outputs a small JS snippet on preview tabs/windows to remove `window.name` on unload.
  *