<!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][4079] branches/1.2/bp-core: Properly sanitize sign-up fields to prevent possible XSS on new user registration.</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>4079</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-03-08 00:24:06 +0000 (Tue, 08 Mar 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Properly sanitize sign-up fields to prevent possible XSS on new user registration. (1.2 branch)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpcorebpcorefiltersphp">branches/1.2/bp-core/bp-core-filters.php</a></li>
<li><a href="#branches12bpcorebpcoretemplatetagsphp">branches/1.2/bp-core/bp-core-templatetags.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpcorebpcorefiltersphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core/bp-core-filters.php (4078 => 4079)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core/bp-core-filters.php 2011-03-02 22:16:08 UTC (rev 4078)
+++ branches/1.2/bp-core/bp-core-filters.php 2011-03-08 00:24:06 UTC (rev 4079)
</span><span class="lines">@@ -1,6 +1,40 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Load additional sign-up sanitization filters on bp_loaded. These are used
+ * to prevent XSS in the BuddyPress sign-up process. You can unhook these to
+ * allow for customization of your registration fields, however it is highly
+ * recommended that you leave these in place for the safety of your network.
+ *
+ * @since BuddyPress (r4079)
+ * @uses add_filter()
+ */
+function bp_core_signup_sanitization() {
+
+ // Filters on sign-up fields
+ $fields = array (
+ 'bp_get_signup_username_value',
+ 'bp_get_signup_email_value',
+ 'bp_get_signup_with_blog_value',
+ 'bp_get_signup_blog_url_value',
+ 'bp_get_signup_blog_title_value',
+ 'bp_get_signup_blog_privacy_value',
+ 'bp_get_signup_avatar_dir_value',
+ );
+
+ // Add the 'strip_tags' filter to each field
+ foreach( $fields as $filter ) {
+ add_filter( $filter, 'esc_html', 1 );
+ add_filter( $filter, 'wp_filter_kses', 2 );
+ add_filter( $filter, 'stripslashes', 3 );
+ }
+
+ // Sanitize email
+ add_filter( 'bp_get_signup_email_value', 'sanitize_email' );
+}
+add_action( 'bp_loaded', 'bp_core_signup_sanitization' );
+
+/**
</ins><span class="cx"> * bp_core_email_from_name_filter()
</span><span class="cx"> *
</span><span class="cx"> * Sets the "From" name in emails sent to the name of the site and not "WordPress"
</span></span></pre></div>
<a id="branches12bpcorebpcoretemplatetagsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core/bp-core-templatetags.php (4078 => 4079)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core/bp-core-templatetags.php 2011-03-02 22:16:08 UTC (rev 4078)
+++ branches/1.2/bp-core/bp-core-templatetags.php 2011-03-08 00:24:06 UTC (rev 4079)
</span><span class="lines">@@ -1189,6 +1189,18 @@
</span><span class="cx"> function bp_get_signup_avatar_dir_value() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><ins>+ // Check if signup_avatar_dir is passed
+ if ( !empty( $_POST['signup_avatar_dir'] ) )
+ $signup_avatar_dir = $_POST['signup_avatar_dir'];
+
+ // If not, check if global is set
+ elseif ( !empty( $bp->signup->avatar_dir ) )
+ $signup_avatar_dir = $bp->signup->avatar_dir;
+
+ // If not, set false
+ else
+ $signup_avatar_dir = false;
+
</ins><span class="cx"> return apply_filters( 'bp_get_signup_avatar_dir_value', $bp->signup->avatar_dir );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1216,24 +1228,37 @@
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $r, EXTR_SKIP );
</span><span class="cx">
</span><del>- $signup_avatar_dir = ( !empty( $_POST['signup_avatar_dir'] ) ) ? $_POST['signup_avatar_dir'] : $bp->signup->avatar_dir;
</del><ins>+ // Avatar DIR is found
+ if ( $signup_avatar_dir = bp_get_signup_avatar_dir_value() ) {
+ $gravatar_img = bp_core_fetch_avatar( array(
+ 'item_id' => $signup_avatar_dir,
+ 'object' => 'signup',
+ 'avatar_dir' => 'avatars/signups',
+ 'type' => 'full',
+ 'width' => $size,
+ 'height' => $size,
+ 'alt' => $alt,
+ 'class' => $class
+ ) );
</ins><span class="cx">
</span><del>- if ( empty( $signup_avatar_dir ) ) {
- if ( empty( $bp->grav_default->user ) ) {
</del><ins>+ // No avatar DIR was found
+ } else {
+
+ // Set default gravatar type
+ if ( empty( $bp->grav_default->user ) )
</ins><span class="cx"> $default_grav = 'wavatar';
</span><del>- } else if ( 'mystery' == $bp->grav_default->user ) {
</del><ins>+ else if ( 'mystery' == $bp->grav_default->user )
</ins><span class="cx"> $default_grav = BP_PLUGIN_URL . '/bp-core/images/mystery-man.jpg';
</span><del>- } else {
</del><ins>+ else
</ins><span class="cx"> $default_grav = $bp->grav_default->user;
</span><del>- }
</del><span class="cx">
</span><del>- $gravatar_url = apply_filters( 'bp_gravatar_url', 'http://www.gravatar.com/avatar/' );
- $gravatar_img = '<img src="' . $gravatar_url . md5( strtolower( $_POST['signup_email'] ) ) . '?d=' . $default_grav . '&amp;s=' . $size . '" width="' . $size . '" height="' . $size . '" alt="' . $alt . '" class="' . $class . '" />';
- } else {
- $gravatar_img = bp_core_fetch_avatar( array( 'item_id' => $signup_avatar_dir, 'object' => 'signup', 'avatar_dir' => 'avatars/signups', 'type' => 'full', 'width' => $size, 'height' => $size, 'alt' => $alt, 'class' => $class ) );
</del><ins>+ // Create
+ $gravatar_url = apply_filters( 'bp_gravatar_url', 'http://www.gravatar.com/avatar/' );
+ $md5_lcase_email = md5( strtolower( bp_get_signup_email_value() ) );
+ $gravatar_img = '<img src="' . $gravatar_url . $md5_lcase_email . '?d=' . $default_grav . '&amp;s=' . $size . '" width="' . $size . '" height="' . $size . '" alt="' . $alt . '" class="' . $class . '" />';
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_signup_avatar', $gravatar_img );
</del><ins>+ return apply_filters( 'bp_get_signup_avatar', $gravatar_img, $args );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_signup_allowed() {
</span></span></pre>
</div>
</div>
</body>
</html>