<!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>[BuddyPress][14034] trunk: BP REST API: spammed users can not be retrivied from non-admin users.</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="http://buddypress.trac.wordpress.org/changeset/14034">14034</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/14034","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>espellcaste</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-10-02 03:23:39 +0000 (Wed, 02 Oct 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'>BP REST API: spammed users can not be retrivied from non-admin users.
Align the BP REST API with the web version, and show spammer users to Administrators only.
Props imath and emaralive.
See <a href="http://buddypress.trac.wordpress.org/ticket/9145">#9145</a>
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/9231">#9231</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpmembersclassesclassbpmembersrestcontrollerphp">trunk/src/bp-members/classes/class-bp-members-rest-controller.php</a></li>
<li><a href="#trunktestsphpunittestcasesmemberstestcontrollerphp">trunk/tests/phpunit/testcases/members/test-controller.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpmembersclassesclassbpmembersrestcontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-members/classes/class-bp-members-rest-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/classes/class-bp-members-rest-controller.php 2024-09-30 01:52:43 UTC (rev 14033)
+++ trunk/src/bp-members/classes/class-bp-members-rest-controller.php 2024-10-02 03:23:39 UTC (rev 14034)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -243,10 +243,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $member_query = new BP_User_Query( $args );
</span><span class="cx" style="display: block; padding: 0 10px"> $member = reset( $member_query->results );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $member = $this->prepare_item_for_response( $member, $request );
- $response = rest_ensure_response( $member );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $member = $this->prepare_item_for_response( $member, $request );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $response;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return rest_ensure_response( $member );
</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 parent::get_item( $request );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -257,7 +256,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 15.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param WP_REST_Request $request Full details about the request.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param WP_REST_Request $request Full details about the request.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return true|WP_Error
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_item_permissions_check( $request ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -280,20 +279,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'status' => 404,
</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">- } elseif ( 'edit' === $request->get_param( 'context' ) ) {
- if ( get_current_user_id() === $user->ID || bp_current_user_can( 'list_users' ) ) {
- $retval = true;
- } else {
- $retval = new WP_Error(
- 'bp_rest_authorization_required',
- __( 'Sorry, you are not allowed to view members with the edit context.', 'buddypress' ),
- array(
- 'status' => rest_authorization_required_code(),
- )
- );
- }
- } else {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( get_current_user_id() === $user->ID && ! bp_is_user_spammer( $user->ID ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $retval = true;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'edit' === $request->get_param( 'context' ) && ! bp_current_user_can( 'list_users' ) ) {
+ $retval = new WP_Error(
+ 'bp_rest_authorization_required',
+ __( 'Sorry, you are not allowed to view members with the edit context.', 'buddypress' ),
+ array( 'status' => rest_authorization_required_code() )
+ );
+ } elseif ( bp_current_user_can( 'bp_moderate' ) || ! bp_is_user_spammer( $user->ID ) ) {
+ $retval = 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">
</span></span></pre></div>
<a id="trunktestsphpunittestcasesmemberstestcontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/members/test-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/members/test-controller.php 2024-09-30 01:52:43 UTC (rev 14033)
+++ trunk/tests/phpunit/testcases/members/test-controller.php 2024-10-02 03:23:39 UTC (rev 14034)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,7 +36,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_ids' => array( $u1, $u2, $u3 ),
</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">- $request->set_param( 'context', 'view' );
</del><span class="cx" style="display: block; padding: 0 10px"> $response = $this->server->dispatch( $request );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 200, $response->get_status() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,7 +63,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_ids' => array( $u1, $u2, $u3 ),
</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">- $request->set_param( 'context', 'view' );
</del><span class="cx" style="display: block; padding: 0 10px"> $response = $this->server->dispatch( $request );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertErrorResponse( 'bp_rest_authorization_required', $response, rest_authorization_required_code() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,10 +112,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 200, $response->get_status() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $members = $response->get_data();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $members );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertCount( 3, $members );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( 3 === count( $members ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $latest_activities = wp_list_pluck( $members, 'last_activity', 'id' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( bp_rest_prepare_date_response( $date_last_activity ), $latest_activities[ $u1 ]['date'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,6 +135,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $u4 = static::factory()->user->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'GET', $this->endpoint_url );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $request->set_param( 'context', 'view' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $request->set_query_params(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_ids' => array( $u1, $u2, $u3, $u4 ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,7 +144,6 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $request->set_param( 'context', 'view' );
</del><span class="cx" style="display: block; padding: 0 10px"> $response = $this->server->dispatch( $request );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 200, $response->get_status() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,12 +180,12 @@
</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"> $request = new WP_REST_Request( 'GET', $this->endpoint_url );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $request->set_param( 'context', 'view' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $request->set_query_params(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_ids' => array( $u1, $u2, $u3 ),
</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">- $request->set_param( 'context', 'view' );
</del><span class="cx" style="display: block; padding: 0 10px"> $response = $this->server->dispatch( $request );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 200, $response->get_status() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -543,6 +541,90 @@
</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">+ * @group get_item
+ */
+ public function test_get_spammed_user() {
+ $u = static::factory()->user->create();
+
+ // Spam the user.
+ bp_core_process_spammer_status( $u, 'spam' );
+
+ $this->assertTrue( bp_is_user_spammer( $u ) );
+
+ $request = new WP_REST_Request( 'GET', sprintf( $this->endpoint_url . '/%d', $u ) );
+ $request->set_param( 'context', 'view' );
+ $response = $this->server->dispatch( $request );
+
+ $this->assertErrorResponse( 'bp_rest_authorization_required', $response, rest_authorization_required_code() );
+ }
+
+ /**
+ * @group get_item
+ */
+ public function test_get_spammed_user_with_random_logged_in_user() {
+ $u = static::factory()->user->create();
+ $u2 = static::factory()->user->create();
+
+ // Spam the user.
+ bp_core_process_spammer_status( $u, 'spam' );
+
+ $this->assertTrue( bp_is_user_spammer( $u ) );
+
+ wp_set_current_user( $u2 );
+
+ $request = new WP_REST_Request( 'GET', sprintf( $this->endpoint_url . '/%d', $u ) );
+ $request->set_param( 'context', 'view' );
+ $response = $this->server->dispatch( $request );
+
+ $this->assertErrorResponse( 'bp_rest_authorization_required', $response, rest_authorization_required_code() );
+ }
+
+ /**
+ * @group get_item
+ */
+ public function test_get_spammed_user_with_spammed_user() {
+ $u = static::factory()->user->create();
+
+ // Spam the user.
+ bp_core_process_spammer_status( $u, 'spam' );
+
+ $this->assertTrue( bp_is_user_spammer( $u ) );
+
+ wp_set_current_user( $u );
+
+ $request = new WP_REST_Request( 'GET', sprintf( $this->endpoint_url . '/%d', $u ) );
+ $request->set_param( 'context', 'view' );
+ $response = $this->server->dispatch( $request );
+
+ $this->assertErrorResponse( 'bp_rest_authorization_required', $response, rest_authorization_required_code() );
+ }
+
+ /**
+ * @group get_item
+ */
+ public function test_get_spammed_user_as_admin() {
+ $u = static::factory()->user->create();
+
+ // Spam the user.
+ bp_core_process_spammer_status( $u, 'spam' );
+
+ $this->assertTrue( bp_is_user_spammer( $u ) );
+
+ wp_set_current_user( $this->user );
+
+ $request = new WP_REST_Request( 'GET', sprintf( $this->endpoint_url . '/%d', $u ) );
+ $request->set_param( 'context', 'view' );
+ $response = $this->server->dispatch( $request );
+
+ $this->assertEquals( 200, $response->get_status() );
+
+ $member = $response->get_data();
+
+ $this->assertNotEmpty( $member );
+ $this->assertSame( $u, $member['id'] );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @group create_item
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_create_item() {
</span></span></pre>
</div>
</div>
</body>
</html>