<!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>[54482] trunk: Networks and Sites: Ensure `fileupload_maxk` is an `int` to avoid potential fatal errors.</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/54482">54482</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/54482","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>audrasjb</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-10-11 15:05:29 +0000 (Tue, 11 Oct 2022)</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'>Networks and Sites: Ensure `fileupload_maxk` is an `int` to avoid potential fatal errors.
This changeset fixes a potential fatal error, for example when "Max upload file size" setting is set to an empty value. It also adds unit tests for `upload_size_limit_filter`.
Props mjkhajeh, bhrugesh12, SergeyBiryukov, kebbet, audrasjb, felipeelia.
Fixes <a href="https://core.trac.wordpress.org/ticket/55926">#55926</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunksrcwpincludesmsfunctionsphp">trunk/src/wp-includes/ms-functions.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitenetworkphp">trunk/tests/phpunit/tests/multisite/network.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesformattingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/formatting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/formatting.php 2022-10-11 14:58:03 UTC (rev 54481)
+++ trunk/src/wp-includes/formatting.php 2022-10-11 15:05:29 UTC (rev 54482)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4771,6 +4771,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'users_can_register':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'start_of_week':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'site_icon':
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'fileupload_maxk':
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = absint( $value );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-functions.php 2022-10-11 14:58:03 UTC (rev 54481)
+++ trunk/src/wp-includes/ms-functions.php 2022-10-11 15:05:29 UTC (rev 54482)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2615,12 +2615,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int Upload size limit in bytes.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function upload_size_limit_filter( $size ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $fileupload_maxk = KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $fileupload_maxk = (int) get_site_option( 'fileupload_maxk', 1500 );
+ $max_fileupload_in_bytes = KB_IN_BYTES * $fileupload_maxk;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( get_site_option( 'upload_space_check_disabled' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return min( $size, $fileupload_maxk );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return min( $size, $max_fileupload_in_bytes );
</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">- return min( $size, $fileupload_maxk, get_upload_space_available() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return min( $size, $max_fileupload_in_bytes, get_upload_space_available() );
</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="trunktestsphpunittestsmultisitenetworkphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/network.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/network.php 2022-10-11 14:58:03 UTC (rev 54481)
+++ trunk/tests/phpunit/tests/multisite/network.php 2022-10-11 15:05:29 UTC (rev 54482)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -396,6 +396,54 @@
</span><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">+ * Test the default behavior of upload_size_limit_filter.
+ * If any default option is changed, the function returns the min value between the
+ * parameter passed and the `fileupload_maxk` site option (1500Kb by default)
+ *
+ * @ticket 55926
+ */
+ public function test_upload_size_limit_filter() {
+ $return = upload_size_limit_filter( 1499 * KB_IN_BYTES );
+ $this->assertSame( 1499 * KB_IN_BYTES, $return );
+ $return = upload_size_limit_filter( 1501 * KB_IN_BYTES );
+ $this->assertSame( 1500 * KB_IN_BYTES, $return );
+ }
+
+ /**
+ * Test if upload_size_limit_filter behaves as expected when the `fileupload_maxk` is 0 or an empty string.
+ *
+ * @ticket 55926
+ * @dataProvider data_upload_size_limit_filter_empty_fileupload_maxk
+ */
+ public function test_upload_size_limit_filter_empty_fileupload_maxk( $callable_set_fileupload_maxk ) {
+ add_filter( 'site_option_fileupload_maxk', $callable_set_fileupload_maxk );
+ $return = upload_size_limit_filter( 1500 );
+ $this->assertSame( 0, $return );
+ }
+
+ /**
+ * @ticket 55926
+ */
+ public function data_upload_size_limit_filter_empty_fileupload_maxk() {
+ return array(
+ array( '__return_zero' ),
+ array( '__return_empty_string' ),
+ );
+ }
+
+ /**
+ * When upload_space_check is enabled, the space allowed is also considered by `upload_size_limit_filter`.
+ *
+ * @ticket 55926
+ */
+ public function test_upload_size_limit_filter_when_upload_space_check_enabled() {
+ add_filter( 'get_space_allowed', '__return_zero' );
+ add_filter( 'site_option_upload_space_check_disabled', '__return_false' );
+ $return = upload_size_limit_filter( 100 );
+ $this->assertSame( 0, $return );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @ticket 40489
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_wp_is_large_network
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre>
</div>
</div>
</body>
</html>