Make WordPress Core

Changeset 57403


Ignore:
Timestamp:
01/30/2024 02:56:06 PM (5 months ago)
Author:
jorbin
Message:

Grouped Backports to the 5.2 branch

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

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

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

Location:
branches/5.2
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/5.2

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

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

    r44976 r57403  
    577577        }
    578578
    579         if ( is_array( $value ) ) {
    580             $value = serialize( $value );
    581         }
    582579        if ( ! empty( $insert ) ) {
    583580            $insert .= ', ';
    584581        }
     582
     583        $value = maybe_serialize( sanitize_option( $option, $value ) );
     584
    585585        $insert .= $wpdb->prepare( '(%s, %s, %s)', $option, $value, $autoload );
    586586    }
  • branches/5.2/src/wp-admin/update.php

    r43571 r57403  
    146146
    147147        check_admin_referer( 'plugin-upload' );
     148
     149        if ( isset( $_FILES['pluginzip']['name'] ) && ! str_ends_with( strtolower( $_FILES['pluginzip']['name'] ), '.zip' ) ) {
     150            wp_die( __( 'Only .zip archives may be uploaded.' ) );
     151        }
    148152
    149153        $file_upload = new File_Upload_Upgrader( 'pluginzip', 'package' );
     
    263267
    264268        check_admin_referer( 'theme-upload' );
     269
     270        if ( isset( $_FILES['themezip']['name'] ) && ! str_ends_with( strtolower( $_FILES['themezip']['name'] ), '.zip' ) ) {
     271            wp_die( __( 'Only .zip archives may be uploaded.' ) );
     272        }
    265273
    266274        $file_upload = new File_Upload_Upgrader( 'themezip', 'package' );
Note: See TracChangeset for help on using the changeset viewer.