<!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][9949] branches/2.3: Messages: Introduce filter to enforce private message thread query boundaries.</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="http://buddypress.trac.wordpress.org/changeset/9949">9949</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/9949","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnjamesjacoby</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-06-16 22:50:15 +0000 (Tue, 16 Jun 2015)</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'>Messages: Introduce filter to enforce private message thread query boundaries.
This change ensures that all queries for private messages will always return anticipated results, even when certain malformed values are passed in. It specifically hardens the user ID argument to prevent accidental overriding.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/6504">#6504</a>. Props r-a-y. (2.3 branch, for 2.3.2)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches23srcbpmessagesbpmessagesfiltersphp">branches/2.3/src/bp-messages/bp-messages-filters.php</a></li>
<li><a href="#branches23srcbpmessagesclassesclassbpmessagesthreadphp">branches/2.3/src/bp-messages/classes/class-bp-messages-thread.php</a></li>
<li><a href="#branches23testsphpunittestcasesmessagestemplatephp">branches/2.3/tests/phpunit/testcases/messages/template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches23srcbpmessagesbpmessagesfiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/2.3/src/bp-messages/bp-messages-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/2.3/src/bp-messages/bp-messages-filters.php 2015-06-16 22:48:11 UTC (rev 9948)
+++ branches/2.3/src/bp-messages/bp-messages-filters.php 2015-06-16 22:50:15 UTC (rev 9949)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,3 +65,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bp_get_messages_content_value', 'stripslashes_deep' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bp_get_the_thread_message_content', 'stripslashes_deep' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bp_get_the_thread_subject', 'stripslashes_deep' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Enforce limitations on viewing private message contents
+ *
+ * @since BuddyPress (2.3.2)
+ *
+ * @see bp_has_message_threads() for description of parameters
+ *
+ * @param array|string $args See {@link bp_has_message_threads()}.
+ */
+function bp_messages_enforce_current_user( $args = array() ) {
+
+ // Non-community moderators can only ever see their own messages
+ if ( is_user_logged_in() && ! bp_current_user_can( 'bp_moderate' ) ) {
+ $_user_id = (int) bp_loggedin_user_id();
+ if ( $_user_id !== (int) $args['user_id'] ) {
+ $args['user_id'] = $_user_id;
+ }
+ }
+
+ // Return possibly modified $args array
+ return $args;
+}
+add_filter( 'bp_after_has_message_threads_parse_args', 'bp_messages_enforce_current_user', 5 );
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="branches23srcbpmessagesclassesclassbpmessagesthreadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/2.3/src/bp-messages/classes/class-bp-messages-thread.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/2.3/src/bp-messages/classes/class-bp-messages-thread.php 2015-06-16 22:48:11 UTC (rev 9948)
+++ branches/2.3/src/bp-messages/classes/class-bp-messages-thread.php 2015-06-16 22:50:15 UTC (rev 9949)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -453,14 +453,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $search_sql = $wpdb->prepare( "AND ( subject LIKE %s OR message LIKE %s )", $search_terms_like, $search_terms_like );
</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">- if ( ! empty( $r['user_id'] ) ) {
- if ( 'sentbox' == $r['box'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $r['user_id'] = (int) $r['user_id'];
+
+ switch ( $r['box'] ) {
+ case 'sentbox' :
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_id_sql = 'AND ' . $wpdb->prepare( 'm.sender_id = %d', $r['user_id'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sender_sql = ' AND m.sender_id = r.user_id';
- } else {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sender_sql = 'AND m.sender_id = r.user_id';
+ break;
+
+ case 'inbox' :
+ default :
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_id_sql = 'AND ' . $wpdb->prepare( 'r.user_id = %d', $r['user_id'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sender_sql = ' AND r.sender_only = 0';
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sender_sql = 'AND r.sender_only = 0';
+ break;
</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"> // Process meta query into SQL
</span></span></pre></div>
<a id="branches23testsphpunittestcasesmessagestemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/2.3/tests/phpunit/testcases/messages/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/2.3/tests/phpunit/testcases/messages/template.php 2015-06-16 22:48:11 UTC (rev 9948)
+++ branches/2.3/tests/phpunit/testcases/messages/template.php 2015-06-16 22:50:15 UTC (rev 9949)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -259,6 +259,34 @@
</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 bp_has_message_threads
+ */
+ public function test_has_message_threads_anonymous_user_should_not_see_threads() {
+ $u1 = $this->factory->user->create();
+ $u2 = $this->factory->user->create();
+
+ // create initial thread
+ $this->factory->message->create( array(
+ 'sender_id' => $u1,
+ 'recipients' => array( $u2 ),
+ ) );
+
+ // set user to anonymous
+ $old_current_user = get_current_user_id();
+ $this->set_current_user( 0 );
+
+ // now, do the message thread query
+ global $messages_template;
+ bp_has_message_threads();
+
+ // assert!
+ $this->assertEquals( 0, $messages_template->thread_count );
+ $this->assertEmpty( $messages_template->threads );
+
+ $this->set_current_user( $old_current_user );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @group pagination
</span><span class="cx" style="display: block; padding: 0 10px"> * @group BP_Messages_Box_Template
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -325,4 +353,4 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_REQUEST = $request;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
</ins></span></pre>
</div>
</div>
</body>
</html>