Skip to content

Admin: Correct logic flow for nonce and capability checks in post.php #11637

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
liaisontw wants to merge 1 commit into
base: trunk
Choose a base branch
from
+116 −3
Open

Admin: Correct logic flow for nonce and capability checks in post.php #11637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/wp-admin/post.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,16 @@
switch ( $action ) {
case 'post-quickdraft-save':
// Check nonce and capabilities.
$nonce = $_REQUEST['_wpnonce'];
$nonce = $_REQUEST['_wpnonce'] ?? '';
$post_id = (int) ( $_REQUEST['post_ID'] ?? 0 );
// Explicitly check for a positive ID to avoid falling back to the global $post object.
$post = ( $post_id > 0 ) ? get_post( $post_id ) : null;
$error_msg = false;

// For output of the Quick Draft dashboard widget.
require_once ABSPATH . 'wp-admin/includes/dashboard.php';

if ( ! wp_verify_nonce( $nonce, 'add-post' ) ) {
if ( ! $post || ! wp_verify_nonce( $nonce, 'add-post' ) ) {
$error_msg = __( 'Unable to submit this form, please refresh and try again.' );
}

Expand All @@ -90,7 +93,6 @@
return wp_dashboard_quick_press( $error_msg );
}

$post = get_post( $_REQUEST['post_ID'] );
check_admin_referer( 'add-' . $post->post_type );

$_POST['comment_status'] = get_default_comment_status( $post->post_type );
Expand Down
111 changes: 111 additions & 0 deletions tests/phpunit/tests/admin/wpPost.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
<?php

/**
* @group admin
*/
class Tests_Admin_Post_QuickDraftSave extends WP_UnitTestCase {
protected static $admin_id;

public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ): void {
self::$admin_id = $factory->user->create( array( 'role' => 'administrator' ) );
}

public function set_up() {
parent::set_up();
wp_set_current_user( self::$admin_id );
set_current_screen( 'dashboard' );
}

public function tear_down() {
parent::tear_down();
set_current_screen( 'front' );
unset( $_REQUEST['_wpnonce'], $_REQUEST['post_ID'], $_REQUEST['action'] );
}

/**
* Test Happy Path: Successfully validating a correct nonce and post_ID.
*
* @ticket 65052
*/
public function test_post_quickdraft_save_happy_path() {
$post_id = self::factory()->post->create( array( 'post_status' => 'draft' ) );
$nonce = wp_create_nonce( 'add-post' );

$_REQUEST['_wpnonce'] = $nonce;
$_REQUEST['post_ID'] = $post_id;

$nonce_req = $_REQUEST['_wpnonce'] ?? '';
$id_req = (int) ( $_REQUEST['post_ID'] ?? 0 );
$post = $id_req ? get_post( $id_req ) : null;

$error_msg = false;
if ( ! $post || ! wp_verify_nonce( $nonce_req, 'add-post' ) ) {
$error_msg = __( 'Unable to submit this form, please refresh and try again.' );
}

$this->assertFalse( $error_msg, 'Happy path should not produce an error message.' );
$this->assertNotNull( $post );
$this->assertEquals( $post_id, $post->ID );
}

/**
* test post quickdraft save missing nonce
*
* @ticket 65052
*/
public function test_post_quickdraft_save_missing_nonce() {
$_REQUEST['action'] = 'post-quickdraft-save';
unset( $_REQUEST['_wpnonce'] ); // invliad nonce
$_REQUEST['post_ID'] = 0;

$nonce = $_REQUEST['_wpnonce'] ?? '';
$post_id = (int) ( $_REQUEST['post_ID'] ?? 0 );
$post = $post_id ? get_post( $post_id ) : null;

$error_msg = false;
if ( ! $post || ! wp_verify_nonce( $nonce, 'add-post' ) ) {
$error_msg = __( 'Unable to submit this form, please refresh and try again.' );
}

$this->assertSame( 'Unable to submit this form, please refresh and try again.', $error_msg );
}

/**
* test post quickdraft save invalid all
*
* @ticket 65052
*/
public function test_post_quickdraft_save_invalid_all() {
$_REQUEST['_wpnonce'] = 'invalid_nonce';
$_REQUEST['post_ID'] = -1; // invalid ID

$nonce = $_REQUEST['_wpnonce'] ?? '';
$post_id = (int) ( $_REQUEST['post_ID'] ?? 0 );
$post = $post_id ? get_post( $post_id ) : null;

$this->assertNull( $post );

$error_msg = false;
if ( ! $post || ! wp_verify_nonce( $nonce, 'add-post' ) ) {
$error_msg = __( 'Unable to submit this form, please refresh and try again.' );
}

$this->assertNotEmpty( $error_msg );
}

/**
* test post quickdraft save should not use global post
*
* @ticket 65052
*/
public function test_post_quickdraft_save_should_not_use_global_post() {
$other_post_id = self::factory()->post->create();
$GLOBALS['post'] = get_post( $other_post_id );

$_REQUEST['post_ID'] = 0;
$post_id = (int) $_REQUEST['post_ID'];
$post = ( $post_id > 0 ) ? get_post( $post_id ) : null;

$this->assertNull( $post, 'Should return null instead of falling back to global post.' );
}
}
Loading