Changeset 40124 for trunk/tests/phpunit/tests/functions.php

Timestamp:

02/25/2017 04:07:25 PM (10 years ago)

Author:

joemcgill

Message:

Media: Reduce failing uploads following 4.7.1.

[39831] introduced more strict MIME type checking for uploads, which
resulted in unintetionally blocking several filetypes that were
previously valid. This change uses a more targeted approach to MIME
validation to restore previous behavior for most types.

Props blobfolio, iandunn, ipstenu, markoheijnen, xknown, joemcgill.
Fixes #39550, #39552.

File:

• trunk/tests/phpunit/tests/functions.php (modified) (1 diff)

trunk/tests/phpunit/tests/functions.php

@@ -915 +915 @@
                 $this->assertEquals( $uuids, $unique_uuids );
         }
+
+        /**
+         * @ticket 39550
+         * @dataProvider _wp_check_filetype_and_ext_data
+         */
+        function test_wp_check_filetype_and_ext( $file, $filename, $expected ) {
+                if ( ! extension_loaded( 'fileinfo' ) ) {
+                        $this->markTestSkipped( 'The fileinfo PHP extension is not loaded.' );
+                }
+
+                $this->assertEquals( $expected, wp_check_filetype_and_ext( $file, $filename ) );
+        }
+
+        /**
+         * @ticket 39550
+         */
+        function test_wp_check_filetype_and_ext_with_filtered_svg() {
+                $file = DIR_TESTDATA . '/uploads/video-play.svg';
+                $filename = 'video-play.svg';
+
+                $expected = array(
+                        'ext' => 'svg',
+                        'type' => 'image/svg+xml',
+                        'proper_filename' => false,
+                );
+
+                add_filter( 'upload_mimes', array( $this, '_filter_mime_types_svg' ) );
+                $this->assertEquals( $expected, wp_check_filetype_and_ext( $file, $filename ) );
+
+                // Cleanup.
+                remove_filter( 'upload_mimes', array( $this, '_test_add_mime_types_svg' ) );
+        }
+
+        /**
+         * @ticket 39550
+         */
+        function test_wp_check_filetype_and_ext_with_filtered_woff() {
+                $file = DIR_TESTDATA . '/uploads/dashicons.woff';
+                $filename = 'dashicons.woff';
+
+                $expected = array(
+                        'ext' => 'woff',
+                        'type' => 'application/font-woff',
+                        'proper_filename' => false,
+                );
+
+                add_filter( 'upload_mimes', array( $this, '_filter_mime_types_woff' ) );
+                $this->assertEquals( $expected, wp_check_filetype_and_ext( $file, $filename ) );
+
+                // Cleanup.
+                remove_filter( 'upload_mimes', array( $this, '_test_add_mime_types_woff' ) );
+        }
+
+        public function _filter_mime_types_svg( $mimes ) {
+                $mimes['svg'] = 'image/svg+xml';
+                return $mimes;
+        }
+
+        public function _filter_mime_types_woff( $mimes ) {
+                $mimes['woff'] = 'application/font-woff';
+                return $mimes;
+        }
+
+        public function _wp_check_filetype_and_ext_data() {
+                return array(
+                        // Standard image.
+                        array(
+                                DIR_TESTDATA . '/images/canola.jpg',
+                                'canola.jpg',
+                                array(
+                                        'ext' => 'jpg',
+                                        'type' => 'image/jpeg',
+                                        'proper_filename' => false,
+                                ),
+                        ),
+                        // Image with wrong extension.
+                        array(
+                                DIR_TESTDATA . '/images/test-image-mime-jpg.png',
+                                'test-image-mime-jpg.png',
+                                array(
+                                        'ext' => 'jpg',
+                                        'type' => 'image/jpeg',
+                                        'proper_filename' => 'test-image-mime-jpg.jpg',
+                                ),
+                        ),
+                        // Image without extension.
+                        array(
+                                DIR_TESTDATA . '/images/test-image-no-extension',
+                                'test-image-no-extension',
+                                array(
+                                        'ext' => false,
+                                        'type' => false,
+                                        'proper_filename' => false,
+                                ),
+                        ),
+                        // Valid non-image file with an image extension.
+                        array(
+                                DIR_TESTDATA . '/formatting/big5.txt',
+                                'big5.jpg',
+                                array(
+                                        'ext' => 'jpg',
+                                        'type' => 'image/jpeg',
+                                        'proper_filename' => false,
+                                ),
+                        ),
+                        // Standard non-image file.
+                        array(
+                                DIR_TESTDATA . '/formatting/big5.txt',
+                                'big5.txt',
+                                array(
+                                        'ext' => 'txt',
+                                        'type' => 'text/plain',
+                                        'proper_filename' => false,
+                                ),
+                        ),
+                        // Non-image file with wrong sub-type.
+                        array(
+                                DIR_TESTDATA . '/uploads/pages-to-word.docx',
+                                'pages-to-word.docx',
+                                array(
+                                        'ext' => 'docx',
+                                        'type' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+                                        'proper_filename' => false,
+                                ),
+                        ),
+                        // Non-image file not allowed.
+                        array(
+                                DIR_TESTDATA . '/export/crazy-cdata.xml',
+                                'crazy-cdata.xml',
+                                array(
+                                        'ext' => false,
+                                        'type' => false,
+                                        'proper_filename' => false,
+                                ),
+                        ),
+                );
+        }
 }