<!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>[24848] trunk/wp-includes: Remove "special" multisite spam check in the authentication API.</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://core.trac.wordpress.org/changeset/24848">24848</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-07-29 03:23:51 +0000 (Mon, 29 Jul 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove "special" multisite spam check in the authentication API.
The spamming of a site no longer directly affects a user of said site.
Moves the spam check to the wp_authenticate filter. Networks in need
of enhanced spam-fighting should leverage this same technique.
Allow is_user_spammy() to accept a WP_User object.
props willnorris, brianhogg.
fixes <a href="http://core.trac.wordpress.org/ticket/24771">#24771</a>. see <a href="http://core.trac.wordpress.org/ticket/19714">#19714</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesdefaultfiltersphp">trunk/wp-includes/default-filters.php</a></li>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesdefaultfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-filters.php (24847 => 24848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-filters.php 2013-07-29 02:58:58 UTC (rev 24847)
+++ trunk/wp-includes/default-filters.php 2013-07-29 03:23:51 UTC (rev 24848)
</span><span class="lines">@@ -299,4 +299,8 @@
</span><span class="cx"> add_filter( 'heartbeat_received', 'wp_auth_check', 10, 2 );
</span><span class="cx"> add_filter( 'heartbeat_nopriv_received', 'wp_auth_check', 10, 2 );
</span><span class="cx">
</span><ins>+// Default authentication filters
+add_filter( 'authenticate', 'wp_authenticate_username_password', 20, 3 );
+add_filter( 'authenticate', 'wp_authenticate_spam_check', 99 );
+
</ins><span class="cx"> unset($filter, $action);
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (24847 => 24848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2013-07-29 02:58:58 UTC (rev 24847)
+++ trunk/wp-includes/ms-functions.php 2013-07-29 03:23:51 UTC (rev 24848)
</span><span class="lines">@@ -1705,14 +1705,17 @@
</span><span class="cx"> * @since MU
</span><span class="cx"> * @uses get_user_by()
</span><span class="cx"> *
</span><del>- * @param string $user_login Optional. Defaults to current user.
</del><ins>+ * @param string|WP_User $user Optional. Defaults to current user. WP_User object,
+ * or user login name as a string.
</ins><span class="cx"> * @return bool
</span><span class="cx"> */
</span><del>-function is_user_spammy( $user_login = null ) {
- if ( $user_login )
- $user = get_user_by( 'login', $user_login );
- else
- $user = wp_get_current_user();
</del><ins>+function is_user_spammy( $user = null ) {
+ if ( ! is_a( $user, 'WP_User' ) ) {
+ if ( $user )
+ $user = get_user_by( 'login', $user );
+ else
+ $user = wp_get_current_user();
+ }
</ins><span class="cx">
</span><span class="cx"> return $user && isset( $user->spam ) && 1 == $user->spam;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (24847 => 24848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2013-07-29 02:58:58 UTC (rev 24847)
+++ trunk/wp-includes/user.php 2013-07-29 03:23:51 UTC (rev 24848)
</span><span class="lines">@@ -89,19 +89,6 @@
</span><span class="cx"> if ( !$user )
</span><span class="cx"> return new WP_Error( 'invalid_username', sprintf( __( '<strong>ERROR</strong>: Invalid username. <a href="%s" title="Password Lost and Found">Lost your password</a>?' ), wp_lostpassword_url() ) );
</span><span class="cx">
</span><del>- if ( is_multisite() ) {
- // Is user marked as spam?
- if ( 1 == $user->spam )
- return new WP_Error( 'spammer_account', __( '<strong>ERROR</strong>: Your account has been marked as a spammer.' ) );
-
- // Is a user's blog marked as spam?
- if ( !is_super_admin( $user->ID ) && isset( $user->primary_blog ) ) {
- $details = get_blog_details( $user->primary_blog );
- if ( is_object( $details ) && $details->spam == 1 )
- return new WP_Error( 'blog_suspended', __( 'Site Suspended.' ) );
- }
- }
-
</del><span class="cx"> $user = apply_filters('wp_authenticate_user', $user, $password);
</span><span class="cx"> if ( is_wp_error($user) )
</span><span class="cx"> return $user;
</span><span class="lines">@@ -141,6 +128,22 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * For multisite blogs, check if the authenticated user has been marked as a
+ * spammer, or if the user's primary blog has been marked as spam.
+ *
+ * @since 3.7.0
+ */
+function wp_authenticate_spam_check( $user ) {
+ if ( $user && is_a( $user, 'WP_User' ) && is_multisite() ) {
+ $spammed = apply_filters( 'check_is_user_spammed', is_user_spammy(), $user );
+
+ if ( $spammed )
+ return new WP_Error( 'spammer_account', __( '<strong>ERROR</strong>: Your account has been marked as a spammer.' ) );
+ }
+ return $user;
+}
+
+/**
</ins><span class="cx"> * Number of posts user has written.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span></span></pre>
</div>
</div>
</body>
</html>