<!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][7026] trunk: Improved sanitization for Friends component database methods</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">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/7026">7026</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2013-05-08 20:59:47 +0000 (Wed, 08 May 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improved sanitization for Friends component database methods
- All integer lists for IN clauses are run through wp_parse_id_list()
- Search terms now escaped in the correct order
Also adds unit tests for touched methods
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4993">#4993</a>
Props johnjamesjacoby</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpfriendsbpfriendsclassesphp">trunk/bp-friends/bp-friends-classes.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/tests/testcases/friends/</li>
<li><a href="#trunkteststestcasesfriendsclassbpfriendsfriendshipphp">trunk/tests/testcases/friends/class-bp-friends-friendship.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpfriendsbpfriendsclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-friends/bp-friends-classes.php (7025 => 7026)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-friends/bp-friends-classes.php 2013-05-08 20:31:14 UTC (rev 7025)
+++ trunk/bp-friends/bp-friends-classes.php 2013-05-08 20:59:47 UTC (rev 7026)
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> if ( empty( $user_id ) )
</span><span class="cx"> $user_id = bp_loggedin_user_id();
</span><span class="cx">
</span><del>- $filter = like_escape( $wpdb->escape( $filter ) );
</del><ins>+ $filter = esc_sql( like_escape( $filter ) );
</ins><span class="cx">
</span><span class="cx"> if ( !empty( $limit ) && !empty( $page ) )
</span><span class="cx"> $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Get all the user ids for the current user's friends.
</span><del>- $fids = implode( ',', $friend_ids );
</del><ins>+ $fids = implode( ',', wp_parse_id_list( $friend_ids ) );
</ins><span class="cx">
</span><span class="cx"> if ( empty( $fids ) )
</span><span class="cx"> return false;
</span><span class="lines">@@ -198,6 +198,8 @@
</span><span class="cx"> function get_bulk_last_active( $user_ids ) {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><ins>+ $user_ids = implode( ',', wp_parse_id_list( $user_ids ) );
+
</ins><span class="cx"> return $wpdb->get_results( $wpdb->prepare( "SELECT meta_value as last_activity, user_id FROM {$wpdb->usermeta} WHERE meta_key = %s AND user_id IN ( {$user_ids} ) ORDER BY meta_value DESC", bp_get_user_meta_key( 'last_activity' ) ) );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -222,7 +224,7 @@
</span><span class="cx"> function search_users( $filter, $user_id, $limit = null, $page = null ) {
</span><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><del>- $filter = like_escape( $wpdb->escape( $filter ) );
</del><ins>+ $filter = esc_sql( like_escape( $filter ) );
</ins><span class="cx">
</span><span class="cx"> $usermeta_table = $wpdb->base_prefix . 'usermeta';
</span><span class="cx"> $users_table = $wpdb->base_prefix . 'users';
</span><span class="lines">@@ -248,7 +250,7 @@
</span><span class="cx"> function search_users_count( $filter ) {
</span><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><del>- $filter = like_escape( $wpdb->escape( $filter ) );
</del><ins>+ $filter = esc_sql( like_escape( $filter ) );
</ins><span class="cx">
</span><span class="cx"> $usermeta_table = $wpdb->prefix . 'usermeta';
</span><span class="cx"> $users_table = $wpdb->base_prefix . 'users';
</span><span class="lines">@@ -274,6 +276,8 @@
</span><span class="cx"> if ( !bp_is_active( 'xprofile' ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ $user_ids = implode( ',', wp_parse_id_list( $user_ids ) );
+
</ins><span class="cx"> return $wpdb->get_results( $wpdb->prepare( "SELECT user_id FROM {$bp->profile->table_name_data} pd, {$bp->profile->table_name_fields} pf WHERE pf.id = pd.field_id AND pf.name = %s AND pd.user_id IN ( {$user_ids} ) ORDER BY pd.value ASC", bp_xprofile_fullname_field_name() ) );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkteststestcasesfriendsclassbpfriendsfriendshipphp"></a>
<div class="addfile"><h4>Added: trunk/tests/testcases/friends/class-bp-friends-friendship.php (0 => 7026)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/testcases/friends/class-bp-friends-friendship.php (rev 0)
+++ trunk/tests/testcases/friends/class-bp-friends-friendship.php 2013-05-08 20:59:47 UTC (rev 7026)
</span><span class="lines">@@ -0,0 +1,82 @@
</span><ins>+<?php
+
+/**
+ * @group friends
+ */
+class BP_Tests_BP_Friends_Friendship_TestCases extends BP_UnitTestCase {
+ protected $old_current_user = 0;
+
+ public function setUp() {
+ parent::setUp();
+
+ $this->old_current_user = get_current_user_id();
+ wp_set_current_user( $this->factory->user->create( array( 'role' => 'subscriber' ) ) );
+ }
+
+ public function tearDown() {
+ parent::tearDown();
+ wp_set_current_user( $this->old_current_user );
+ }
+
+ public function test_search_friends() {
+ $u1 = $this->create_user();
+ $u2 = $this->create_user();
+ $u3 = $this->create_user();
+
+ xprofile_set_field_data( 1, $u2, 'Cool Dude' );
+ xprofile_set_field_data( 1, $u3, 'Rock And Roll America Yeah' );
+
+ friends_add_friend( $u1, $u2, true );
+ friends_add_friend( $u1, $u3, true );
+
+ $friends = BP_Friends_Friendship::search_friends( 'Coo', $u1 );
+ $this->assertEquals( array( $u2 ), $friends['friends'] );
+ }
+
+ public function test_get_bulk_last_active() {
+ $u1 = $this->create_user( array(
+ 'last_activity' => gmdate( 'Y-m-d H:i:s' ),
+ ) );
+ $u2 = $this->create_user( array(
+ 'last_activity' => gmdate( 'Y-m-d H:i:s', time() - 1000 ),
+ ) );
+ $u3 = $this->create_user( array(
+ 'last_activity' => gmdate( 'Y-m-d H:i:s', time() - 50 ),
+ ) );
+
+ $friends = BP_Friends_Friendship::get_bulk_last_active( array( $u1, $u2, $u3, 'junk' ) );
+ $friend_ids = wp_list_pluck( $friends, 'user_id' );
+ $this->assertEquals( array( $u1, $u3, $u2 ), $friend_ids );
+ }
+
+ public function test_search_users() {
+ $u1 = $this->create_user();
+ $u2 = $this->create_user();
+ $u3 = $this->create_user();
+
+ xprofile_set_field_data( 1, $u1, 'Freedom Isn\'t Free' );
+ xprofile_set_field_data( 1, $u2, 'Cool Dude' );
+ xprofile_set_field_data( 1, $u3, 'Rock And Roll America Yeah' );
+
+ // Needs a user_id param though it does nothing
+ $friends = BP_Friends_Friendship::search_users( 'Coo', 1 );
+ $this->assertEquals( array( $u2 ), $friends );
+ }
+
+ public function test_search_users_count() {
+ $u1 = $this->create_user();
+ $u2 = $this->create_user();
+ $u3 = $this->create_user();
+
+ xprofile_set_field_data( 1, $u1, 'Freedom Isn\'t Free' );
+ xprofile_set_field_data( 1, $u2, 'Cool Dude' );
+ xprofile_set_field_data( 1, $u3, 'Rock And Roll America Yeah' );
+
+ // Needs a user_id param though it does nothing
+ $friends = BP_Friends_Friendship::search_users_count( 'Coo' );
+ $this->assertEquals( 1, $friends );
+ }
+
+
+
+}
</ins></span></pre>
</div>
</div>
</body>
</html>