Make WordPress Core

Changeset 57411


Ignore:
Timestamp:
01/30/2024 03:11:35 PM (4 months 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:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/4.4

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

    r38527 r57411  
    25482548                wp_die( $file['error'] );
    25492549
     2550            if ( 'pluginzip' === $form || 'themezip' === $form ) {
     2551                $archive_is_valid = false;
     2552
     2553                /** This filter is documented in wp-admin/includes/file.php */
     2554                if ( class_exists( 'ZipArchive', false ) && apply_filters( 'unzip_file_use_ziparchive', true ) ) {
     2555                    $archive          = new ZipArchive();
     2556                    $archive_is_valid = $archive->open( $file['file'], ZIPARCHIVE::CHECKCONS );
     2557
     2558                    if ( true === $archive_is_valid ) {
     2559                        $archive->close();
     2560                    }
     2561                } else {
     2562                    require_once ABSPATH . 'wp-admin/includes/class-pclzip.php';
     2563
     2564                    $archive          = new PclZip( $file['file'] );
     2565                    $archive_is_valid = is_array( $archive->properties() );
     2566                }
     2567
     2568                if ( true !== $archive_is_valid ) {
     2569                    wp_delete_file( $file['file'] );
     2570                    wp_die( __( 'Incompatible Archive.' ) );
     2571                }
     2572            }
     2573
    25502574            $this->filename = $_FILES[$form]['name'];
    25512575            $this->package = $file['file'];
  • branches/4.4/src/wp-admin/includes/schema.php

    r35738 r57411  
    549549            $autoload = 'yes';
    550550
    551         if ( is_array($value) )
    552             $value = serialize($value);
    553551        if ( !empty($insert) )
    554552            $insert .= ', ';
     553
     554        $value = maybe_serialize( sanitize_option( $option, $value ) );
     555
    555556        $insert .= $wpdb->prepare( "(%s, %s, %s)", $option, $value, $autoload );
    556557    }
  • branches/4.4/src/wp-admin/update.php

    r34598 r57411  
    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.