Merge branch '43525-limit-number-of-failed-logins-using-ldap' into 'master'
Resolve "Limit number of failed logins using LDAP for authentication" Closes #43525 See merge request gitlab-org/gitlab-ce!17886
This commit is contained in:
commit
f8401d5c35
|
@ -18,6 +18,18 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
|
|||
end
|
||||
end
|
||||
|
||||
# Extend the standard implementation to also increment
|
||||
# the number of failed sign in attempts
|
||||
def failure
|
||||
if params[:username].present? && AuthHelper.form_based_provider?(failed_strategy.name)
|
||||
user = User.by_login(params[:username])
|
||||
|
||||
user&.increment_failed_attempts!
|
||||
end
|
||||
|
||||
super
|
||||
end
|
||||
|
||||
# Extend the standard message generation to accept our custom exception
|
||||
def failure_message
|
||||
exception = env["omniauth.error"]
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Limit the number of failed logins when using LDAP for authentication
|
||||
merge_request: 43525
|
||||
author:
|
||||
type: added
|
|
@ -10,83 +10,119 @@ describe OmniauthCallbacksController do
|
|||
stub_omniauth_provider(provider, context: request)
|
||||
end
|
||||
|
||||
context 'github' do
|
||||
context 'when the user is on the last sign in attempt' do
|
||||
let(:extern_uid) { 'my-uid' }
|
||||
let(:provider) { :github }
|
||||
|
||||
it 'allows sign in' do
|
||||
post provider
|
||||
|
||||
expect(request.env['warden']).to be_authenticated
|
||||
before do
|
||||
user.update(failed_attempts: User.maximum_attempts.pred)
|
||||
subject.response = ActionDispatch::Response.new
|
||||
end
|
||||
|
||||
shared_context 'sign_up' do
|
||||
let(:user) { double(email: 'new@example.com') }
|
||||
context 'when using a form based provider' do
|
||||
let(:provider) { :ldap }
|
||||
|
||||
before do
|
||||
stub_omniauth_setting(block_auto_created_users: false)
|
||||
it 'locks the user when sign in fails' do
|
||||
allow(subject).to receive(:params).and_return(ActionController::Parameters.new(username: user.username))
|
||||
request.env['omniauth.error.strategy'] = OmniAuth::Strategies::LDAP.new(nil)
|
||||
|
||||
subject.send(:failure)
|
||||
|
||||
expect(user.reload).to be_access_locked
|
||||
end
|
||||
end
|
||||
|
||||
context 'sign up' do
|
||||
include_context 'sign_up'
|
||||
context 'when using a button based provider' do
|
||||
let(:provider) { :github }
|
||||
|
||||
it 'is allowed' do
|
||||
it 'does not lock the user when sign in fails' do
|
||||
request.env['omniauth.error.strategy'] = OmniAuth::Strategies::GitHub.new(nil)
|
||||
|
||||
subject.send(:failure)
|
||||
|
||||
expect(user.reload).not_to be_access_locked
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'strategies' do
|
||||
context 'github' do
|
||||
let(:extern_uid) { 'my-uid' }
|
||||
let(:provider) { :github }
|
||||
|
||||
it 'allows sign in' do
|
||||
post provider
|
||||
|
||||
expect(request.env['warden']).to be_authenticated
|
||||
end
|
||||
end
|
||||
|
||||
context 'when OAuth is disabled' do
|
||||
before do
|
||||
stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false')
|
||||
settings = Gitlab::CurrentSettings.current_application_settings
|
||||
settings.update(disabled_oauth_sign_in_sources: [provider.to_s])
|
||||
end
|
||||
shared_context 'sign_up' do
|
||||
let(:user) { double(email: 'new@example.com') }
|
||||
|
||||
it 'prevents login via POST' do
|
||||
post provider
|
||||
|
||||
expect(request.env['warden']).not_to be_authenticated
|
||||
end
|
||||
|
||||
it 'shows warning when attempting login' do
|
||||
post provider
|
||||
|
||||
expect(response).to redirect_to new_user_session_path
|
||||
expect(flash[:alert]).to eq('Signing in using GitHub has been disabled')
|
||||
end
|
||||
|
||||
it 'allows linking the disabled provider' do
|
||||
user.identities.destroy_all
|
||||
sign_in(user)
|
||||
|
||||
expect { post provider }.to change { user.reload.identities.count }.by(1)
|
||||
before do
|
||||
stub_omniauth_setting(block_auto_created_users: false)
|
||||
end
|
||||
end
|
||||
|
||||
context 'sign up' do
|
||||
include_context 'sign_up'
|
||||
|
||||
it 'is prevented' do
|
||||
it 'is allowed' do
|
||||
post provider
|
||||
|
||||
expect(request.env['warden']).to be_authenticated
|
||||
end
|
||||
end
|
||||
|
||||
context 'when OAuth is disabled' do
|
||||
before do
|
||||
stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false')
|
||||
settings = Gitlab::CurrentSettings.current_application_settings
|
||||
settings.update(disabled_oauth_sign_in_sources: [provider.to_s])
|
||||
end
|
||||
|
||||
it 'prevents login via POST' do
|
||||
post provider
|
||||
|
||||
expect(request.env['warden']).not_to be_authenticated
|
||||
end
|
||||
|
||||
it 'shows warning when attempting login' do
|
||||
post provider
|
||||
|
||||
expect(response).to redirect_to new_user_session_path
|
||||
expect(flash[:alert]).to eq('Signing in using GitHub has been disabled')
|
||||
end
|
||||
|
||||
it 'allows linking the disabled provider' do
|
||||
user.identities.destroy_all
|
||||
sign_in(user)
|
||||
|
||||
expect { post provider }.to change { user.reload.identities.count }.by(1)
|
||||
end
|
||||
|
||||
context 'sign up' do
|
||||
include_context 'sign_up'
|
||||
|
||||
it 'is prevented' do
|
||||
post provider
|
||||
|
||||
expect(request.env['warden']).not_to be_authenticated
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'auth0' do
|
||||
let(:extern_uid) { '' }
|
||||
let(:provider) { :auth0 }
|
||||
|
||||
it 'does not allow sign in without extern_uid' do
|
||||
post 'auth0'
|
||||
|
||||
expect(request.env['warden']).not_to be_authenticated
|
||||
expect(response.status).to eq(302)
|
||||
expect(controller).to set_flash[:alert].to('Wrong extern UID provided. Make sure Auth0 is configured correctly.')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'auth0' do
|
||||
let(:extern_uid) { '' }
|
||||
let(:provider) { :auth0 }
|
||||
|
||||
it 'does not allow sign in without extern_uid' do
|
||||
post 'auth0'
|
||||
|
||||
expect(request.env['warden']).not_to be_authenticated
|
||||
expect(response.status).to eq(302)
|
||||
expect(controller).to set_flash[:alert].to('Wrong extern UID provided. Make sure Auth0 is configured correctly.')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue