<!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>[18350] trunk: Sanitize sort_column and sort_order in get_pages().</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, #logmsg > ol { margin-left: 0; 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://trac.wordpress.org/changeset/18350">18350</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-06-27 20:47:04 +0000 (Mon, 27 Jun 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Sanitize sort_column and sort_order in get_pages(). Escape search_term in WP_User_Search. Cast blog_id to int in get_blog_prefix(). Props duck_</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesdeprecatedphp">trunk/wp-admin/includes/deprecated.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwpincludeswpdbphp">trunk/wp-includes/wp-db.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/deprecated.php (18349 => 18350)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/deprecated.php 2011-06-27 20:40:04 UTC (rev 18349)
+++ trunk/wp-admin/includes/deprecated.php 2011-06-27 20:47:04 UTC (rev 18350)
</span><span class="lines">@@ -454,7 +454,7 @@
</span><span class="cx"> function WP_User_Search ($search_term = '', $page = '', $role = '') {
</span><span class="cx"> _deprecated_function( __FUNCTION__, '3.1', 'WP_User_Query' );
</span><span class="cx">
</span><del>- $this->search_term = $search_term;
</del><ins>+ $this->search_term = stripslashes( $search_term );
</ins><span class="cx"> $this->raw_page = ( '' == $page ) ? false : (int) $page;
</span><span class="cx"> $this->page = (int) ( '' == $page ) ? 1 : $page;
</span><span class="cx"> $this->role = $role;
</span><span class="lines">@@ -485,7 +485,7 @@
</span><span class="cx"> $searches = array();
</span><span class="cx"> $search_sql = 'AND (';
</span><span class="cx"> foreach ( array('user_login', 'user_nicename', 'user_email', 'user_url', 'display_name') as $col )
</span><del>- $searches[] = $col . " LIKE '%$this->search_term%'";
</del><ins>+ $searches[] = $wpdb->prepare( $col . ' LIKE %s', '%' . like_escape($this->search_term) . '%' );
</ins><span class="cx"> $search_sql .= implode(' OR ', $searches);
</span><span class="cx"> $search_sql .= ')';
</span><span class="cx"> }
</span><span class="lines">@@ -700,4 +700,4 @@
</span><span class="cx"> function wp_dashboard_quick_press_output() {
</span><span class="cx"> _deprecated_function( __FUNCTION__, '3.2', 'wp_dashboard_quick_press()' );
</span><span class="cx"> wp_dashboard_quick_press();
</span><del>-}
</del><span class="cx">\ No newline at end of file
</span><ins>+}
</ins></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (18349 => 18350)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2011-06-27 20:40:04 UTC (rev 18349)
+++ trunk/wp-includes/post.php 2011-06-27 20:47:04 UTC (rev 18350)
</span><span class="lines">@@ -3448,6 +3448,43 @@
</span><span class="cx"> $where_post_type = $wpdb->prepare( "post_type = %s AND post_status IN ('$post_status')", $post_type );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ $orderby_array = array();
+ $allowed_keys = array('author', 'post_author', 'date', 'post_date', 'title', 'post_title', 'modified',
+ 'post_modified', 'modified_gmt', 'post_modified_gmt', 'menu_order', 'parent', 'post_parent',
+ 'ID', 'rand', 'comment_count');
+ foreach ( explode( ',', $sort_column ) as $orderby ) {
+ $orderby = trim( $orderby );
+ if ( !in_array( $orderby, $allowed_keys ) )
+ continue;
+
+ switch ( $orderby ) {
+ case 'menu_order':
+ break;
+ case 'ID':
+ $orderby = "$wpdb->posts.ID";
+ break;
+ case 'rand':
+ $orderby = 'RAND()';
+ break;
+ case 'comment_count':
+ $orderby = "$wpdb->posts.comment_count";
+ break;
+ default:
+ if ( 0 === strpos( $orderby, 'post_' ) )
+ $orderby = "$wpdb->posts." . $orderby;
+ else
+ $orderby = "$wpdb->posts.post_" . $orderby;
+ }
+
+ $orderby_array[] = $orderby;
+
+ }
+ $sort_column = ! empty( $orderby_array ) ? implode( ',', $orderby_array ) : "$wpdb->posts.post_title";
+
+ $sort_order = strtoupper( $sort_order );
+ if ( '' !== $sort_order && !in_array( $sort_order, array( 'ASC', 'DESC' ) ) )
+ $sort_order = 'ASC';
+
</ins><span class="cx"> $query = "SELECT * FROM $wpdb->posts $join WHERE ($where_post_type) $where ";
</span><span class="cx"> $query .= $author_query;
</span><span class="cx"> $query .= " ORDER BY " . $sort_column . " " . $sort_order ;
</span></span></pre></div>
<a id="trunkwpincludeswpdbphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/wp-db.php (18349 => 18350)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/wp-db.php 2011-06-27 20:40:04 UTC (rev 18349)
+++ trunk/wp-includes/wp-db.php 2011-06-27 20:47:04 UTC (rev 18350)
</span><span class="lines">@@ -626,6 +626,7 @@
</span><span class="cx"> if ( is_multisite() ) {
</span><span class="cx"> if ( null === $blog_id )
</span><span class="cx"> $blog_id = $this->blogid;
</span><ins>+ $blog_id = (int) $blog_id;
</ins><span class="cx"> if ( defined( 'MULTISITE' ) && ( 0 == $blog_id || 1 == $blog_id ) )
</span><span class="cx"> return $this->base_prefix;
</span><span class="cx"> else
</span></span></pre>
</div>
</div>
</body>
</html>