<!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>[42620] branches/4.9: Customize: Ensure `customize_autosaved` requests only use revision of logged-in user.</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/42620">42620</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/42620","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-01-30 14:43:55 +0000 (Tue, 30 Jan 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'>Customize: Ensure `customize_autosaved` requests only use revision of logged-in user.
Props dlh, westonruter.
See <a href="https://core.trac.wordpress.org/ticket/42433">#42433</a>, <a href="https://core.trac.wordpress.org/ticket/39896">#39896</a>.
Merges <a href="https://core.trac.wordpress.org/changeset/42615">[42615]</a> to the 4.9 branch.
Fixes <a href="https://core.trac.wordpress.org/ticket/42450">#42450</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches49srcwpincludesclasswpcustomizemanagerphp">branches/4.9/src/wp-includes/class-wp-customize-manager.php</a></li>
<li><a href="#branches49testsphpunittestsajaxCustomizeManagerphp">branches/4.9/tests/phpunit/tests/ajax/CustomizeManager.php</a></li>
<li><a href="#branches49testsphpunittestscustomizemanagerphp">branches/4.9/tests/phpunit/tests/customize/manager.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches49">branches/4.9/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.9
</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.9 2018-01-30 02:28:14 UTC (rev 42619)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.9 2018-01-30 14:43:55 UTC (rev 42620)
</ins><a id="branches49"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.9</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,42132,42134,42136,42138,42140,42144,42146,42148,42150,42152-42153,42155,42157,42159,42161,42163,42169,42171,42173,42175,42177,42181,42183,42185,42187,42189,42191,42193,42199,42203,42210,42214,42220,42222,42226,42242,42244,42247,42251,42258-42261,42350,42362,42364-42368,42374,42388,42390,42401,42417,42421,42423-42425,42430,42433,42437,42441,42443,42446-42447,42449,42451,42453,42457,42459,42462,42491,42521,42529,42531,42533,42536,42538,42541,42543,42545,42549,42566,42568,42570,42572,42574,42576,42579,42581-42582,42584-42585,42587-42588,42590,42592,42594-42595,42598-42599,42602,42604,42606
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:18512,42132,42134,42136,42138,42140,42144,42146,42148,42150,42152-42153,42155,42157,42159,42161,42163,42169,42171,42173,42175,42177,42181,42183,42185,42187,42189,42191,42193,42199,42203,42210,42214,42220,42222,42226,42242,42244,42247,42251,42258-42261,42350,42362,42364-42368,42374,42388,42390,42401,42417,42421,42423-42425,42430,42433,42437,42441,42443,42446-42447,42449,42451,42453,42457,42459,42462,42491,42521,42529,42531,42533,42536,42538,42541,42543,42545,42549,42566,42568,42570,42572,42574,42576,42579,42581-42582,42584-42585,42587-42588,42590,42592,42594-42595,42598-42599,42602,42604,42606,42615
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches49srcwpincludesclasswpcustomizemanagerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-includes/class-wp-customize-manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-includes/class-wp-customize-manager.php 2018-01-30 02:28:14 UTC (rev 42619)
+++ branches/4.9/src/wp-includes/class-wp-customize-manager.php 2018-01-30 14:43:55 UTC (rev 42620)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1135,7 +1135,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $changeset_post_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->_changeset_data = array();
</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">- if ( $this->autosaved() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $this->autosaved() && is_user_logged_in() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $autosave_post = wp_get_post_autosave( $changeset_post_id, get_current_user_id() );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $autosave_post ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $this->get_changeset_post_data( $autosave_post->ID );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2878,10 +2878,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_array['edit_date'] = true; // Prevent date clearing.
</span><span class="cx" style="display: block; padding: 0 10px"> $r = wp_update_post( wp_slash( $post_array ), true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Delete autosave revision when the changeset is updated.
- $autosave_draft = wp_get_post_autosave( $changeset_post_id, get_current_user_id() );
- if ( $autosave_draft ) {
- wp_delete_post( $autosave_draft->ID, true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Delete autosave revision for user when the changeset is updated.
+ if ( ! empty( $args['user_id'] ) ) {
+ $autosave_draft = wp_get_post_autosave( $changeset_post_id, $args['user_id'] );
+ if ( $autosave_draft ) {
+ wp_delete_post( $autosave_draft->ID, true );
+ }
</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"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3493,6 +3495,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function handle_dismiss_autosave_or_lock_request() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Calls to dismiss_user_auto_draft_changesets() and wp_get_post_autosave() require non-zero get_current_user_id().
+ if ( ! is_user_logged_in() ) {
+ wp_send_json_error( 'unauthenticated', 401 );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->is_preview() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error( 'not_preview', 400 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4574,7 +4581,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $changeset_post_id = $this->changeset_post_id();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->saved_starter_content_changeset && ! $this->autosaved() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $changeset_post_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $autosave_revision_post = wp_get_post_autosave( $changeset_post_id, get_current_user_id() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_user_logged_in() ) {
+ $autosave_revision_post = wp_get_post_autosave( $changeset_post_id, get_current_user_id() );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $autosave_autodraft_posts = $this->get_changeset_posts( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'posts_per_page' => 1,
</span></span></pre></div>
<a id="branches49testsphpunittestsajaxCustomizeManagerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/tests/phpunit/tests/ajax/CustomizeManager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/tests/phpunit/tests/ajax/CustomizeManager.php 2018-01-30 02:28:14 UTC (rev 42619)
+++ branches/4.9/tests/phpunit/tests/ajax/CustomizeManager.php 2018-01-30 14:43:55 UTC (rev 42620)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -520,11 +520,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::dismiss_user_auto_draft_changesets()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_handle_dismiss_autosave_or_lock_request() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $uuid = wp_generate_uuid4();
- $wp_customize = $this->set_up_valid_state( $uuid );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $uuid = wp_generate_uuid4();
+ $wp_customize = $this->set_up_valid_state( $uuid );
+ $valid_user_id = get_current_user_id();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Temporarily remove user to test requirement that user is logged in. See #42450.
+ wp_set_current_user( 0 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->make_ajax_call( 'customize_dismiss_autosave_or_lock' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $this->_last_response_parsed['success'] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 'unauthenticated', $this->_last_response_parsed['data'] );
+ wp_set_current_user( $valid_user_id );
+
+ $this->make_ajax_call( 'customize_dismiss_autosave_or_lock' );
+ $this->assertFalse( $this->_last_response_parsed['success'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'invalid_nonce', $this->_last_response_parsed['data'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $nonce = wp_create_nonce( 'customize_dismiss_autosave_or_lock' );
</span></span></pre></div>
<a id="branches49testsphpunittestscustomizemanagerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/tests/phpunit/tests/customize/manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/tests/phpunit/tests/customize/manager.php 2018-01-30 02:28:14 UTC (rev 42619)
+++ branches/4.9/tests/phpunit/tests/customize/manager.php 2018-01-30 14:43:55 UTC (rev 42620)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -498,6 +498,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> wp_list_pluck( $wp_customize->changeset_data(), 'value' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // If there is no user, don't fetch the most recent autosave. See #42450.
+ wp_set_current_user( 0 );
+ $wp_customize = new WP_Customize_Manager(
+ array(
+ 'changeset_uuid' => $uuid,
+ 'autosaved' => true,
+ )
+ );
+ $this->assertEquals( $data, $wp_customize->changeset_data() );
</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>
</div>
</body>
</html>