diff --git a/drupalorg/drupalorg.module b/drupalorg/drupalorg.module
index 458dd1209039756e20dabf8a2f59d63dcc630b78..407bf35683ed12c622dd5fdf1893cc3614eed61a 100644
--- a/drupalorg/drupalorg.module
+++ b/drupalorg/drupalorg.module
@@ -543,6 +543,14 @@ function drupalorg_menu() {
'file' => 'drupalorg.pages.inc',
];
+ $items['registration-validation'] = [
+ 'title' => 'Checking your browser…',
+ 'page callback' => 'drupalorg_registration_validation',
+ 'access callback' => 'user_is_logged_in',
+ 'type' => MENU_CALLBACK,
+ 'file' => 'drupalorg.pages.inc',
+ ];
+
return $items;
}
@@ -2690,131 +2698,25 @@ function drupalorg_preprocess_page(&$variables) {
unset($variables['breadcrumb']);
}
- // Check if user is logged in and confirmed, if not, and no fingerprint, fingerprint them.
- if (user_is_logged_in() && !drupalorg_user_is_confirmed($GLOBALS['user']) && variable_get('fpjs_api_prod_key')) {
- $account = user_load($GLOBALS['user']->uid);
-
- if (empty($account->field_fingerprint)) {
- // If user does not have a fingerprint, we need to aggressively warn them
- // of their impending block.
- watchdog('drupalorg_fingerprint', 'Warning, fingerprint not set.');
- drupal_set_message(t('<div id="drupalorg-registration-warning"><strong>Your account will be suspended in @grace minutes from time of login unless you temporarily enable Javascript and disable content blockers</strong> for anti-spam and anti-abuse measures. This message will disappear once requirements have been satisfied. If you believe this message is in error, please contact us at <a href="mailto:help@drupal.org">help@drupal.org</a> to resolve this issue. Please include your user name, browser version, operating system, and the email address you tried to to use during account creation.</div>', [
- '@grace' => variable_get('drupalorg_fingerprint_block_grace_period', 5 * 60) / 60,
- ]), 'error');
-
- // Checking login time to apply to existing unconfirmed users. Logged in
- // after feature was enabled, has been logged in longer than the grace
- // period.
- if ($GLOBALS['user']->login > variable_get('drupalorg_fingerprint_start_time', REQUEST_TIME) && $GLOBALS['user']->login <= REQUEST_TIME - variable_get('drupalorg_fingerprint_block_grace_period', 5*60)) {
- watchdog('drupalorg_fingerprint', 'Blocking, fingerprint not set.');
- drupal_set_message(t('Your account was suspended because we were unable to determine if it was potentially used for spam or other abuse. If you believe this is in error, please contact us at <a href="mailto:help@drupal.org">help@drupal.org</a> to resolve this issue. Please include your user name, browser version, operating system, and the email address you tried to to use during account creation. Failure to include this information could result in no reply.'));
- $account->status = 0;
-
- // Send an email notifying account creator of block.
- drupal_mail('drupalorg', 'drupalorg_spam_block_notify', $account->mail, LANGUAGE_NONE, ['account' => $account]);
-
- drupalorg_append_user_note(entity_metadata_wrapper('user', $account), t('Automated block due to spam prevention not loading at @time', [
- '@time' => format_date(REQUEST_TIME),
- ]));
- user_save($account);
+ // Check if user is logged in and confirmed, if not, and no fingerprint, redirect to fingerprint validation.
+ if (user_is_logged_in() && !drupalorg_user_is_confirmed($GLOBALS['user']) && variable_get('fpjs_api_prod_key') && $router['path'] != 'registration-validation' && !drupalorg_user_is_fingerprinted(user_load($GLOBALS['user']->uid)) && $router['href'] !== variable_get('site_404')) {
+ $options = [];
+ if ($router['path'] != 'registration-validation') {
+ $options['query'] = ['destination' => $router['path']];
+ $query = drupal_http_build_query(drupal_get_query_parameters());
+ if ($query != '') {
+ $options['query']['destination'] .= '?' . $query;
}
-
- $variables['page']['content_top']['drupalorg_fpjs'] = drupal_get_form('drupalorg_form_fp_form', $account);
}
+ drupal_goto('registration-validation', $options);
}
}
/**
- * Form callback.
+ * Check if user is fingerprinted.
*/
-function drupalorg_form_fp_form($form, $form_state) {
- $form['#attached']['js'][] = ['type' => 'setting', 'data' => [
- 'drupalOrgFpjsSource' => url(drupal_get_path('module', 'drupalorg') . '/js/vendor/node_modules/@fingerprintjs/fingerprintjs-pro/dist/fp.min.js'),
- 'drupalOrgFpjsParams' => variable_get('drupalorg_fpjs_params', []),
- ]];
- $form['#attached']['js'][] = drupal_get_path('module', 'drupalorg') . '/js/registration-prot.js';
-
- // Registration protection.
- $form['js_warning'] = [
- '#prefix' => '<div class="js-warning warning">',
- '#markup' => t('<strong>Your account will be suspended in @grace minutes from time of login unless you temporarily enable Javascript and disable content blockers</strong> for anti-spam and anti-abuse measures. If you believe this is in error, please contact us at <a href="mailto:help@drupal.org">help@drupal.org</a> to resolve this issue. Please include your user name, browser version, operating system, and the email address you tried to to use during account creation.', [
- '@grace' => variable_get('drupalorg_fingerprint_block_grace_period', 5*60) / 60,
- ]),
- '#suffix' => '</div>',
- ];
-
- $form['field_fingerprint'] = [
- '#prefix' => '<div id="drupalorg_user_notify_wrapper">',
- '#suffix' => '</div>',
- '#title' => t('Fingerprint'),
- '#type' => 'textfield',
- '#required' => false,
- ];
-
- $form['submit'] = [
- '#type' => 'button',
- '#value' => t('Submit'),
- '#ajax' => [
- 'callback' => 'ajax_drupalorg_form_fp_validate_callback',
- 'wrapper' => 'drupalorg_user_notify_wrapper',
- 'method' => 'prepend',
- 'event' => 'click',
- ],
- ];
-
- return $form;
-}
-
-/**
- * AJAX callback for drupalorg_form_fp_form().
- */
-function ajax_drupalorg_form_fp_validate_callback($form, $form_state) {
- list($account) = $form_state['build_info']['args'];
- $account->field_fingerprint[LANGUAGE_NONE][0]['value'] = $form_state['values']['field_fingerprint'];
- user_save($account);
-
- try {
- // Get data from fingerprintjs
- $client = new GuzzleHttp\Client([
- 'base_uri' => 'https://api.fpjs.io',
- 'timeout' => 30.0,
- ]);
-
- $fpjs_response = json_decode($client->request('GET', '/visitors/' . $form_state['values']['field_fingerprint'], [
- 'query' => ['limit' => '10', 'token' => variable_get('fpjs_api_prod_key')]
- ])->getbody(), TRUE);
- } catch (Exception $e) {
- // Service is down, let the user exist and check them another time later
- watchdog('drupalorg_fingerprint', 'Fingerprint.js service unavailable. visitorId: @visitorId, error: @message', [
- '@message' => $e->getMessage(),
- '@visitorId' => $account->field_fingerprint[LANGUAGE_NONE][0]['value'],
- ], WATCHDOG_ERROR);
- return;
- }
-
- $query = new EntityFieldQuery();
- $query->entityCondition('entity_type', 'user')
- ->fieldCondition('field_fingerprint', 'value', $form_state['values']['field_fingerprint']);
- $count = $query->count()->execute();
- // $count > 1 means they've been here before
- // $count < 1 means tampering
- // empty($fpjs_response['visits']) checks that a valid fingerprint was sent.
- if ($count > 1 || $count < 1 || empty($fpjs_response['visits'])) {
- drupal_set_message(t('Our spam prevention system has detected multiple account creation attempts from your system. If you believe this is in error, please contact us at help@drupal.org to resolve this issue. Please include your user name, browser version, operating system and the email address you tried to to use during account creation when composing your message.'), 'error');
- watchdog('drupalorg_fingerprint', 'Registration denied: reg count > 0 This fingerprint has already registered. visitorId: @visitorId', [
- '@visitorId' => $form_state['values']['field_fingerprint'],
- ], WATCHDOG_INFO);
- $account->status = 0;
-
- // Send an email notifying account creator of block.
- drupal_mail('drupalorg', 'drupalorg_spam_block_notify', $account->mail, LANGUAGE_NONE, ['account' => $account]);
-
- drupalorg_append_user_note(entity_metadata_wrapper('user', $account), t('Automated block due to spam prevention duplicate account at @time', [
- '@time' => format_date(REQUEST_TIME),
- ]));
- user_save($account);
- return [];
- }
+function drupalorg_user_is_fingerprinted(stdClass $account) {
+ return !empty($account->field_fingerprint[LANGUAGE_NONE][0]['value']) && $account->field_fingerprint[LANGUAGE_NONE][0]['value'] !== 'fingerprint-failed-validation';
}
/**
@@ -5846,6 +5748,11 @@ function drupalorg_comment_insert($comment) {
* Show a message to people caught by spam protections.
*/
function _drupalorg_spam_message() {
+ if (!drupalorg_user_is_fingerprinted($GLOBALS['user'])) {
+ // Reduce messaging on registration validation page.
+ return;
+ }
+
drupal_set_message(t('<p>As a part of our continued efforts to make Drupal.org a productive place to visit and work, we’ve made it harder for spammers to post on the site. People who post valuable content will be confirmed and won’t see this message.</p>
<p><a href="!help_url">Learn about the confirmation process</a> and, once you have posted some content, <a href ="!issue_url">make your request</a>.</p>', [
'!issue_url' => '/node/add/project-issue/site_moderators?component=User%20account&categories=support&title=Request%20for%20%27confirmed%27%20role',
@@ -6045,7 +5952,7 @@ function drupalorg_user_view($account, $view_mode) {
global $user;
// Add messaging to user profile about how a user can be confirmed.
- if ($user->uid === $account->uid && !drupalorg_user_is_confirmed($account) && isset($account->roles[2])) {
+ if ($user->uid === $account->uid && !drupalorg_user_is_confirmed($account) && isset($account->roles[2]) && drupalorg_user_is_fingerprinted($account)) {
drupal_set_message(t('Your account is not yet confirmed and has some limitations. Learn how to <a href="https://www.drupal.org/drupalorg/docs/user-accounts/become-a-confirmed-user">become a confirmed user</a>.'));
}
@@ -8547,9 +8454,30 @@ function drupalorg_mail($key, &$message, $params) {
$message['subject'] = t('Drupal.org - Blocked account alert - @username', [
'@username' => $params['account']->name,
]);
- $message['body'] = array(t('The Drupal.org account for @username has been blocked by our automated spam prevention tools. If you believe this is in error, please contact us at help@drupal.org to resolve this issue. Please include your user name, browser version, operating system, and the email address you tried to to use during account creation.', [
+ $message['body'] = [t('The Drupal.org account for @username has been blocked by our automated spam prevention tools. If you believe this is in error, please contact us at help@drupal.org to resolve this issue. Please include your user name, browser version, operating system, and the email address you tried to to use during account creation or we may not respond.', [
'@username' => $params['account']->name,
- ]));
+ ])];
+ break;
+
+ case 'drupalorg_registration_verification_failed':
+ $message['subject'] = t('User: ' . $params['account']->name . ' failed fingerprint during drupal.org registration');
+ $message['body'] = [
+ t('User @account-name failed fingerprint during registration.<p>',[
+ '@account-name' => $params['account']->name,
+ ]),
+ t('Account email address: @account-email', [
+ '@account-email' => $params['account']->mail,
+ ]),
+ t('Account link: @account-link', [
+ '@account-link' => url('user/' . $params['account']->uid, ['absolute' => TRUE]),
+ ]),
+ t('Account edit link: @account-edit-link', [
+ '@account-edit-link' => url('user/' . $params['account']->uid . '/edit', ['absolute' => TRUE]),
+ ]),
+ t('Message from user:<br>@explanation',[
+ '@explanation' => $params['explanation'],
+ ]),
+ ];
break;
case 'credited_by_maintainer':
diff --git a/drupalorg/drupalorg.pages.inc b/drupalorg/drupalorg.pages.inc
index e39ce24a9b5569dcb3d54c0cb9f6478b99c2bfaa..8ed237b0c68ea864225a8fd066b5f9f2122d705e 100644
--- a/drupalorg/drupalorg.pages.inc
+++ b/drupalorg/drupalorg.pages.inc
@@ -1384,3 +1384,164 @@ function _drupalorg_toggle_branch_visibility($gitlab_project_id, $branch_name, $
drupal_set_message(t('Branch visibility has been toggled.'));
drupal_goto('', ['fragment' => 'main']);
}
+
+/**
+ * An interstitial page we use as a way to force validation of new accounts
+ *
+ * @param $node
+ *
+ * @return $content
+ */
+function drupalorg_registration_validation() {
+ $account = user_load($GLOBALS['user']->uid);
+ $account_wrapper = entity_metadata_wrapper('user', $account);
+
+ // Check for FP when this page loads, just in case they successfully disabled JS blockers.
+ $content['drupalorg_fpjs'] = drupal_get_form('drupalorg_form_fp_form', $account);
+
+ // If the account fails the check, or we previously set a value indicating failure
+ if (drupalorg_user_is_fingerprinted($account)) {
+ drupal_goto('user');
+ return;
+ }
+
+ if (!isset($_SESSION['drupalorg_registration_validation_count'])) {
+ $_SESSION['drupalorg_registration_validation_count'] = 1;
+ }
+ else {
+ $_SESSION['drupalorg_registration_validation_count'] += 1;
+ }
+
+ $content['instructions'] = [
+ '#markup' => t('<p>For the health of both the community and the site we need to verify that your account is unique. Because of the configuration of your browser, we have been unable to complete the checks.</p><p>Here are some steps you can take to help with verification:</p><ul><li>Disable content blockers like uBlock Origin & Adblock Plus</li><li>Ensure JavaScript is enabled in your browser</li><li>Disable enhanced tracking protections in your browser (<a href="https://support.mozilla.org/en-US/kb/enhanced-tracking-protection-firefox-desktop#w_what-to-do-if-a-site-seems-broken" target="_blank">Firefox tracking protections</a>)</li><li><a href="@homepage">Click here to try again</a></li></ul><p>When you no longer see this page, you are welcome to re-enable content blockers and tracking protections.</p>', [
+ '@homepage' => url(drupal_get_destination()['destination']),
+ ]),
+ ];
+
+ if ($_SESSION['drupalorg_registration_validation_count'] > 2) {
+ if ($account_wrapper->field_fingerprint->value() === 'fingerprint-failed-validation') {
+ $content['support'] = ['#markup' => t('A support request has been submitted to help@drupal.org. Watch for email from that address.')];
+ }
+ else {
+ $content['form_field'] = drupal_get_form('drupalorg_registration_validation_text_form');
+ }
+ }
+
+ if (empty($account->field_fingerprint)) {
+ watchdog('drupalorg_fingerprint', 'Warning, fingerprint not set.');
+ }
+
+ return $content;
+}
+
+/**
+ * Form callback.
+ */
+function drupalorg_form_fp_form($form, $form_state) {
+ $form['#attached']['js'][] = ['type' => 'setting', 'data' => [
+ 'drupalOrgFpjsSource' => url(drupal_get_path('module', 'drupalorg') . '/js/vendor/node_modules/@fingerprintjs/fingerprintjs-pro/dist/fp.min.js'),
+ 'drupalOrgFpjsParams' => variable_get('drupalorg_fpjs_params', []),
+ ]];
+ $form['#attached']['js'][] = drupal_get_path('module', 'drupalorg') . '/js/registration-prot.js';
+
+ // Registration protection.
+ $form['field_fingerprint'] = [
+ '#title' => t('Fingerprint'),
+ '#type' => 'textfield',
+ ];
+
+ $form['submit'] = [
+ '#type' => 'submit',
+ '#value' => t('Submit'),
+ ];
+
+ return $form;
+}
+
+/**
+ * AJAX callback for drupalorg_form_fp_form().
+ */
+function drupalorg_form_fp_form_submit($form, &$form_state) {
+ list($account) = $form_state['build_info']['args'];
+ $account->field_fingerprint[LANGUAGE_NONE][0]['value'] = $form_state['values']['field_fingerprint'];
+ user_save($account);
+
+ try {
+ // Get data from fingerprintjs
+ $client = new GuzzleHttp\Client([
+ 'base_uri' => 'https://api.fpjs.io',
+ 'timeout' => 30.0,
+ ]);
+
+ $fpjs_response = json_decode($client->request('GET', '/visitors/' . $form_state['values']['field_fingerprint'], [
+ 'query' => ['limit' => '10', 'token' => variable_get('fpjs_api_prod_key')],
+ ])->getbody(), TRUE);
+ } catch (Exception $e) {
+ // Service is down, let the user exist and check them another time later
+ watchdog('drupalorg_fingerprint', 'Fingerprint.js service unavailable. visitorId: @visitorId, error: @message', [
+ '@message' => $e->getMessage(),
+ '@visitorId' => $account->field_fingerprint[LANGUAGE_NONE][0]['value'],
+ ], WATCHDOG_ERROR);
+ return;
+ }
+
+ $query = (new EntityFieldQuery())->entityCondition('entity_type', 'user')
+ ->fieldCondition('field_fingerprint', 'value', $form_state['values']['field_fingerprint']);
+ $count = $query->count()->execute();
+ // $count > 1 means they've been here before
+ // $count < 1 means tampering
+ // empty($fpjs_response['visits']) checks that a valid fingerprint was sent.
+ if ($count > 1 || $count < 1 || empty($fpjs_response['visits'])) {
+ watchdog('drupalorg_fingerprint', 'Registration denied: reg count > 0 This fingerprint has already registered. visitorId: @visitorId', [
+ '@visitorId' => $form_state['values']['field_fingerprint'],
+ ], WATCHDOG_INFO);
+ $account->status = 0;
+
+ // Send an email notifying account creator of block.
+ drupal_mail('drupalorg', 'drupalorg_spam_block_notify', $account->mail, LANGUAGE_NONE, ['account' => $account]);
+ drupal_set_message(t('Your Drupal.org account has been blocked by our automated spam prevention tools. If you believe this is in error, please contact us at help@drupal.org to resolve this issue. Please include your user name, browser version, operating system, and the email address you tried to to use during account creation or we may not respond.'), 'warning');
+
+ drupalorg_append_user_note(entity_metadata_wrapper('user', $account), t('Automated block due to spam prevention duplicate account at @time', [
+ '@time' => format_date(REQUEST_TIME),
+ ]));
+
+ user_save($account);
+ $form_state['redirect'] = 'user/login';
+ }
+}
+
+/**
+ * Form callback.
+ */
+function drupalorg_registration_validation_text_form($form, $form_state) {
+ $form['explanation'] = [
+ '#prefix' => '<p>' . t('It looks like you are having trouble verifying your browser!') . '</p>',
+ '#title' => t('Tell us a little bit about how you would like to use your account on Drupal.org'),
+ '#type' => 'textarea',
+ '#required' => TRUE,
+ ];
+ $form['submit'] = [
+ '#type' => 'submit',
+ '#value' => t('Ask for support'),
+ ];
+
+ return $form;
+}
+
+/**
+ * Form submit callback for drupalorg_registration_validation_text_form().
+ */
+function drupalorg_registration_validation_text_form_submit($form, &$form_state) {
+ $account = user_load($GLOBALS['user']->uid);
+
+ // Send mail to help@drupal.org notifying us of user intent.
+ drupal_mail('drupalorg', 'drupalorg_registration_verification_failed', 'help@drupal.org', LANGUAGE_NONE, [
+ 'account' => $account,
+ 'explanation' => $form_state['values']['explanation'],
+ ]);
+
+ $account->field_fingerprint[LANGUAGE_NONE][0]['value'] = 'fingerprint-failed-validation';
+ user_save($account);
+
+ drupal_set_message(t('Support request emailed to <a href="mailto:help@drupal.org">help@drupal.org</a>.'));
+}
diff --git a/drupalorg/js/registration-prot.js b/drupalorg/js/registration-prot.js
index 54cc073cb340d0e57c86e9618f9d48d1140276fe..629004e0540f93cfecf01b1996531dca57eb500d 100644
--- a/drupalorg/js/registration-prot.js
+++ b/drupalorg/js/registration-prot.js
@@ -16,11 +16,7 @@
var fpForm = document.forms['drupalorg-form-fp-form'];
var submitButton = fpForm.querySelector('.form-submit');
fpForm.querySelector('input[name=field_fingerprint]').value = result.visitorId;
- if (!(submitButton.classList.contains('clicked'))) {
- submitButton.click();
- submitButton.classList.add('clicked');
- document.getElementById('drupalorg-registration-warning').parentElement.hidden = true;
- }
+ submitButton.click();
});
}
};