<!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][7042] trunk: Improved sanitization in Blogs 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/7042">7042</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2013-05-09 13:20:07 +0000 (Thu, 09 May 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improved sanitization in Blogs component database methods
- All integer array params are sanitized with wp_parse_id_list()
- Standardized treatment for LIKE clauses
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4994">#4994</a>
Props DJPaul, johnjamesjacoby</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpblogsbpblogsclassesphp">trunk/bp-blogs/bp-blogs-classes.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/tests/testcases/blogs/</li>
<li><a href="#trunkteststestcasesblogsclassbpblogsblogphp">trunk/tests/testcases/blogs/class-bp-blogs-blog.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpblogsbpblogsclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-classes.php (7041 => 7042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-classes.php 2013-05-09 13:20:02 UTC (rev 7041)
+++ trunk/bp-blogs/bp-blogs-classes.php 2013-05-09 13:20:07 UTC (rev 7042)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !empty( $search_terms ) ) {
</span><del>- $filter = like_escape( $wpdb->escape( $search_terms ) );
</del><ins>+ $filter = esc_sql( like_escape( $search_terms ) );
</ins><span class="cx"> $paged_blogs = $wpdb->get_results( "SELECT b.blog_id, b.user_id as admin_user_id, u.user_email as admin_user_email, wb.domain, wb.path, bm.meta_value as last_activity, bm2.meta_value as name FROM {$bp->blogs->table_name} b, {$bp->blogs->table_name_blogmeta} bm, {$bp->blogs->table_name_blogmeta} bm2, {$wpdb->base_prefix}blogs wb, {$wpdb->users} u WHERE b.blog_id = wb.blog_id AND b.user_id = u.ID AND b.blog_id = bm.blog_id AND b.blog_id = bm2.blog_id AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 {$hidden_sql} AND bm.meta_key = 'last_activity' AND bm2.meta_key = 'name' AND bm2.meta_value LIKE '%%$filter%%' {$user_sql} GROUP BY b.blog_id {$order_sql} {$pag_sql}" );
</span><span class="cx"> $total_blogs = $wpdb->get_var( "SELECT COUNT(DISTINCT b.blog_id) FROM {$bp->blogs->table_name} b, {$wpdb->base_prefix}blogs wb, {$bp->blogs->table_name_blogmeta} bm, {$bp->blogs->table_name_blogmeta} bm2 WHERE b.blog_id = wb.blog_id AND bm.blog_id = b.blog_id AND bm2.blog_id = b.blog_id AND wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 {$hidden_sql} AND bm.meta_key = 'name' AND bm2.meta_key = 'description' AND ( bm.meta_value LIKE '%%$filter%%' || bm2.meta_value LIKE '%%$filter%%' ) {$user_sql}" );
</span><span class="cx"> } else {
</span><span class="lines">@@ -119,10 +119,9 @@
</span><span class="cx">
</span><span class="cx"> $blog_ids = array();
</span><span class="cx"> foreach ( (array) $paged_blogs as $blog ) {
</span><del>- $blog_ids[] = $blog->blog_id;
</del><ins>+ $blog_ids[] = (int) $blog->blog_id;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- $blog_ids = $wpdb->escape( join( ',', (array) $blog_ids ) );
</del><span class="cx"> $paged_blogs = BP_Blogs_Blog::get_blog_extras( $paged_blogs, $blog_ids, $type );
</span><span class="cx">
</span><span class="cx"> return array( 'blogs' => $paged_blogs, 'total' => $total_blogs );
</span><span class="lines">@@ -211,8 +210,9 @@
</span><span class="cx"> function search_blogs( $filter, $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><ins>+ $hidden_sql = '';
</ins><span class="cx"> if ( !bp_current_user_can( 'bp_moderate' ) )
</span><span class="cx"> $hidden_sql = "AND wb.public = 1";
</span><span class="cx">
</span><span class="lines">@@ -241,8 +241,9 @@
</span><span class="cx"> function get_by_letter( $letter, $limit = null, $page = null ) {
</span><span class="cx"> global $bp, $wpdb;
</span><span class="cx">
</span><del>- $letter = like_escape( $wpdb->escape( $letter ) );
</del><ins>+ $letter = esc_sql( like_escape( $letter ) );
</ins><span class="cx">
</span><ins>+ $hidden_sql = '';
</ins><span class="cx"> if ( !bp_current_user_can( 'bp_moderate' ) )
</span><span class="cx"> $hidden_sql = "AND wb.public = 1";
</span><span class="cx">
</span><span class="lines">@@ -261,6 +262,8 @@
</span><span class="cx"> if ( empty( $blog_ids ) )
</span><span class="cx"> return $paged_blogs;
</span><span class="cx">
</span><ins>+ $blog_ids = implode( ',', wp_parse_id_list( $blog_ids ) );
+
</ins><span class="cx"> for ( $i = 0, $count = count( $paged_blogs ); $i < $count; ++$i ) {
</span><span class="cx"> $blog_prefix = $wpdb->get_blog_prefix( $paged_blogs[$i]->blog_id );
</span><span class="cx"> $paged_blogs[$i]->latest_post = $wpdb->get_row( "SELECT ID, post_content, post_title, post_excerpt, guid FROM {$blog_prefix}posts WHERE post_status = 'publish' AND post_type = 'post' AND id != 1 ORDER BY id DESC LIMIT 1" );
</span></span></pre></div>
<a id="trunkteststestcasesblogsclassbpblogsblogphp"></a>
<div class="addfile"><h4>Added: trunk/tests/testcases/blogs/class-bp-blogs-blog.php (0 => 7042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/testcases/blogs/class-bp-blogs-blog.php (rev 0)
+++ trunk/tests/testcases/blogs/class-bp-blogs-blog.php 2013-05-09 13:20:07 UTC (rev 7042)
</span><span class="lines">@@ -0,0 +1,59 @@
</span><ins>+<?php
+
+/**
+ * @group blogs
+ */
+class BP_Tests_BP_Blogs_Blog_TestCases extends BP_UnitTestCase {
+ public function setUp() {
+ parent::setUp();
+ }
+
+ public function tearDown() {
+ parent::tearDown();
+ }
+
+ public function test_get_with_search_terms() {
+ if ( ! is_multisite() ) {
+ return;
+ }
+
+ $u = $this->create_user();
+ $this->set_current_user( $u );
+ $b = $this->factory->blog->create( array(
+ 'title' => 'The Foo Bar Blog',
+ 'user_id' => $u,
+ ) );
+ bp_blogs_record_existing_blogs();
+
+ // make the blog public or it won't turn up in generic results
+ update_blog_option( $b, 'blog_public', '1' );
+
+ $blogs = BP_Blogs_Blog::get( 'active', false, false, 0, 'Foo' );
+ $blog_ids = wp_list_pluck( $blogs['blogs'], 'blog_id' );
+
+ $this->assertEquals( array( $b ), $blog_ids );
+ }
+
+ public function test_search_blogs() {
+ if ( ! is_multisite() ) {
+ return;
+ }
+
+ $u = $this->create_user();
+ $this->set_current_user( $u );
+ $b = $this->factory->blog->create( array(
+ 'title' => 'The Foo Bar Blog',
+ 'user_id' => $u,
+ ) );
+ bp_blogs_record_existing_blogs();
+
+ // make the blog public or it won't turn up in generic results
+ update_blog_option( $b, 'blog_public', '1' );
+
+ $blogs = BP_Blogs_Blog::search_blogs( 'Foo' );
+ $blog_ids = wp_list_pluck( $blogs['blogs'], 'blog_id' );
+
+ $this->assertEquals( array( $b ), $blog_ids );
+ }
+
+}
</ins></span></pre>
</div>
</div>
</body>
</html>