Ticket #51857: 51857.5.diff

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

@@ -594 +594 @@
                 // Copy new version of item into place.
                 $result = copy_dir( $source, $remote_destination );
                 if ( is_wp_error( $result ) ) {
+                        $this->extract_rollback( $destination, $args['hook_extra'] );
                         if ( $args['clear_working'] ) {
                                 $wp_filesystem->delete( $remote_source, true );
                         }
@@ -775 +776 @@
 
                 $delete_package = ( $download != $options['package'] ); // Do not delete a "local" file.
 
+                // Zip the plugin/theme being updated to rollback directory.
+                add_filter( 'upgrader_pre_install', array( $this, 'zip_to_rollback_dir' ), 15, 2 );
+
                 // Unzips the file into a temporary directory.
                 $working_dir = $this->unpack_package( $download, $delete_package );
                 if ( is_wp_error( $working_dir ) ) {
@@ -937 +941 @@
                 return delete_option( $lock_name . '.lock' );
         }
 
+
+        /**
+         * Create a zip archive of the plugin/theme being upgraded into a rollback directory.
+         *
+         * @since 5.7.0
+         * @uses 'upgrader_pre_install' filter.
+         *
+         * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass.
+         * @param  bool               $true          Boolean response to 'upgrader_pre_install' filter.
+         *                                           Default is true.
+         * @param  array              $hook_extra    Array of data for plugin/theme being updated.
+         *
+         * @return bool
+         */
+        public function zip_to_rollback_dir( $true, $hook_extra ) {
+                global $wp_filesystem;
+
+                $rollback_dir = $wp_filesystem->wp_content_dir() . 'upgrade/rollback/';
+                $type         = key( $hook_extra );
+                $slug         = 'plugin' === $type ? dirname( $hook_extra['plugin'] ) : $hook_extra['theme'];
+                $src          = 'plugin' === $type ? WP_PLUGIN_DIR . "/{$slug}" : get_theme_root(). "/{$slug}";
+                if ( $wp_filesystem->mkdir( $rollback_dir ) ) {
+                        $path_prefix = strlen( $src ) + 1;
+                        $zip         = new ZipArchive();
+
+                        if ( true === $zip->open( "{$rollback_dir}{$slug}.zip", ZipArchive::CREATE | ZipArchive::OVERWRITE ) ) {
+                                $files = new RecursiveIteratorIterator(
+                                        new RecursiveDirectoryIterator( $src ),
+                                        RecursiveIteratorIterator::LEAVES_ONLY
+                                );
+
+                                foreach ( $files as $name => $file ) {
+                                        // Skip directories (they would be added automatically).
+                                        if ( ! $file->isDir() ) {
+                                                // Get real and relative path for current file.
+                                                $file_path     = $file->getRealPath();
+                                                $relative_path = substr( $file_path, $path_prefix );
+
+                                                // Add current file to archive.
+                                                $zip->addFile( $file_path, $relative_path );
+                                        }
+                                }
+
+                                $zip->close();
+                        } else {
+                                return new WP_Error( 'zip_rollback_failed', __( 'Zip plugin/theme to rollback directory failed.' ) );
+                        }
+                }
+
+                return $true;
+        }
+
+        /**
+         * Extract zipped rollback to original location.
+         *
+         * @since 5.7.0
+         *
+         * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass.
+         * @param string              $destination   File path of plugin/theme.
+         * @param  array              $hook_extra    Array of data for plugin/theme being updated.
+         *
+         * @return bool
+         */
+        public function extract_rollback( $destination, $hook_extra ) {
+                global $wp_filesystem;
+
+                // Start with a clean slate.
+                if ( $wp_filesystem->is_dir( $destination ) ) {
+                        $wp_filesystem->delete( $destination, true );
+                }
+
+                $rollback_dir = $wp_filesystem->wp_content_dir() . 'upgrade/rollback/';
+                $type         = key( $hook_extra );
+                $slug         = 'plugin' === $type ? dirname( $hook_extra['plugin'] ) : $hook_extra['theme'];
+                $src          = 'plugin' === $type ? WP_PLUGIN_DIR . "/{$slug}" : get_theme_root() . "/{$slug}";
+                $rollback     = $rollback_dir . "{$slug}.zip";
+
+                $zip = new \ZipArchive();
+                if ( true === $zip->open( "$rollback", ZipArchive::CHECKCONS ) ) {
+                        $zip->extractTo( "$destination" );
+                        $zip->close();
+                        return true;
+                } else {
+                        return new WP_Error( 'extract_rollback_failed', __( "Extract rollback of {$type} {$slug} failed." ) );
+                }
+        }
 }
 
 /** Plugin_Upgrader class */

