<!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>[43990] branches/4.8/tests/phpunit/tests/functions.php: Media: Improve verification of MIME file types.</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 { white-space: pre-line; 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/43990">43990</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/43990","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jeremyfelt</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-12-12 23:03:09 +0000 (Wed, 12 Dec 2018)</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: Improve verification of MIME file types.

Merges <a href="https://core.trac.wordpress.org/changeset/43988">[43988]</a> to the 4.8 branch.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branches48srcwpincludesfunctionsphp">branches/4.8/src/wp-includes/functions.php</a></li>
<li><a href="#branches48testsphpunittestsfunctionsphp">branches/4.8/tests/phpunit/tests/functions.php</a></li>
</ul>

<h3>Property Changed</h3>
<ul>
<li><a href="#branches48">branches/4.8/</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.8
</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.8 2018-12-12 23:02:11 UTC (rev 43989)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.8  2018-12-12 23:03:09 UTC (rev 43990)
</ins><a id="branches48"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.8</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.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/4.9:42434
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/branches/5.0:43988
</ins><span class="cx" style="display: block; padding: 0 10px"> /trunk:40872-40873,40879,40881,40883,40885,40892-40893,40896-40897,40901,40926-40927,40939,40941,40961,40990-40991,40995,41000,41009,41020,41022,41028,41035,41037,41047,41050,41070,41072,41086,41088,41094,41112,41115-41116,41132,41134,41136,41139,41141,41250-41251,41260,41294,41335,41386,41393,41395,41397-41398,41448,41457,41470,41483,41496,41636,41662,41870,42056,42119-42120,42220,42258-42261,42424,42433,42892-42894
</span><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches48srcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.8/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.8/src/wp-includes/functions.php        2018-12-12 23:02:11 UTC (rev 43989)
+++ branches/4.8/src/wp-includes/functions.php  2018-12-12 23:03:09 UTC (rev 43990)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2333,20 +2333,55 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                // fileinfo often misidentifies obscure files as one of these types
+               $nonspecific_types = array(
+                       'application/octet-stream',
+                       'application/encrypted',
+                       'application/CDFV2-encrypted',
+                       'application/zip',
+               );
+
</ins><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 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.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          * If $real_mime doesn't match the content type we're expecting from the file's extension,
+                * we need to do some additional vetting. Media types and those listed in $nonspecific_types are
+                * allowed some leeway, but anything else must exactly match the real content type.
</ins><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 && ( $real_mime !== $type ) && ( 0 === strpos( $real_mime, 'application' ) ) ) {
-                       $allowed = get_allowed_mime_types();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( in_array( $real_mime, $nonspecific_types, true ) ) {
+                       // File is a non-specific binary type. That's ok if it's a type that generally tends to be binary.
+                       if ( !in_array( substr( $type, 0, strcspn( $type, '/' ) ), array( 'application', 'video', 'audio' ) ) ) {
+                               $type = $ext = false;
+                       }
+               } elseif ( 0 === strpos( $real_mime, 'video/' ) || 0 === strpos( $real_mime, 'audio/' ) ) {
+                       /*
+                        * For these types, only the major type must match the real value.
+                        * This means that common mismatches are forgiven: application/vnd.apple.numbers is often misidentified as application/zip,
+                        * and some media files are commonly named with the wrong extension (.mov instead of .mp4)
+                        */
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( ! in_array( $real_mime, $allowed ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( substr( $real_mime, 0, strcspn( $real_mime, '/' ) ) !== substr( $type, 0, strcspn( $type, '/' ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                 $type = $ext = false;
</span><span class="cx" style="display: block; padding: 0 10px">                        }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                } else {
+                       if ( $type !== $real_mime ) {
+                               /*
+                                * Everything else including image/* and application/*: 
+                                * If the real content type doesn't match the file extension, assume it's dangerous.
+                                */
+                               $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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        // The mime type must be allowed 
+       if ( $type ) {
+               $allowed = get_allowed_mime_types();
+
+               if ( ! in_array( $type, $allowed ) ) {
+                       $type = $ext = false;
+               }
+       }
+
</ins><span class="cx" style="display: block; padding: 0 10px">         /**
</span><span class="cx" style="display: block; padding: 0 10px">         * Filters the "real" file type of the given file.
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span></span></pre></div>
<a id="branches48testsphpunittestsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.8/tests/phpunit/tests/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.8/tests/phpunit/tests/functions.php    2018-12-12 23:02:11 UTC (rev 43989)
+++ branches/4.8/tests/phpunit/tests/functions.php      2018-12-12 23:03:09 UTC (rev 43990)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1065,8 +1065,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                DIR_TESTDATA . '/formatting/big5.txt',
</span><span class="cx" style="display: block; padding: 0 10px">                                'big5.jpg',
</span><span class="cx" style="display: block; padding: 0 10px">                                array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        'ext' => 'jpg',
-                                       'type' => 'image/jpeg',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 'ext' => false,
+                                       'type' => false,
</ins><span class="cx" style="display: block; padding: 0 10px">                                         'proper_filename' => false,
</span><span class="cx" style="display: block; padding: 0 10px">                                ),
</span><span class="cx" style="display: block; padding: 0 10px">                        ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1080,6 +1080,26 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        'proper_filename' => false,
</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">+                        // Non-image file not allowed even if it's named like one.
+                       array(
+                               DIR_TESTDATA . '/export/crazy-cdata.xml',
+                               'crazy-cdata.jpg',
+                               array(
+                                       'ext' => false,
+                                       'type' => false,
+                                       'proper_filename' => false,
+                               ),
+                       ),
+                       // Non-image file not allowed if it's named like something else.
+                       array(
+                               DIR_TESTDATA . '/export/crazy-cdata.xml',
+                               'crazy-cdata.doc',
+                               array(
+                                       'ext' => false,
+                                       'type' => false,
+                                       'proper_filename' => 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">                // Test a few additional file types on single sites.
</span></span></pre>
</div>
</div>

</body>
</html>