<!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>[10900] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login: Login: Reject spam signups based on Akismet data.</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 { white-space: pre-line; 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/10900">10900</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/10900","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-04-14 04:13:37 +0000 (Wed, 14 Apr 2021)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Login: Reject spam signups based on Akismet data.
Follow up to <a href="http://meta.trac.wordpress.org/changeset/10890">r10890</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginfunctionsregistrationphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions-registration.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginpendingcreatephp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/pending-create.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginregisterphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/register.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginfunctionsregistrationphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions-registration.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions-registration.php 2021-04-14 03:56:53 UTC (rev 10899)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions-registration.php 2021-04-14 04:13:37 UTC (rev 10900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,7 +48,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wporg_login_check_akismet( $user_login, $user_email, $user_url = '', $content = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! class_exists( 'Akismet' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return 'OK';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $payload = [
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +62,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $akismet = Akismet::rest_auto_check_comment( $payload );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $akismet ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $akismet->get_error_code();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return 'OK'; // Assume it's okay in the event of failure / unknown.
+ // return $akismet->get_error_code();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $akismet['akismet_pro_tip'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,7 +73,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'false' === $akismet['akismet_result'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return 'OK';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return 'unsure';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return 'OK'; // Assume it's okay in the event of failure / unknown.
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,9 +126,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $akismet_says = wporg_login_check_akismet( $user_login, $user_email );
- $pending_user['meta']['akismet_result'] = $akismet_says;
-
</del><span class="cx" style="display: block; padding: 0 10px"> $inserted = wporg_update_pending_user( $pending_user );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $inserted ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Error! Something went wrong with your registration. Try again?', 'wporg' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -347,18 +345,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $pending_user ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $akismet_says = wporg_login_check_akismet(
- $pending_user['user_login'],
- $pending_user['user_email'],
- $pending_user['meta']['url'] ?? '',
- array_filter( [
- $pending_user['meta']['from'] ?? '',
- $pending_user['meta']['occ'] ?? '',
- $pending_user['meta']['interests'] ?? '',
- ] )
- );
- $pending_user['meta']['akismet_result_update'] = $akismet_says;
-
</del><span class="cx" style="display: block; padding: 0 10px"> wporg_update_pending_user( $pending_user );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginpendingcreatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/pending-create.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/pending-create.php 2021-04-14 03:56:53 UTC (rev 10899)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/pending-create.php 2021-04-14 04:13:37 UTC (rev 10900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,19 +54,44 @@
</span><span class="cx" style="display: block; padding: 0 10px"> die();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Check reCaptcha status
-$error_recapcha_status = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( wporg_login_save_profile_fields( $pending_user ) ) {
+ // re-fetch the user, it's probably changed.
+ $pending_user = wporg_get_pending_user( $activation_user );
+}
+
+
+$error_recapcha_status = $error_akismet = false;
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_POST['user_pass'] ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Check reCaptcha status
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! wporg_login_check_recapcha_status( 'pending_create' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // No no. "Please try again."
</span><span class="cx" style="display: block; padding: 0 10px"> $error_recapcha_status = true;
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $_POST['user_pass'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( wporg_login_save_profile_fields( $pending_user ) ) {
- // re-fetch the user, it's probably changed.
- $pending_user = wporg_get_pending_user( $activation_user );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check Akismet
+ $akismet = wporg_login_check_akismet(
+ $pending_user['user_login'],
+ $pending_user['user_email'],
+ $pending_user['meta']['url'] ?? '',
+ array_filter( [
+ $pending_user['meta']['from'] ?? '',
+ $pending_user['meta']['occ'] ?? '',
+ $pending_user['meta']['interests'] ?? '',
+ ] )
+ );
+
+ if ( 'OK' !== $akismet ) {
+ // No no. "Please try again."
+ $error_akismet = true;
+ unset( $_POST['user_pass'] );
+
+ // Store for reference.
+ $pending_user['meta']['akismet_result'] = $akismet;
+ wporg_update_pending_user( $pending_user );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_POST['user_pass'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,7 +151,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> include __DIR__ . '/partials/register-profilefields.php';
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $error_recapcha_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $error_recapcha_status || $error_akismet ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="message error"><p>' . __( 'Please try again.', 'wporg' ) . '</p></div>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginregisterphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/register.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/register.php 2021-04-14 03:56:53 UTC (rev 10899)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/register.php 2021-04-14 04:13:37 UTC (rev 10900)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,7 +14,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user_login = trim( WP_WPOrg_SSO::$matched_route_params['user'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$error_user_login = $error_user_email = $error_recapcha_status = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$error_user_login = $error_user_email = $error_recapcha_status = $error_akismet = $terms_of_service_error = false;
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $_POST ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $error_user_login = rest_do_request( new WP_REST_Request( 'GET', '/wporg/v1/username-available/' . $user_login ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,6 +35,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $error_user_login && ! $error_user_email && ! $terms_of_service_error ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! wporg_login_check_recapcha_status( 'register' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $error_recapcha_status = true;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'OK' !== wporg_login_check_akismet( $user_login, $user_email ) ) {
+ $error_akismet = true;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> wporg_login_create_pending_user( $user_login, $user_email, $user_mailinglist, $terms_of_service );
</span><span class="cx" style="display: block; padding: 0 10px"> die();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,7 +110,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $error_recapcha_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $error_recapcha_status || $error_akismet ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="message error"><p>' . __( 'Please try again.', 'wporg' ) . '</p></div>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span></span></pre>
</div>
</div>
</body>
</html>