Changeset 57411 for branches/4.4/src/wp-admin/includes/class-wp-upgrader.php

Timestamp:

01/30/2024 03:11:35 PM (2 years ago)

Author:

jorbin

Message:

Grouped Backports to the 4.4 branch.

• Install: When populating options, maybe_serialize instead of always serialize.
• Uploads: Check for and verify ZIP archives.

Merges [57388] and [57389] to the 4.4 branch.

Props costdev, peterwilsoncc, azaozz, tykoted, johnbillion, desrosj, afragen, jorbin, xknown.

Location:

branches/4.4

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/class-wp-upgrader.php (modified) (1 diff)

branches/4.4/src/wp-admin/includes/class-wp-upgrader.php

@@ -2548 +2548 @@
                 wp_die( $file['error'] );
 
+            if ( 'pluginzip' === $form || 'themezip' === $form ) {
+                $archive_is_valid = false;
+
+                /** This filter is documented in wp-admin/includes/file.php */
+                if ( class_exists( 'ZipArchive', false ) && apply_filters( 'unzip_file_use_ziparchive', true ) ) {
+                    $archive          = new ZipArchive();
+                    $archive_is_valid = $archive->open( $file['file'], ZIPARCHIVE::CHECKCONS );
+
+                    if ( true === $archive_is_valid ) {
+                        $archive->close();
+                    }
+                } else {
+                    require_once ABSPATH . 'wp-admin/includes/class-pclzip.php';
+
+                    $archive          = new PclZip( $file['file'] );
+                    $archive_is_valid = is_array( $archive->properties() );
+                }
+
+                if ( true !== $archive_is_valid ) {
+                    wp_delete_file( $file['file'] );
+                    wp_die( __( 'Incompatible Archive.' ) );
+                }
+            }
+
             $this->filename = $_FILES[$form]['name'];
             $this->package = $file['file'];