Changeset 57394

Timestamp:

01/30/2024 02:37:21 PM (3 months ago)

Author:

jorbin

Message:

Grouped Backports to the 6.1 branch

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

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

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

Location:

branches/6.1

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/class-file-upload-upgrader.php (modified) (1 diff)
• src/wp-admin/includes/schema.php (modified) (1 diff)
• src/wp-admin/update.php (modified) (2 diffs)

branches/6.1/src/wp-admin/includes/class-file-upload-upgrader.php

@@ -70 +70 @@
             }
 
+            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'];

branches/6.1/src/wp-admin/includes/schema.php

@@ -595 +595 @@
         }
 
-        if ( is_array( $value ) ) {
-            $value = serialize( $value );
-        }
-
         if ( ! empty( $insert ) ) {
             $insert .= ', ';
         }
+
+        $value = maybe_serialize( sanitize_option( $option, $value ) );
 
         $insert .= $wpdb->prepare( '(%s, %s, %s)', $option, $value, $autoload );

branches/6.1/src/wp-admin/update.php

@@ -154 +154 @@
 
         check_admin_referer( 'plugin-upload' );
+
+        if ( isset( $_FILES['pluginzip']['name'] ) && ! str_ends_with( strtolower( $_FILES['pluginzip']['name'] ), '.zip' ) ) {
+            wp_die( __( 'Only .zip archives may be uploaded.' ) );
+        }
 
         $file_upload = new File_Upload_Upgrader( 'pluginzip', 'package' );
@@ -302 +306 @@
 
         check_admin_referer( 'theme-upload' );
+
+        if ( isset( $_FILES['themezip']['name'] ) && ! str_ends_with( strtolower( $_FILES['themezip']['name'] ), '.zip' ) ) {
+            wp_die( __( 'Only .zip archives may be uploaded.' ) );
+        }
 
         $file_upload = new File_Upload_Upgrader( 'themezip', 'package' );