<!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][12154] trunk: Activity: fix activity permalinks for unauthenticated 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/12154">12154</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/12154","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>djpaul</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-06-03 10:36:32 +0000 (Sun, 03 Jun 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'>Activity: fix activity permalinks for unauthenticated users.
This change also re-adds the block on accessing spammed activity items.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/7843">#7843</a>
Props r-a-y, espellcaste</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivitybpactivityfunctionsphp">trunk/src/bp-activity/bp-activity-functions.php</a></li>
<li><a href="#trunktestsphpunittestcasesactivityfunctionsphp">trunk/tests/phpunit/testcases/activity/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivitybpactivityfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/bp-activity-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/bp-activity-functions.php 2018-05-31 17:21:48 UTC (rev 12153)
+++ trunk/src/bp-activity/bp-activity-functions.php 2018-06-03 10:36:32 UTC (rev 12154)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3107,7 +3107,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return boolean True on success, false on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_activity_user_can_read( $activity, $user_id = 0 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $retval = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $retval = true;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Fallback.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $user_id ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3114,26 +3114,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = bp_loggedin_user_id();
</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">- // Admins and moderators can see everything.
- if ( bp_current_user_can( 'bp_moderate' ) ) {
- $retval = true;
- }
-
- // If activity author match user, allow access as well.
- if ( $user_id === $activity->user_id ) {
- $retval = true;
- }
-
- // If activity is from a group, do an extra cap check.
- if ( ! $retval && bp_is_active( 'groups' ) && $activity->component === buddypress()->groups->id ) {
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If activity is from a group, do extra cap checks.
+ if ( bp_is_active( 'groups' ) && buddypress()->groups->id === $activity->component ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Check to see if the user has access to the activity's parent group.
</span><span class="cx" style="display: block; padding: 0 10px"> $group = groups_get_group( $activity->item_id );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $group ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $retval = $group->user_has_access;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // For logged-in user, we can check against the 'user_has_access' prop.
+ if ( bp_loggedin_user_id() === $user_id ) {
+ $retval = $group->user_has_access;
+
+ // Manually check status.
+ } elseif ( 'private' === $group->status || 'hidden' === $group->status ) {
+ // Only group members that are not banned can view.
+ if ( ! groups_is_user_member( $user_id, $activity->item_id ) || groups_is_user_banned( $user_id, $activity->item_id ) ) {
+ $retval = 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">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Spammed items are not visible to the public.
+ if ( $activity->is_spam ) {
+ $retval = false;
+ }
+
+ // Site moderators can view anything.
+ if ( bp_current_user_can( 'bp_moderate' ) ) {
+ $retval = true;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters whether the current user has access to an activity item.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunktestsphpunittestcasesactivityfunctionsphp"></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/activity/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/activity/functions.php 2018-05-31 17:21:48 UTC (rev 12153)
+++ trunk/tests/phpunit/testcases/activity/functions.php 2018-06-03 10:36:32 UTC (rev 12154)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1493,24 +1493,45 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group bp_activity_user_can_read
</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 function test_user_cannot_access_someone_elses_activity() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_admin_can_access_someone_elses_activity() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $u = self::factory()->user->create();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u2 = self::factory()->user->create( array( 'role' => 'administrator' ) );
+
+ $a = self::factory()->activity->create( array(
+ 'user_id' => $u,
+ ) );
+
+ $o = self::factory()->activity->get_object_by_id( $a );
+
+ $this->assertTrue( bp_activity_user_can_read( $o, $u ) );
+
+ $this->set_current_user( $u2 );
+ $this->assertTrue( bp_activity_user_can_read( $o, $u2 ) );
+ }
+
+ /**
+ * @group bp_activity_user_can_read
+ */
+ public function test_user_cannot_access_spam_activity() {
+ $u = self::factory()->user->create();
</ins><span class="cx" style="display: block; padding: 0 10px"> $u2 = self::factory()->user->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $a = self::factory()->activity->create( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'user_id' => $u2,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user_id' => $u,
</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"> $o = self::factory()->activity->get_object_by_id( $a );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bp_activity_mark_as_spam( $o );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( bp_activity_user_can_read( $o, $u ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( bp_activity_user_can_read( $o, $u2 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( bp_activity_user_can_read( $o, $u2 ) );
</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 class="cx" style="display: block; padding: 0 10px"> * @group bp_activity_user_can_read
</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 function test_admin_can_access_someone_elses_activity() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_admin_can_access_spam_activity() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $u = self::factory()->user->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $u2 = self::factory()->user->create( array( 'role' => 'administrator' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1520,7 +1541,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $o = self::factory()->activity->get_object_by_id( $a );
</span><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( bp_activity_user_can_read( $o, $u ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bp_activity_mark_as_spam( $o );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_current_user( $u2 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( bp_activity_user_can_read( $o, $u2 ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1529,7 +1550,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group bp_activity_user_can_read
</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 function test_group_admin_access_someone_elses_activity_in_a_grou() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_group_admin_access_someone_elses_activity_in_a_group() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $u = self::factory()->user->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $u2 = self::factory()->user->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1579,9 +1600,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group bp_activity_user_can_read
</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 function test_user_access_to_his_activity_in_disabled_group() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_user_access_to_his_activity_in_hidden_group() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $u = self::factory()->user->create();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $g = self::factory()->group->create();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $g = self::factory()->group->create( array(
+ 'status' => 'hidden',
+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> self::add_user_to_group( $u, $g );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1593,15 +1616,81 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $o = self::factory()->activity->get_object_by_id( $a );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- groups_edit_group_settings( $g, 0, 'hidden' );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( bp_activity_user_can_read( $o, $u ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- groups_edit_group_settings( $g, 0, 'private' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @group bp_activity_user_can_read
+ */
+ public function test_user_access_to_his_activity_in_private_group() {
+ $u = self::factory()->user->create();
+ $g = self::factory()->group->create( array(
+ 'status' => 'private',
+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::add_user_to_group( $u, $g );
+
+ $a = self::factory()->activity->create( array(
+ 'component' => buddypress()->groups->id,
+ 'user_id' => $u,
+ 'item_id' => $g,
+ ) );
+
+ $o = self::factory()->activity->get_object_by_id( $a );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( bp_activity_user_can_read( $o, $u ) );
</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 bp_activity_user_can_read
+ */
+ public function test_banned_user_cannot_access_to_his_activity_in_a_private_group() {
+ $u = self::factory()->user->create();
+ $g = self::factory()->group->create( array(
+ 'status' => 'private',
+ ) );
+
+ self::add_user_to_group( $u, $g );
+
+ $a = self::factory()->activity->create( array(
+ 'component' => buddypress()->groups->id,
+ 'user_id' => $u,
+ 'item_id' => $g,
+ ) );
+
+ buddypress()->is_item_admin = true;
+ groups_ban_member( $u, $g );
+
+ $o = self::factory()->activity->get_object_by_id( $a );
+
+ $this->assertFalse( bp_activity_user_can_read( $o, $u ) );
+ }
+
+ /**
+ * @group bp_activity_user_can_read
+ */
+ public function test_removed_member_cannot_access_to_his_activity_in_a_private_group() {
+ $u = self::factory()->user->create();
+ $g = self::factory()->group->create( array(
+ 'status' => 'private',
+ ) );
+
+ self::add_user_to_group( $u, $g );
+
+ $a = self::factory()->activity->create( array(
+ 'component' => buddypress()->groups->id,
+ 'user_id' => $u,
+ 'item_id' => $g,
+ ) );
+
+ buddypress()->is_item_admin = true;
+ groups_remove_member( $u, $g );
+
+ $o = self::factory()->activity->get_object_by_id( $a );
+
+ $this->assertFalse( bp_activity_user_can_read( $o, $u ) );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function check_activity_caches() {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->acaches as $k => $v ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->acaches[ $k ] = wp_cache_get( $k, 'bp_activity' );
</span></span></pre>
</div>
</div>
</body>
</html>