<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[40134] branches/4.7: Media: Reduce failing uploads following 4.7.1.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/40134">40134</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/40134","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>joemcgill</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-02-27 19:27:58 +0000 (Mon, 27 Feb 2017)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Media: Reduce failing uploads following 4.7.1.

<a href="https://core.trac.wordpress.org/changeset/39831">[39831]</a> 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.
Merges <a href="https://core.trac.wordpress.org/changeset/40124">[40124]</a> and <a href="https://core.trac.wordpress.org/changeset/40125">[40125]</a> to the 4.7 branch.
Fixes <a href="https://core.trac.wordpress.org/ticket/39550">#39550</a>, <a href="https://core.trac.wordpress.org/ticket/39552">#39552</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branches47srcwpincludesfunctionsphp">branches/4.7/src/wp-includes/functions.php</a></li>
<li><a href="#branches47testsphpunittestsfunctionsphp">branches/4.7/tests/phpunit/tests/functions.php</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li>branches/4.7/tests/phpunit/data/uploads/</li>
</ul>

<h3>Property Changed</h3>
<ul>
<li><a href="#branches47">branches/4.7/</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.7
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/4.7 2017-02-27 19:24:50 UTC (rev 40133)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.7  2017-02-27 19:27:58 UTC (rev 40134)
</ins><a id="branches47"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.7</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.1:18031
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:18512,39365,39367,39369,39371,39373,39375-39376,39378,39380,39382,39384,39386,39388,39390,39392-39393,39396-39397,39400,39402,39404,39406,39409,39411,39413,39415,39417-39420,39424,39426,39428,39430,39432-39434,39436,39438,39440,39442-39444,39447,39449-39451,39453,39455-39457,39460,39462,39464,39466,39468,39470-39471,39475,39477-39478,39482-39483,39487-39488,39490,39495-39496,39499,39502,39504,39506,39508,39510,39512,39514,39517,39520,39522,39545-39547,39557-39563,39565,39578,39580-39581,39584,39586,39594-39595,39597-39599,39601,39603,39612-39613,39616-39617,39619-39623,39626,39635,39640,39645,39649,39657,39659,39663,39677-39678,39680-39681,39684-39686,39688-39689,39692,39720,39742,39744,39759-39760,39772,39795,39807-39808,39831,39843,39848,39850,39912,39914,39923-39924,39949,39951-39952,39954,39956,39968,39992,39994,40030,40036,40039-40041,40045,40049,40055,40058,40061,40063-40066
 ,40068,40070,40074,40077,40080,40082,40086,40089,40101,40104-40106,40108-40110,40118,40126,40130-40131
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:18512,39365,39367,39369,39371,39373,39375-39376,39378,39380,39382,39384,39386,39388,39390,39392-39393,39396-39397,39400,39402,39404,39406,39409,39411,39413,39415,39417-39420,39424,39426,39428,39430,39432-39434,39436,39438,39440,39442-39444,39447,39449-39451,39453,39455-39457,39460,39462,39464,39466,39468,39470-39471,39475,39477-39478,39482-39483,39487-39488,39490,39495-39496,39499,39502,39504,39506,39508,39510,39512,39514,39517,39520,39522,39545-39547,39557-39563,39565,39578,39580-39581,39584,39586,39594-39595,39597-39599,39601,39603,39612-39613,39616-39617,39619-39623,39626,39635,39640,39645,39649,39657,39659,39663,39677-39678,39680-39681,39684-39686,39688-39689,39692,39720,39742,39744,39759-39760,39772,39795,39807-39808,39831,39843,39848,39850,39912,39914,39923-39924,39949,39951-39952,39954,39956,39968,39992,39994,40030,40036,40039-40041,40045,40049,40055,40058,40061,40063-40066,
 40068,40070,40074,40077,40080,40082,40086,40089,40101,40104-40106,40108-40110,40118,40124-40126,40130-40131
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches47srcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/src/wp-includes/functions.php        2017-02-27 19:24:50 UTC (rev 40133)
+++ branches/4.7/src/wp-includes/functions.php  2017-02-27 19:27:58 UTC (rev 40134)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2268,15 +2268,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">                return compact( 'ext', 'type', 'proper_filename' );
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        $real_mime = false;
+
</ins><span class="cx" style="display: block; padding: 0 10px">         // Validate image types.
</span><span class="cx" style="display: block; padding: 0 10px">        if ( $type && 0 === strpos( $type, 'image/' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Attempt to figure out what type of image it actually is
</span><span class="cx" style="display: block; padding: 0 10px">                $real_mime = wp_get_image_mime( $file );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( ! $real_mime ) {
-                       $type = $ext = false;
-               } elseif ( $real_mime != $type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( $real_mime && $real_mime != $type ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         /**
</span><span class="cx" style="display: block; padding: 0 10px">                         * Filters the list mapping image mime types to their respective extensions.
</span><span class="cx" style="display: block; padding: 0 10px">                         *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2307,18 +2307,29 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                $ext = $wp_filetype['ext'];
</span><span class="cx" style="display: block; padding: 0 10px">                                $type = $wp_filetype['type'];
</span><span class="cx" style="display: block; padding: 0 10px">                        } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $type = $ext = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Reset $real_mime and try validating again.
+                               $real_mime = false;
</ins><span class="cx" style="display: block; padding: 0 10px">                         }
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        } elseif ( function_exists( 'finfo_file' ) ) {
-               // Use finfo_file if available to validate non-image files.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+
+       // Validate files that didn't get validated during previous checks.
+       if ( $type && ! $real_mime && extension_loaded( 'fileinfo' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                 $finfo = finfo_open( FILEINFO_MIME_TYPE );
</span><span class="cx" style="display: block; padding: 0 10px">                $real_mime = finfo_file( $finfo, $file );
</span><span class="cx" style="display: block; padding: 0 10px">                finfo_close( $finfo );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If the extension does not match the file's real type, return false.
-               if ( $real_mime !== $type ) {
-                       $type = $ext = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*
+                * If $real_mime doesn't match what we're expecting, we need to do some extra
+                * vetting of application mime types to make sure this type of file is allowed.
+                * Other mime types are assumed to be safe, but should be considered unverified.
+                */
+               if ( $real_mime && ( $real_mime !== $type ) && ( 0 === strpos( $real_mime, 'application' ) ) ) {
+                       $allowed = get_allowed_mime_types();
+
+                       if ( ! in_array( $real_mime, $allowed ) ) {
+                               $type = $ext = false;
+                       }
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="branches47testsphpunittestsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/tests/phpunit/tests/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/tests/phpunit/tests/functions.php    2017-02-27 19:24:50 UTC (rev 40133)
+++ branches/4.7/tests/phpunit/tests/functions.php      2017-02-27 19:27:58 UTC (rev 40134)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -898,4 +898,165 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $unique_uuids = array_unique( $uuids );
</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertEquals( $uuids, $unique_uuids );
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+       /**
+        * @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() {
+               if ( ! extension_loaded( 'fileinfo' ) ) {
+                       $this->markTestSkipped( 'The fileinfo PHP extension is not loaded.' );
+               }
+
+               if ( is_multisite() ) {
+                       $this->markTestSkipped( 'Test does not run in multisite' );
+               }
+
+               $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() {
+               if ( ! extension_loaded( 'fileinfo' ) ) {
+                       $this->markTestSkipped( 'The fileinfo PHP extension is not loaded.' );
+               }
+
+               if ( is_multisite() ) {
+                       $this->markTestSkipped( 'Test does not run in multisite' );
+               }
+
+               $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() {
+               $data = 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,
+                               ),
+                       ),
+                       // Non-image file not allowed.
+                       array(
+                               DIR_TESTDATA . '/export/crazy-cdata.xml',
+                               'crazy-cdata.xml',
+                               array(
+                                       'ext' => false,
+                                       'type' => false,
+                                       'proper_filename' => false,
+                               ),
+                       ),
+               );
+
+               // Test a few additional file types on single sites.
+               if ( ! is_multisite() ) {
+                       $data = array_merge( $data, array(
+                               // 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,
+                                       ),
+                               ),
+                       ) );
+               }
+
+               return $data;
+       }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>

</body>
</html>