wp-admin/includes/file.php

@@ -1730 +1730 @@
  * Assumes that WP_Filesystem() has already been called and setup.
  *
  * @since 2.5.0
+ * @since 5.7.0 Add $first_pass parameter.
  *
  * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass.
  *
- * @param string   $from      Source directory.
- * @param string   $to        Destination directory.
- * @param string[] $skip_list An array of files/folders to skip copying.
+ * @param string   $from       Source directory.
+ * @param string   $to         Destination directory.
+ * @param string[] $skip_list  An array of files/folders to skip copying.
+ * @param bool     $first_pass True on the initial call, but false on subsequent calls.
  * @return true|WP_Error True on success, WP_Error on failure.
  */
-function copy_dir( $from, $to, $skip_list = array() ) {
+function copy_dir( $from, $to, $skip_list = array(), $first_pass = true ) {
         global $wp_filesystem;
 
         $dirlist = $wp_filesystem->dirlist( $from );
 
+        if ( ! $dirlist && $first_pass ) {
+                return new WP_Error( 'dirlist_failed_copy_dir', __( 'Directory listing failed.' ), basename( $to ) );
+        }
+
         $from = trailingslashit( $from );
         $to   = trailingslashit( $to );
 
@@ -1776 +1782 @@
                                 }
                         }
 
-                        $result = copy_dir( $from . $filename, $to . $filename, $sub_skip_list );
+                        $result = copy_dir( $from . $filename, $to . $filename, $sub_skip_list, false );
                         if ( is_wp_error( $result ) ) {
                                 return $result;
                         }

wp-admin/includes/update-core.php

@@ -1333 +1333 @@
  * @ignore
  * @since 3.2.0
  * @since 3.7.0 Updated not to use a regular expression for the skip list.
+ * @since 5.7.0 Add $first_pass parameter.
  *
  * @see copy_dir()
  * @link https://core.trac.wordpress.org/ticket/17173
  *
  * @global WP_Filesystem_Base $wp_filesystem
  *
- * @param string   $from      Source directory.
- * @param string   $to        Destination directory.
- * @param string[] $skip_list Array of files/folders to skip copying.
+ * @param string   $from       Source directory.
+ * @param string   $to         Destination directory.
+ * @param string[] $skip_list  Array of files/folders to skip copying.
+ * @param bool     $first_pass True on the initial call, but false on subsequent calls.
  * @return true|WP_Error True on success, WP_Error on failure.
  */
-function _copy_dir( $from, $to, $skip_list = array() ) {
+function _copy_dir( $from, $to, $skip_list = array(), $first_pass = true ) {
         global $wp_filesystem;
 
         $dirlist = $wp_filesystem->dirlist( $from );
 
+        if ( ! $dirlist && $first_pass ) {
+                return new WP_Error( 'dirlist_failed__copy_dir', __( 'Directory listing failed.' ), basename( $to ) );
+        }
+
         $from = trailingslashit( $from );
         $to   = trailingslashit( $to );
 
@@ -1388 +1394 @@
                                 }
                         }
 
-                        $result = _copy_dir( $from . $filename, $to . $filename, $sub_skip_list );
+                        $result = _copy_dir( $from . $filename, $to . $filename, $sub_skip_list, false );
                         if ( is_wp_error( $result ) ) {
                                 return $result;
                         }