<!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>[54122] trunk: Editor: Refresh nones for metaboxes after reauthentication.</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/54122">54122</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/54122","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>joemcgill</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-09-11 20:44:50 +0000 (Sun, 11 Sep 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'>Editor: Refresh nones for metaboxes after reauthentication.
This fixes an issue where metaboxes fail to save after a session expires and a user logs in again via the heartbeat API.
Props LinSoftware.
Fixes <a href="https://core.trac.wordpress.org/ticket/52584">#52584</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesadminfiltersphp">trunk/src/wp-admin/includes/admin-filters.php</a></li>
<li><a href="#trunksrcwpadminincludesmiscphp">trunk/src/wp-admin/includes/misc.php</a></li>
<li><a href="#trunksrcwpadminincludespostphp">trunk/src/wp-admin/includes/post.php</a></li>
<li><a href="#trunktestsphpunittestsadminincludesPostphp">trunk/tests/phpunit/tests/admin/includesPost.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesadminfiltersphp"></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/admin-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/admin-filters.php 2022-09-11 18:53:28 UTC (rev 54121)
+++ trunk/src/wp-admin/includes/admin-filters.php 2022-09-11 20:44:50 UTC (rev 54122)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,6 +80,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'heartbeat_received', 'heartbeat_autosave', 500, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_refresh_nonces', 'wp_refresh_post_nonces', 10, 3 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_filter( 'wp_refresh_nonces', 'wp_refresh_metabox_loader_nonces', 10, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_refresh_nonces', 'wp_refresh_heartbeat_nonces' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'heartbeat_settings', 'wp_heartbeat_set_suspension' );
</span></span></pre></div>
<a id="trunksrcwpadminincludesmiscphp"></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/misc.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/misc.php 2022-09-11 18:53:28 UTC (rev 54121)
+++ trunk/src/wp-admin/includes/misc.php 2022-09-11 20:44:50 UTC (rev 54122)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1256,6 +1256,41 @@
</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">+ * Refresh nonces used with meta boxes in the block editor.
+ *
+ * @since 6.1.0
+ *
+ * @param array $response The Heartbeat response.
+ * @param array $data The $_POST data sent.
+ * @return array The Heartbeat response.
+ */
+function wp_refresh_metabox_loader_nonces( $response, $data ) {
+ if ( empty( $data['wp-refresh-metabox-loader-nonces'] ) ) {
+ return $response;
+ }
+
+ $received = $data['wp-refresh-metabox-loader-nonces'];
+ $post_id = (int) $received['post_id'];
+
+ if ( ! $post_id ) {
+ return $response;
+ }
+
+ if ( ! current_user_can( 'edit_post', $post_id ) ) {
+ return $response;
+ }
+
+ $response['wp-refresh-metabox-loader-nonces'] = array(
+ 'replace' => array(
+ 'metabox_loader_nonce' => wp_create_nonce( 'meta-box-loader' ),
+ '_wpnonce' => wp_create_nonce( 'update-post_' . $post_id ),
+ ),
+ );
+
+ return $response;
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Adds the latest Heartbeat and REST-API nonce to the Heartbeat response.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.0.0
</span></span></pre></div>
<a id="trunksrcwpadminincludespostphp"></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/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/post.php 2022-09-11 18:53:28 UTC (rev 54121)
+++ trunk/src/wp-admin/includes/post.php 2022-09-11 20:44:50 UTC (rev 54122)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2334,6 +2334,50 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_add_inline_script( 'wp-lists', $script );
</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">+ /*
+ * Refresh nonces used by the meta box loader.
+ *
+ * The logic is very similar to that provided by post.js for the classic editor.
+ */
+ $script = "( function( $ ) {
+ var check, timeout;
+
+ function schedule() {
+ check = false;
+ window.clearTimeout( timeout );
+ timeout = window.setTimeout( function() { check = true; }, 300000 );
+ }
+
+ $( document ).on( 'heartbeat-send.wp-refresh-nonces', function( e, data ) {
+ var post_id, \$authCheck = $( '#wp-auth-check-wrap' );
+
+ if ( check || ( \$authCheck.length && ! \$authCheck.hasClass( 'hidden' ) ) ) {
+ if ( ( post_id = $( '#post_ID' ).val() ) && $( '#_wpnonce' ).val() ) {
+ data['wp-refresh-metabox-loader-nonces'] = {
+ post_id: post_id
+ };
+ }
+ }
+ }).on( 'heartbeat-tick.wp-refresh-nonces', function( e, data ) {
+ var nonces = data['wp-refresh-metabox-loader-nonces'];
+
+ if ( nonces ) {
+ if ( nonces.replace ) {
+ if ( nonces.replace.metabox_loader_nonce && window._wpMetaBoxUrl && wp.url ) {
+ window._wpMetaBoxUrl= wp.url.addQueryArgs( window._wpMetaBoxUrl, { 'meta-box-loader-nonce': nonces.replace.metabox_loader_nonce } );
+ }
+
+ if ( nonces.replace._wpnonce ) {
+ $( '#_wpnonce' ).val( nonces.replace._wpnonce );
+ }
+ }
+ }
+ }).ready( function() {
+ schedule();
+ });
+ } )( jQuery );";
+ wp_add_inline_script( 'heartbeat', $script );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Reset meta box data.
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_meta_boxes = $_original_meta_boxes;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsadminincludesPostphp"></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/includesPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesPost.php 2022-09-11 18:53:28 UTC (rev 54121)
+++ trunk/tests/phpunit/tests/admin/includesPost.php 2022-09-11 20:44:50 UTC (rev 54122)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1016,4 +1016,42 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 0, post_exists( $title, null, null, $post_type, 'draft' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 0, post_exists( $title, null, null, 'wp_tests', $post_status ) );
</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 refreshed nonce for metabox loader.
+ *
+ * @return void
+ */
+ public function test_user_get_refreshed_metabox_nonce() {
+
+ // Create a post by the current user.
+ wp_set_current_user( self::$editor_id );
+
+ $post_data = array(
+ 'post_content' => 'Test post content',
+ 'post_title' => 'Test post title',
+ 'post_excerpt' => 'Test post excerpt',
+ 'post_author' => self::$editor_id,
+ 'post_status' => 'draft',
+ );
+ $post_id = wp_insert_post( $post_data );
+
+ // Simulate the $_POST data from the heartbeat.
+ $data = array(
+ 'wp-refresh-metabox-loader-nonces' => array(
+ 'post_id' => (string) $post_id,
+ ),
+ 'wp-refresh-post-lock' => array(
+ 'lock' => '1658203298:1',
+ 'post_id' => (string) $post_id,
+ ),
+ );
+
+ // Call the function we're testing.
+ $response = wp_refresh_metabox_loader_nonces( array(), $data );
+
+ // Ensure that both nonces were created.
+ $this->assertNotEmpty( $response['wp-refresh-metabox-loader-nonces']['replace']['_wpnonce'] );
+ $this->assertNotEmpty( $response['wp-refresh-metabox-loader-nonces']['replace']['metabox_loader_nonce'] );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>