Changeset 10901

Timestamp:

04/14/2021 04:49:37 AM (4 years ago)

Author:

dd32

Message:

Login: Store Akismet result for each signup, and expose it within the Admin UI.

Location:

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login

Files:

• admin/class-user-registrations-list-table.php (modified) (3 diffs)
• functions-registration.php (modified) (5 diffs)
• pending-create.php (modified) (1 diff)
• register.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/admin/class-user-registrations-list-table.php

@@ -11 +11 @@
             'user_ip'         => 'IP',
             'scores'          => 'reCaptcha',
+            'akismet'         => 'Akismet',
             'user_registered' => 'Registered Date',
             'created_date'    => 'Created Date',
@@ -23 +24 @@
             'user_email'      => array( 'user_email', true ),
             'scores'          => array( 'scores', true ),
+            'akismet'         => array( 'akismet', true ),
             'user_registered' => array( 'user_registered', true ),
             'created_date'    => array( 'created_date', true ),
@@ -168 +170 @@
     }
 
+    function column_akismet( $item ) {
+        $meta = json_decode( $item->meta, true );
+
+        echo $meta['akismet_result'] ?? '';
+    }
+
 }

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions-registration.php

@@ -63 +63 @@
     $akismet = Akismet::rest_auto_check_comment( $payload );
     if ( is_wp_error( $akismet ) ) {
-        return 'OK'; // Assume it's okay in the event of failure / unknown.
-        // return $akismet->get_error_code();
-    }
-
-    if ( ! empty( $akismet['akismet_pro_tip'] ) ) {
-        return $akismet['akismet_pro_tip'];
+        return $akismet->get_error_code();
+    }
+
+    if ( ! empty( $akismet['akismet_pro_tip'] ) && 'discard' === $akismet['akismet_pro_tip'] ) {
+        return 'spam';
     } elseif ( 'true' === $akismet['akismet_result'] ) {
         return 'spam';
@@ -74 +73 @@
         return 'OK';
     } else {
-        return 'OK'; // Assume it's okay in the event of failure / unknown.
+        return 'unknown';
     }
 }
@@ -81 +80 @@
  * Handles creating a "Pending" registration that will later be converted to an actual user  account.
  */
-function wporg_login_create_pending_user( $user_login, $user_email, $user_mailinglist = false, $tos_revision = 0  ) {
+function wporg_login_create_pending_user( $user_login, $user_email, $meta = array() ) {
     global $wpdb, $wp_hasher;
 
@@ -98 +97 @@
     $profile_key        = wp_generate_password( 24, false, false );
     $hashed_profile_key = time() . ':' . wp_hash_password( $profile_key );
-
-    $tos_meta_key = WPOrg_SSO::TOS_USER_META_KEY;
 
     $pending_user = array(
@@ -107 +104 @@
         'user_activation_key' => '',
         'user_profile_key' => $hashed_profile_key,
-        'meta' => array(
-            'user_mailinglist' => $user_mailinglist,
+        'meta' => $meta + array(
             'registration_ip'  => $_SERVER['REMOTE_ADDR'], // Spam & fraud control. Will be discarded after the account is created.
-            $tos_meta_key      => $tos_revision,
         ),
         'scores' => array()

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/pending-create.php

@@ -83 +83 @@
     );
 
-    if ( 'OK' !== $akismet ) {
+    // Store for reference.
+    $pending_user['meta']['akismet_result'] = $akismet;
+    wporg_update_pending_user( $pending_user );
+
+    if ( 'spam' == $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 );
     }
 

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/register.php

@@ -36 +36 @@
         if ( ! wporg_login_check_recapcha_status( 'register' ) ) {
             $error_recapcha_status = true;
-        } elseif ( 'OK' !== wporg_login_check_akismet( $user_login, $user_email ) ) {
-            $error_akismet = true;
         } else {
-            wporg_login_create_pending_user( $user_login, $user_email, $user_mailinglist, $terms_of_service );
-            die();
+            $akismet = wporg_login_check_akismet( $user_login, $user_email );
+
+            $tos_meta_key = WPOrg_SSO::TOS_USER_META_KEY;
+            $meta = [
+                'user_mailinglist' => $user_mailinglist,
+                'akismet_result'   => $akismet,
+                $tos_meta_key      => $terms_of_service,
+            ];
+
+            if ( 'spam' === $akismet ) {
+                $error_akismet = true;
+            } else {
+                wporg_login_create_pending_user( $user_login, $user_email, $meta );
+                die();
+            }
         }
     }