Changeset 41469 for branches/3.7/src

Timestamp:

09/19/2017 02:46:55 PM (9 years ago)

Author:

johnbillion

Message:

Filesystem API: Ensure filenames are valid before attempting to unzip them to ensure malformed file paths don't cause issues.

Merges [41457] to the 3.7 branch.

Location:

branches/3.7

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/wp-admin/includes/file.php (modified) (2 diffs)

branches/3.7/src/wp-admin/includes/file.php

@@ -610 +610 @@
                         continue;
 
+                if ( 0 !== validate_file( $info['name'] ) ) {
+                        return new WP_Error( 'invalid_file_ziparchive', __( 'Could not extract file from archive.' ), $info['name'] );
+                }
+
                 $uncompressed_size += $info['size'];
 
@@ -762 +766 @@
                 if ( '__MACOSX/' === substr($file['filename'], 0, 9) ) // Don't extract the OS X-created __MACOSX directory files
                         continue;
+
+                if ( 0 !== validate_file( $file['filename'] ) ) {
+                        return new WP_Error( 'invalid_file_pclzip', __( 'Could not extract file from archive.' ), $file['filename'] );
+                }
 
                 if ( ! $wp_filesystem->put_contents( $to . $file['filename'], $file['content'], FS_CHMOD_FILE) )