Merge branch '46548-open-source-alternative-to-recaptcha-for-gitlab-com-registration' into 'master'
Open source alternative to reCAPTCHA for GitLab.com registration See merge request gitlab-org/gitlab-ce!31625
This commit is contained in:
commit
0b43c1027f
10 changed files with 160 additions and 0 deletions
1
Gemfile
1
Gemfile
|
@ -51,6 +51,7 @@ gem 'jwt', '~> 2.1.0'
|
||||||
# Spam and anti-bot protection
|
# Spam and anti-bot protection
|
||||||
gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
|
gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
|
||||||
gem 'akismet', '~> 2.0'
|
gem 'akismet', '~> 2.0'
|
||||||
|
gem 'invisible_captcha', '~> 0.12.1'
|
||||||
|
|
||||||
# Two-factor authentication
|
# Two-factor authentication
|
||||||
gem 'devise-two-factor', '~> 3.0.0'
|
gem 'devise-two-factor', '~> 3.0.0'
|
||||||
|
|
|
@ -438,6 +438,8 @@ GEM
|
||||||
influxdb (0.2.3)
|
influxdb (0.2.3)
|
||||||
cause
|
cause
|
||||||
json
|
json
|
||||||
|
invisible_captcha (0.12.1)
|
||||||
|
rails (>= 3.2.0)
|
||||||
ipaddress (0.8.3)
|
ipaddress (0.8.3)
|
||||||
jaeger-client (0.10.0)
|
jaeger-client (0.10.0)
|
||||||
opentracing (~> 0.3)
|
opentracing (~> 0.3)
|
||||||
|
@ -1129,6 +1131,7 @@ DEPENDENCIES
|
||||||
httparty (~> 0.16.4)
|
httparty (~> 0.16.4)
|
||||||
icalendar
|
icalendar
|
||||||
influxdb (~> 0.2)
|
influxdb (~> 0.2)
|
||||||
|
invisible_captcha (~> 0.12.1)
|
||||||
jira-ruby (~> 1.4)
|
jira-ruby (~> 1.4)
|
||||||
js_regex (~> 3.1)
|
js_regex (~> 3.1)
|
||||||
json-schema (~> 2.8.0)
|
json-schema (~> 2.8.0)
|
||||||
|
|
51
app/controllers/concerns/invisible_captcha.rb
Normal file
51
app/controllers/concerns/invisible_captcha.rb
Normal file
|
@ -0,0 +1,51 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
module InvisibleCaptcha
|
||||||
|
extend ActiveSupport::Concern
|
||||||
|
|
||||||
|
included do
|
||||||
|
invisible_captcha only: :create, on_spam: :on_honeypot_spam_callback, on_timestamp_spam: :on_timestamp_spam_callback
|
||||||
|
end
|
||||||
|
|
||||||
|
def on_honeypot_spam_callback
|
||||||
|
return unless Feature.enabled?(:invisible_captcha)
|
||||||
|
|
||||||
|
invisible_captcha_honeypot_counter.increment
|
||||||
|
log_request('Invisible_Captcha_Honeypot_Request')
|
||||||
|
|
||||||
|
head(200)
|
||||||
|
end
|
||||||
|
|
||||||
|
def on_timestamp_spam_callback
|
||||||
|
return unless Feature.enabled?(:invisible_captcha)
|
||||||
|
|
||||||
|
invisible_captcha_timestamp_counter.increment
|
||||||
|
log_request('Invisible_Captcha_Timestamp_Request')
|
||||||
|
|
||||||
|
redirect_to new_user_session_path, alert: InvisibleCaptcha.timestamp_error_message
|
||||||
|
end
|
||||||
|
|
||||||
|
def invisible_captcha_honeypot_counter
|
||||||
|
@invisible_captcha_honeypot_counter ||=
|
||||||
|
Gitlab::Metrics.counter(:bot_blocked_by_invisible_captcha_honeypot,
|
||||||
|
'Counter of blocked sign up attempts with filled honeypot')
|
||||||
|
end
|
||||||
|
|
||||||
|
def invisible_captcha_timestamp_counter
|
||||||
|
@invisible_captcha_timestamp_counter ||=
|
||||||
|
Gitlab::Metrics.counter(:bot_blocked_by_invisible_captcha_timestamp,
|
||||||
|
'Counter of blocked sign up attempts with invalid timestamp')
|
||||||
|
end
|
||||||
|
|
||||||
|
def log_request(message)
|
||||||
|
request_information = {
|
||||||
|
message: message,
|
||||||
|
env: :invisible_captcha_signup_bot_detected,
|
||||||
|
ip: request.ip,
|
||||||
|
request_method: request.request_method,
|
||||||
|
fullpath: request.fullpath
|
||||||
|
}
|
||||||
|
|
||||||
|
Gitlab::AuthLogger.error(request_information)
|
||||||
|
end
|
||||||
|
end
|
|
@ -4,6 +4,7 @@ class RegistrationsController < Devise::RegistrationsController
|
||||||
include Recaptcha::Verify
|
include Recaptcha::Verify
|
||||||
include AcceptsPendingInvitations
|
include AcceptsPendingInvitations
|
||||||
include RecaptchaExperimentHelper
|
include RecaptchaExperimentHelper
|
||||||
|
include InvisibleCaptcha
|
||||||
|
|
||||||
prepend_before_action :check_captcha, only: :create
|
prepend_before_action :check_captcha, only: :create
|
||||||
before_action :whitelist_query_limiting, only: [:destroy]
|
before_action :whitelist_query_limiting, only: [:destroy]
|
||||||
|
|
|
@ -5,6 +5,8 @@
|
||||||
= form_for(resource, as: "new_#{resource_name}", url: registration_path(resource_name), html: { class: "new_new_user gl-show-field-errors", "aria-live" => "assertive" }) do |f|
|
= form_for(resource, as: "new_#{resource_name}", url: registration_path(resource_name), html: { class: "new_new_user gl-show-field-errors", "aria-live" => "assertive" }) do |f|
|
||||||
.devise-errors
|
.devise-errors
|
||||||
= render "devise/shared/error_messages", resource: resource
|
= render "devise/shared/error_messages", resource: resource
|
||||||
|
- if Feature.enabled?(:invisible_captcha)
|
||||||
|
= invisible_captcha
|
||||||
.name.form-group
|
.name.form-group
|
||||||
= f.label :name, _('Full name'), class: 'label-bold'
|
= f.label :name, _('Full name'), class: 'label-bold'
|
||||||
= f.text_field :name, class: "form-control top js-block-emoji js-validate-length", :data => { :max_length => max_name_length, :max_length_message => s_("SignUp|Name is too long (maximum is %{max_length} characters).") % { max_length: max_name_length }, :qa_selector => 'new_user_name_field' }, required: true, title: _("This field is required.")
|
= f.text_field :name, class: "form-control top js-block-emoji js-validate-length", :data => { :max_length => max_name_length, :max_length_message => s_("SignUp|Name is too long (maximum is %{max_length} characters).") % { max_length: max_name_length }, :qa_selector => 'new_user_name_field' }, required: true, title: _("This field is required.")
|
||||||
|
|
7
config/initializers/invisible_captcha.rb
Normal file
7
config/initializers/invisible_captcha.rb
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
InvisibleCaptcha.setup do |config|
|
||||||
|
config.honeypots = %w(firstname lastname)
|
||||||
|
config.timestamp_enabled = true
|
||||||
|
config.timestamp_threshold = 4
|
||||||
|
end
|
4
config/locales/invisible_captcha.en.yml
Normal file
4
config/locales/invisible_captcha.en.yml
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
en:
|
||||||
|
invisible_captcha:
|
||||||
|
sentence_for_humans: If you are human, please ignore this field.
|
||||||
|
timestamp_error_message: That was a bit too quick! Please resubmit.
|
|
@ -5,6 +5,10 @@ require 'spec_helper'
|
||||||
describe RegistrationsController do
|
describe RegistrationsController do
|
||||||
include TermsHelper
|
include TermsHelper
|
||||||
|
|
||||||
|
before do
|
||||||
|
stub_feature_flags(invisible_captcha: false)
|
||||||
|
end
|
||||||
|
|
||||||
describe '#create' do
|
describe '#create' do
|
||||||
let(:base_user_params) { { name: 'new_user', username: 'new_username', email: 'new@user.com', password: 'Any_password' } }
|
let(:base_user_params) { { name: 'new_user', username: 'new_username', email: 'new@user.com', password: 'Any_password' } }
|
||||||
let(:user_params) { { user: base_user_params } }
|
let(:user_params) { { user: base_user_params } }
|
||||||
|
@ -88,6 +92,88 @@ describe RegistrationsController do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context 'when invisible captcha is enabled' do
|
||||||
|
before do
|
||||||
|
stub_feature_flags(invisible_captcha: true)
|
||||||
|
InvisibleCaptcha.timestamp_threshold = treshold
|
||||||
|
end
|
||||||
|
|
||||||
|
let(:treshold) { 4 }
|
||||||
|
let(:session_params) { { invisible_captcha_timestamp: form_rendered_time.iso8601 } }
|
||||||
|
let(:form_rendered_time) { Time.current }
|
||||||
|
let(:submit_time) { form_rendered_time + treshold }
|
||||||
|
let(:auth_log_attributes) do
|
||||||
|
{
|
||||||
|
message: auth_log_message,
|
||||||
|
env: :invisible_captcha_signup_bot_detected,
|
||||||
|
ip: '0.0.0.0',
|
||||||
|
request_method: 'POST',
|
||||||
|
fullpath: '/users'
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'the honeypot has not been filled and the signup form has not been submitted too quickly' do
|
||||||
|
it 'creates an account' do
|
||||||
|
travel_to(submit_time) do
|
||||||
|
expect { post(:create, params: user_params, session: session_params) }.to change(User, :count).by(1)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'honeypot spam detection' do
|
||||||
|
let(:user_params) { super().merge(firstname: 'Roy', lastname: 'Batty') }
|
||||||
|
let(:auth_log_message) { 'Invisible_Captcha_Honeypot_Request' }
|
||||||
|
|
||||||
|
it 'logs the request, refuses to create an account and renders an empty body' do
|
||||||
|
travel_to(submit_time) do
|
||||||
|
expect(Gitlab::Metrics).to receive(:counter)
|
||||||
|
.with(:bot_blocked_by_invisible_captcha_honeypot, 'Counter of blocked sign up attempts with filled honeypot')
|
||||||
|
.and_call_original
|
||||||
|
expect(Gitlab::AuthLogger).to receive(:error).with(auth_log_attributes).once
|
||||||
|
expect { post(:create, params: user_params, session: session_params) }.not_to change(User, :count)
|
||||||
|
expect(response).to have_gitlab_http_status(200)
|
||||||
|
expect(response.body).to be_empty
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'timestamp spam detection' do
|
||||||
|
let(:auth_log_message) { 'Invisible_Captcha_Timestamp_Request' }
|
||||||
|
|
||||||
|
context 'the sign up form has been submitted without the invisible_captcha_timestamp parameter' do
|
||||||
|
let(:session_params) { nil }
|
||||||
|
|
||||||
|
it 'logs the request, refuses to create an account and displays a flash alert' do
|
||||||
|
travel_to(submit_time) do
|
||||||
|
expect(Gitlab::Metrics).to receive(:counter)
|
||||||
|
.with(:bot_blocked_by_invisible_captcha_timestamp, 'Counter of blocked sign up attempts with invalid timestamp')
|
||||||
|
.and_call_original
|
||||||
|
expect(Gitlab::AuthLogger).to receive(:error).with(auth_log_attributes).once
|
||||||
|
expect { post(:create, params: user_params, session: session_params) }.not_to change(User, :count)
|
||||||
|
expect(response).to redirect_to(new_user_session_path)
|
||||||
|
expect(flash[:alert]).to include 'That was a bit too quick! Please resubmit.'
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'the sign up form has been submitted too quickly' do
|
||||||
|
let(:submit_time) { form_rendered_time }
|
||||||
|
|
||||||
|
it 'logs the request, refuses to create an account and displays a flash alert' do
|
||||||
|
travel_to(submit_time) do
|
||||||
|
expect(Gitlab::Metrics).to receive(:counter)
|
||||||
|
.with(:bot_blocked_by_invisible_captcha_timestamp, 'Counter of blocked sign up attempts with invalid timestamp')
|
||||||
|
.and_call_original
|
||||||
|
expect(Gitlab::AuthLogger).to receive(:error).with(auth_log_attributes).once
|
||||||
|
expect { post(:create, params: user_params, session: session_params) }.not_to change(User, :count)
|
||||||
|
expect(response).to redirect_to(new_user_session_path)
|
||||||
|
expect(flash[:alert]).to include 'That was a bit too quick! Please resubmit.'
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
context 'when terms are enforced' do
|
context 'when terms are enforced' do
|
||||||
before do
|
before do
|
||||||
enforce_terms
|
enforce_terms
|
||||||
|
|
|
@ -10,6 +10,7 @@ describe 'Invites' do
|
||||||
let(:group_invite) { group.group_members.invite.last }
|
let(:group_invite) { group.group_members.invite.last }
|
||||||
|
|
||||||
before do
|
before do
|
||||||
|
stub_feature_flags(invisible_captcha: false)
|
||||||
project.add_maintainer(owner)
|
project.add_maintainer(owner)
|
||||||
group.add_user(owner, Gitlab::Access::OWNER)
|
group.add_user(owner, Gitlab::Access::OWNER)
|
||||||
group.add_developer('user@example.com', owner)
|
group.add_developer('user@example.com', owner)
|
||||||
|
|
|
@ -5,6 +5,10 @@ require 'spec_helper'
|
||||||
describe 'Signup' do
|
describe 'Signup' do
|
||||||
include TermsHelper
|
include TermsHelper
|
||||||
|
|
||||||
|
before do
|
||||||
|
stub_feature_flags(invisible_captcha: false)
|
||||||
|
end
|
||||||
|
|
||||||
let(:new_user) { build_stubbed(:user) }
|
let(:new_user) { build_stubbed(:user) }
|
||||||
|
|
||||||
describe 'username validation', :js do
|
describe 'username validation', :js do
|
||||||
|
|
Loading…
Reference in a new issue