Changeset 52289

Timestamp:

11/30/2021 07:10:31 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Upgrade/Install: Make some adjustments to the move_dir() function:

• Check for direct PHP flle access and only use rename() if true.
• Check whether the destination directory was successfully created.
• Clear the working directory so there is internal parity within the function between the results of a successful rename() and a fallback to copy_dir().
• Use move_dir() in WP_Upgrader::move_to_temp_backup_dir() and ::restore_temp_backup().

Follow-up to [51815], [51898], [51899], [51902], [52192], [52284].

Props afragen, peterwilsoncc, dd32, SergeyBiryukov.
See #54166, #51857.

Location:

trunk/src/wp-admin/includes

Files:

• class-wp-upgrader.php (modified) (4 diffs)
• file.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-wp-upgrader.php

@@ -629 +629 @@
 
         // Move new version of item into place.
-        $result = move_dir( $source, $remote_destination );
+        $result = move_dir( $source, $remote_destination, $remote_source );
         if ( is_wp_error( $result ) ) {
             if ( $args['clear_working'] ) {
@@ -637 +637 @@
         }
 
-        // Clear the working folder?
+        // Clear the working directory?
         if ( $args['clear_working'] ) {
             $wp_filesystem->delete( $remote_source, true );
@@ -1048 +1048 @@
 
         // Move to the temp-backup directory.
-        if ( ! $wp_filesystem->move( $src, $dest, true ) ) {
+        if ( ! move_dir( $src, $dest ) ) {
             return new WP_Error( 'fs_temp_backup_move', $this->strings['temp_backup_move_failed'] );
         }
@@ -1082 +1082 @@
 
             // Move it.
-            if ( ! $wp_filesystem->move( $src, $dest, true ) ) {
+            if ( ! move_dir( $src, $dest ) ) {
                 return new WP_Error( 'fs_temp_backup_delete', $this->strings['temp_backup_restore_failed'] );
             }

trunk/src/wp-admin/includes/file.php

@@ -1954 +1954 @@
  * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass.
  *
- * @param string $from Source directory.
- * @param string $to   Destination directory.
+ * @param string $from        Source directory.
+ * @param string $to          Destination directory.
+ * @param string $working_dir Optional. Remote file source directory.
+ *                            Default empty string.
  * @return true|WP_Error True on success, WP_Error on failure.
  */
-function move_dir( $from, $to ) {
+function move_dir( $from, $to, $working_dir = '' ) {
     global $wp_filesystem;
 
-    $wp_filesystem->rmdir( $to );
-    if ( @rename( $from, $to ) ) {
-        return true;
-    }
-
-    $wp_filesystem->mkdir( $to );
+    if ( 'direct' === $wp_filesystem->method ) {
+        $wp_filesystem->rmdir( $to );
+        if ( @rename( $from, $to ) ) {
+            return true;
+        }
+    }
+
+    if ( ! $wp_filesystem->is_dir( $to ) ) {
+        if ( ! $wp_filesystem->mkdir( $to, FS_CHMOD_DIR ) ) {
+
+            // Clear the working directory?
+            if ( ! empty( $working_dir ) ) {
+                $wp_filesystem->delete( $working_dir, true );
+            }
+
+            return new WP_Error( 'mkdir_failed_move_dir', __( 'Could not create directory.' ), $to );
+        }
+    }
     $result = copy_dir( $from, $to );
+
+    // Clear the working directory?
+    if ( ! empty( $working_dir ) ) {
+        $wp_filesystem->delete( $working_dir, true );
+    }
 
     return $result;