<!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>[46490] branches/5.1: Backporting several bug fixes.</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/46490">46490</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/46490","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>whyisjake</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-10-14 18:16:02 +0000 (Mon, 14 Oct 2019)</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'>Backporting several bug fixes.
- Query: Remove the static query property.
- HTTP API: Protect against hex interpretation.
- Filesystem API: Prevent directory travelersals when creating new folders.
- Administration: Ensure that admin referer nonce is valid.
- REST API: Send a Vary: Origin header on GET requests.
Backports <a href="https://core.trac.wordpress.org/changeset/46474">[46474]</a>, <a href="https://core.trac.wordpress.org/changeset/46475">[46475]</a>, <a href="https://core.trac.wordpress.org/changeset/46476">[46476]</a>, <a href="https://core.trac.wordpress.org/changeset/46477">[46477]</a>, <a href="https://core.trac.wordpress.org/changeset/46478">[46478]</a>, <a href="https://core.trac.wordpress.org/changeset/46483">[46483]</a>, <a href="https://core.trac.wordpress.org/changeset/46485">[46485]</a> to the 5.1 branch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches51srcwpincludesclasswpqueryphp">branches/5.1/src/wp-includes/class-wp-query.php</a></li>
<li><a href="#branches51srcwpincludesclasswpphp">branches/5.1/src/wp-includes/class-wp.php</a></li>
<li><a href="#branches51srcwpincludesfunctionsphp">branches/5.1/src/wp-includes/functions.php</a></li>
<li><a href="#branches51srcwpincludeshttpphp">branches/5.1/src/wp-includes/http.php</a></li>
<li><a href="#branches51srcwpincludespluggablephp">branches/5.1/src/wp-includes/pluggable.php</a></li>
<li><a href="#branches51srcwpincludesrestapiphp">branches/5.1/src/wp-includes/rest-api.php</a></li>
<li><a href="#branches51testsphpunittestsauthphp">branches/5.1/tests/phpunit/tests/auth.php</a></li>
<li><a href="#branches51testsphpunittestsqueryvarsphp">branches/5.1/tests/phpunit/tests/query/vars.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches51srcwpincludesclasswpqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.1/src/wp-includes/class-wp-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.1/src/wp-includes/class-wp-query.php 2019-10-14 18:01:53 UTC (rev 46489)
+++ branches/5.1/src/wp-includes/class-wp-query.php 2019-10-14 18:16:02 UTC (rev 46490)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -529,7 +529,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'attachment_id',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'static',
</del><span class="cx" style="display: block; padding: 0 10px"> 'pagename',
</span><span class="cx" style="display: block; padding: 0 10px"> 'page_id',
</span><span class="cx" style="display: block; padding: 0 10px"> 'second',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -793,7 +792,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If year, month, day, hour, minute, and second are set, a single
</span><span class="cx" style="display: block; padding: 0 10px"> // post is being queried.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_single = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( '' != $qv['static'] || '' != $qv['pagename'] || ! empty( $qv['page_id'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( '' != $qv['pagename'] || ! empty( $qv['page_id'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->is_page = true;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_single = false;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="branches51srcwpincludesclasswpphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.1/src/wp-includes/class-wp.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.1/src/wp-includes/class-wp.php 2019-10-14 18:01:53 UTC (rev 46489)
+++ branches/5.1/src/wp-includes/class-wp.php 2019-10-14 18:16:02 UTC (rev 46490)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,7 +14,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @var string[]
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public $public_query_vars = array( 'm', 'p', 'posts', 'w', 'cat', 'withcomments', 'withoutcomments', 's', 'search', 'exact', 'sentence', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'tag', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview', 'robots', 'taxonomy', 'term', 'cpage', 'post_type', 'embed' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public $public_query_vars = array( 'm', 'p', 'posts', 'w', 'cat', 'withcomments', 'withoutcomments', 's', 'search', 'exact', 'sentence', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'tag', 'feed', 'author_name', 'pagename', 'page_id', 'error', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview', 'robots', 'taxonomy', 'term', 'cpage', 'post_type', 'embed' );
</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"> * Private query variables.
</span></span></pre></div>
<a id="branches51srcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.1/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.1/src/wp-includes/functions.php 2019-10-14 18:01:53 UTC (rev 46489)
+++ branches/5.1/src/wp-includes/functions.php 2019-10-14 18:16:02 UTC (rev 46490)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1787,6 +1787,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return @is_dir( $target );
</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">+ // Do not allow path traversals.
+ if ( false !== strpos( $target, '../' ) || false !== strpos( $target, '..' . DIRECTORY_SEPARATOR ) ) {
+ return false;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // We need to find the permissions of the parent folder that exists and inherit that.
</span><span class="cx" style="display: block; padding: 0 10px"> $target_parent = dirname( $target );
</span><span class="cx" style="display: block; padding: 0 10px"> while ( '.' != $target_parent && ! is_dir( $target_parent ) && dirname( $target_parent ) !== $target_parent ) {
</span></span></pre></div>
<a id="branches51srcwpincludeshttpphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.1/src/wp-includes/http.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.1/src/wp-includes/http.php 2019-10-14 18:01:53 UTC (rev 46489)
+++ branches/5.1/src/wp-includes/http.php 2019-10-14 18:16:02 UTC (rev 46490)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -555,7 +555,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $ip = gethostbyname( $host );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $ip === $host ) { // Error condition for gethostbyname()
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $ip = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return 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"> if ( $ip ) {
</span></span></pre></div>
<a id="branches51srcwpincludespluggablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.1/src/wp-includes/pluggable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.1/src/wp-includes/pluggable.php 2019-10-14 18:01:53 UTC (rev 46489)
+++ branches/5.1/src/wp-includes/pluggable.php 2019-10-14 18:16:02 UTC (rev 46490)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1092,7 +1092,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * 0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function check_admin_referer( $action = -1, $query_arg = '_wpnonce' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( -1 == $action ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( -1 === $action ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong( __FUNCTION__, __( 'You should specify a nonce action to be verified by using the first parameter.' ), '3.2.0' );
</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">@@ -1111,7 +1111,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'check_admin_referer', $action, $result );
</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 ( ! $result && ! ( -1 == $action && strpos( $referer, $adminurl ) === 0 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $result && ! ( -1 === $action && strpos( $referer, $adminurl ) === 0 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_nonce_ays( $action );
</span><span class="cx" style="display: block; padding: 0 10px"> die();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches51srcwpincludesrestapiphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.1/src/wp-includes/rest-api.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.1/src/wp-includes/rest-api.php 2019-10-14 18:01:53 UTC (rev 46489)
+++ branches/5.1/src/wp-includes/rest-api.php 2019-10-14 18:16:02 UTC (rev 46490)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -587,7 +587,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> header( 'Access-Control-Allow-Origin: ' . $origin );
</span><span class="cx" style="display: block; padding: 0 10px"> header( 'Access-Control-Allow-Methods: OPTIONS, GET, POST, PUT, PATCH, DELETE' );
</span><span class="cx" style="display: block; padding: 0 10px"> header( 'Access-Control-Allow-Credentials: true' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- header( 'Vary: Origin' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ header( 'Vary: Origin', false );
+ } elseif ( ! headers_sent() && 'GET' === $_SERVER['REQUEST_METHOD'] && ! is_user_logged_in() ) {
+ header( 'Vary: Origin', 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"> return $value;
</span></span></pre></div>
<a id="branches51testsphpunittestsauthphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.1/tests/phpunit/tests/auth.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.1/tests/phpunit/tests/auth.php 2019-10-14 18:01:53 UTC (rev 46489)
+++ branches/5.1/tests/phpunit/tests/auth.php 2019-10-14 18:16:02 UTC (rev 46490)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,6 +165,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $_REQUEST['_wpnonce'] );
</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">+ public function test_check_admin_referer_with_default_action_as_string_not_doing_it_wrong() {
+ // A valid nonce needs to be set so the check doesn't die()
+ $_REQUEST['_wpnonce'] = wp_create_nonce( '-1' );
+ $result = check_admin_referer( '-1' );
+ $this->assertSame( 1, $result );
+
+ unset( $_REQUEST['_wpnonce'] );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36361
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="branches51testsphpunittestsqueryvarsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.1/tests/phpunit/tests/query/vars.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.1/tests/phpunit/tests/query/vars.php 2019-10-14 18:01:53 UTC (rev 46489)
+++ branches/5.1/tests/phpunit/tests/query/vars.php 2019-10-14 18:16:02 UTC (rev 46490)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +51,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'tag',
</span><span class="cx" style="display: block; padding: 0 10px"> 'feed',
</span><span class="cx" style="display: block; padding: 0 10px"> 'author_name',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'static',
</del><span class="cx" style="display: block; padding: 0 10px"> 'pagename',
</span><span class="cx" style="display: block; padding: 0 10px"> 'page_id',
</span><span class="cx" style="display: block; padding: 0 10px"> 'error',
</span></span></pre>
</div>
</div>
</body>
</html>