Changeset 56510

Timestamp:

09/03/2023 12:49:51 PM (12 months ago)

Author:

SergeyBiryukov

Message:

Upload: Correct duplicate MIME type for .xlsx files generated by Google Docs.

This expands the code block previously added for .docx files to include .xlsx files as well, which are known to have the same issue with finfo_file().

Includes a unit test case for wp_check_filetype_and_ext().

Reference: ​PHP Bug #77784: mime_content_type() result gets doubled for .xlsx.

Follow-up to [56497].

See #57898.

Location:

trunk

Files:

• src/wp-includes/functions.php (modified) (1 diff)
• tests/phpunit/data/uploads/double-mime-type.docx (added)
• tests/phpunit/tests/functions.php (modified) (1 diff)

trunk/src/wp-includes/functions.php

@@ -3151 +3151 @@
         finfo_close( $finfo );
 
-        // finfo_file() returns redudant mime type for Google docs, see #57898.
-        if ( 'application/vnd.openxmlformats-officedocument.wordprocessingml.documentapplication/vnd.openxmlformats-officedocument.wordprocessingml.document' === $real_mime ) {
-            $real_mime = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
+        $google_docs_types = array(
+            'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+            'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+        );
+
+        foreach ( $google_docs_types as $google_docs_type ) {
+            /*
+             * finfo_file() can return duplicate mime type for Google docs,
+             * this conditional reduces it to a single instance.
+             *
+             * @see https://bugs.php.net/bug.php?id=77784
+             * @see https://core.trac.wordpress.org/ticket/57898
+             */
+            if ( 2 === substr_count( $real_mime, $google_docs_type ) ) {
+                $real_mime = $google_docs_type;
+            }
         }
 

trunk/tests/phpunit/tests/functions.php

@@ -1644 +1644 @@
                         ),
                     ),
+                    // Google Docs file for which finfo_file() returns a duplicate mime type.
+                    array(
+                        DIR_TESTDATA . '/uploads/double-mime-type.docx',
+                        'double-mime-type.docx',
+                        array(
+                            'ext'             => 'docx',
+                            'type'            => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+                            'proper_filename' => false,
+                        ),
+                    ),
                     // Non-image file with wrong sub-type.
                     array(