Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

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

Built from https://develop.svn.wordpress.org/branches/5.6@57399


git-svn-id: http://core.svn.wordpress.org/branches/5.6@56905 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Aaron Jorbin 2024-01-30 14:52:00 +00:00
parent 8e2e64a896
commit cc30c42d72
3 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
wp-admin/includes/class-file-upload-upgrader.php
View File

@ -68,6 +68,30 @@ class File_Upload_Upgrader {
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'];

6
wp-admin/includes/schema.php
View File

@ -584,14 +584,12 @@ function populate_options( array $options = array() ) {
$autoload = 'yes';
}
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 );
}

8
wp-admin/update.php
View File

@ -151,6 +151,10 @@ if ( isset( $_GET['action'] ) ) {
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' );
$title = __( 'Upload Plugin' );
@ -293,6 +297,10 @@ if ( isset( $_GET['action'] ) ) {
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' );
$title = __( 'Upload Theme' );