Make WordPress Core

Changeset 57408


Ignore:
Timestamp:
01/30/2024 03:06:32 PM (4 months ago)
Author:
jorbin
Message:

Grouped Backports to the 4.7 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.7 branch.

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

Location:
branches/4.7
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/4.7

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

    r38524 r57408  
    6868                wp_die( $file['error'] );
    6969
     70            if ( 'pluginzip' === $form || 'themezip' === $form ) {
     71                $archive_is_valid = false;
     72
     73                /** This filter is documented in wp-admin/includes/file.php */
     74                if ( class_exists( 'ZipArchive', false ) && apply_filters( 'unzip_file_use_ziparchive', true ) ) {
     75                    $archive          = new ZipArchive();
     76                    $archive_is_valid = $archive->open( $file['file'], ZIPARCHIVE::CHECKCONS );
     77
     78                    if ( true === $archive_is_valid ) {
     79                        $archive->close();
     80                    }
     81                } else {
     82                    require_once ABSPATH . 'wp-admin/includes/class-pclzip.php';
     83
     84                    $archive          = new PclZip( $file['file'] );
     85                    $archive_is_valid = is_array( $archive->properties() );
     86                }
     87
     88                if ( true !== $archive_is_valid ) {
     89                    wp_delete_file( $file['file'] );
     90                    wp_die( __( 'Incompatible Archive.' ) );
     91                }
     92            }
     93
    7094            $this->filename = $_FILES[$form]['name'];
    7195            $this->package = $file['file'];
  • branches/4.7/src/wp-admin/includes/schema.php

    r39076 r57408  
    547547            $autoload = 'yes';
    548548
    549         if ( is_array($value) )
    550             $value = serialize($value);
    551549        if ( !empty($insert) )
    552550            $insert .= ', ';
     551
     552        $value = maybe_serialize( sanitize_option( $option, $value ) );
     553
    553554        $insert .= $wpdb->prepare( "(%s, %s, %s)", $option, $value, $autoload );
    554555    }
  • branches/4.7/src/wp-admin/update.php

    r38470 r57408  
    147147        check_admin_referer('plugin-upload');
    148148
     149        if ( isset( $_FILES['pluginzip']['name'] ) && ! str_ends_with( strtolower( $_FILES['pluginzip']['name'] ), '.zip' ) ) {
     150            wp_die( __( 'Only .zip archives may be uploaded.' ) );
     151        }
     152
    149153        $file_upload = new File_Upload_Upgrader('pluginzip', 'package');
    150154
     
    251255
    252256        check_admin_referer('theme-upload');
     257
     258        if ( isset( $_FILES['themezip']['name'] ) && ! str_ends_with( strtolower( $_FILES['themezip']['name'] ), '.zip' ) ) {
     259            wp_die( __( 'Only .zip archives may be uploaded.' ) );
     260        }
    253261
    254262        $file_upload = new File_Upload_Upgrader('themezip', 'package');
Note: See TracChangeset for help on using the changeset viewer.