<!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>[58022] trunk: Upgrade/Install: Validate source & destination values in `WP_Ugrader`.</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/58022">58022</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/58022","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>peterwilsoncc</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-04-18 03:15:50 +0000 (Thu, 18 Apr 2024)</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'>Upgrade/Install: Validate source & destination values in `WP_Ugrader`.
Adds a missing string and some additional validation of paths in the upgrader class.
Follow up to <a href="https://core.trac.wordpress.org/changeset/56992">[56992]</a>.
Props costdev, jipmoors, karlijnbok, swissspidy, afragen, mukesh27.
Fixes <a href="https://core.trac.wordpress.org/ticket/59712">#59712</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpupgraderphp">trunk/src/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunktestsphpunittestsadminwpUpgraderphp">trunk/tests/phpunit/tests/admin/wpUpgrader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-upgrader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-upgrader.php 2024-04-17 20:19:59 UTC (rev 58021)
+++ trunk/src/wp-admin/includes/class-wp-upgrader.php 2024-04-18 03:15:50 UTC (rev 58022)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -196,6 +196,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Directory name. */
</span><span class="cx" style="display: block; padding: 0 10px"> $this->strings['fs_no_folder'] = __( 'Unable to locate needed folder (%s).' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->strings['no_package'] = __( 'Package not available.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->strings['download_failed'] = __( 'Download failed.' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->strings['installing_package'] = __( 'Installing the latest version…' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->strings['no_files'] = __( 'The package contains no files.' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -527,7 +528,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> set_time_limit( 300 );
</span><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">- if ( empty( $source ) || empty( $destination ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (
+ ( ! is_string( $source ) || '' === $source || trim( $source ) !== $source ) ||
+ ( ! is_string( $destination ) || '' === $destination || trim( $destination ) !== $destination )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'bad_request', $this->strings['bad_request'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $this->skin->feedback( 'installing_package' );
</span></span></pre></div>
<a id="trunktestsphpunittestsadminwpUpgraderphp"></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/admin/wpUpgrader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/wpUpgrader.php 2024-04-17 20:19:59 UTC (rev 58021)
+++ trunk/tests/phpunit/tests/admin/wpUpgrader.php 2024-04-18 03:15:50 UTC (rev 58022)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,6 +137,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'fs_no_plugins_dir',
</span><span class="cx" style="display: block; padding: 0 10px"> 'fs_no_themes_dir',
</span><span class="cx" style="display: block; padding: 0 10px"> 'fs_no_folder',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'no_package',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'download_failed',
</span><span class="cx" style="display: block; padding: 0 10px"> 'installing_package',
</span><span class="cx" style="display: block; padding: 0 10px"> 'no_files',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -777,16 +778,36 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function data_install_package_invalid_paths() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'empty string' => array( 'path' => '' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'empty string' => array( 'path' => '' ),
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Type checks.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'empty array' => array( 'path' => array() ),
- '(int) 0' => array( 'path' => 0 ),
- '(int) -0' => array( 'path' => -0 ),
- '(float) 0.0' => array( 'path' => 0.0 ),
- '(float) -0.0' => array( 'path' => -0.0 ),
- '(bool) false' => array( 'path' => false ),
- 'null' => array( 'path' => null ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'empty array' => array( 'path' => array() ),
+ 'populated array' => array( 'path' => array( '/' ) ),
+ '(int) 0' => array( 'path' => 0 ),
+ '(int) -0' => array( 'path' => -0 ),
+ '(int) -1' => array( 'path' => -1 ),
+ '(int) 1' => array( 'path' => 1 ),
+ '(float) 0.0' => array( 'path' => 0.0 ),
+ '(float) -0.0' => array( 'path' => -0.0 ),
+ '(float) 1.0' => array( 'path' => 1.0 ),
+ '(float) -1.0' => array( 'path' => -1.0 ),
+ '(bool) false' => array( 'path' => false ),
+ '(bool) true' => array( 'path' => true ),
+ 'null' => array( 'path' => null ),
+ 'empty object' => array( 'path' => new stdClass() ),
+ 'populated object' => array( 'path' => (object) array( '/' ) ),
+
+ // Ensures that `trim()` is run triggering an empty array.
+ 'a string with spaces' => array( 'path' => ' ' ),
+ 'a string with tabs' => array( 'path' => "\t\t" ),
+ 'a string with new lines' => array( 'path' => "\n\n" ),
+ 'a string with carriage returns' => array( 'path' => "\r\r" ),
+
+ // Ensure that strings with leading/trailing whitespace are invalid.
+ 'a path with a leading space' => array( 'path' => ' /path' ),
+ 'a path with a trailing space' => array( 'path' => '/path ' ),
+ 'a path with a leading tab' => array( 'path' => "\t/path" ),
+ 'a path with a trailing tab' => array( 'path' => "/path\t" ),
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1557,6 +1578,31 @@
</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">+ * Tests that `WP_Upgrader::download_package()` returns a WP_Error object
+ * for an empty package.
+ *
+ * @ticket 59712
+ *
+ * @covers WP_Upgrader::download_package
+ */
+ public function test_download_package_should_return_a_wp_error_object_for_an_empty_package() {
+ self::$instance->init();
+
+ $result = self::$instance->download_package( '' );
+
+ $this->assertWPError(
+ $result,
+ 'WP_Upgrader::download_package() did not return a WP_Error object'
+ );
+
+ $this->assertSame(
+ 'no_package',
+ $result->get_error_code(),
+ 'Unexpected WP_Error code'
+ );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Tests that `WP_Upgrader::download_package()` returns a file with the
</span><span class="cx" style="display: block; padding: 0 10px"> * package name in it.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre>
</div>
</div>
</body>
</html>