Changeset 10948

Timestamp:

05/04/2021 06:35:00 AM (5 years ago)

Author:

dd32

Message:

Login: Avoid blocking a user signup via a recaptcha failure when the failure is probably caused by a double-submission..

The signup user will still have to successfully complete the signup again, but a double-submission of the form a second time is less likely.

Location:

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

Files:

• functions.php (modified) (1 diff)
• pending-create.php (modified) (2 diffs)

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

@@ -349 +349 @@
                 );
                 if ( is_wp_error( $resp ) || 200 != wp_remote_retrieve_response_code( $resp ) ) {
-
-                        trigger_error( 'reCaptcha: ' . ( is_wp_error( $resp ) ? $resp->get_error_message() : wp_remote_retrieve_response_code( $resp ) . wp_remote_retrieve_body( $resp ) ), E_USER_NOTICE );
-
                         $cache[ $cache_key ] = false;
                         return false;

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

@@ -64 +64 @@
                 $error_recapcha_status = true;
 
-                // Allow a recaptcha fail to try again, but if they're blocked due to low score, mark them as needing approval.
-                if ( ! wporg_login_check_recapcha_status( 'pending_create', true ) ) {
-                        $pending_user['cleared'] = 0;
-                }
-
                 // Store for reference.
                 if ( isset( $_POST['_reCaptcha_v3_token'] ) ) {
@@ -75 +70 @@
                                 RECAPTCHA_V3_PRIVKEY
                         );
-                        $pending_user['scores']['create_attempt'] = -1;
                         if ( $recaptcha_api && $recaptcha_api['success'] && 'pending_create' == $recaptcha_api['action'] ) {
                                 $pending_user['scores']['create_attempt'] = $recaptcha_api['score'];
-                        } else {
-                                // Debug.
-                                $pending_user['meta']['recaptcha_debug'] = $recaptcha_api;
-                        }
+                        } // else: probably `timeout-or-duplicate` or w.org network error.
+                }
+
+                // Allow a recaptcha fail to try again, but if they're blocked due to low score, mark them as needing approval.
+                if (
+                        ! empty( $pending_user['scores']['create_attempt'] ) &&
+                        (float) $pending_user['scores']['create_attempt'] < (float) get_option( 'recaptcha_v3_threshold', 0.2 )
+                ) {
+                        $pending_user['cleared'] = 0;
                 }
         }