Commit f8401d5c authored by Douwe Maan's avatar Douwe Maan

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
parents 32614419 161a05b9
...@@ -18,6 +18,18 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController ...@@ -18,6 +18,18 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
end end
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 # Extend the standard message generation to accept our custom exception
def failure_message def failure_message
exception = env["omniauth.error"] exception = env["omniauth.error"]
......
---
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 ...@@ -10,83 +10,119 @@ describe OmniauthCallbacksController do
stub_omniauth_provider(provider, context: request) stub_omniauth_provider(provider, context: request)
end end
context 'github' do context 'when the user is on the last sign in attempt' do
let(:extern_uid) { 'my-uid' } let(:extern_uid) { 'my-uid' }
let(:provider) { :github }
it 'allows sign in' do before do
post provider user.update(failed_attempts: User.maximum_attempts.pred)
subject.response = ActionDispatch::Response.new
expect(request.env['warden']).to be_authenticated
end end
shared_context 'sign_up' do context 'when using a form based provider' do
let(:user) { double(email: 'new@example.com') } let(:provider) { :ldap }
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)
before do expect(user.reload).to be_access_locked
stub_omniauth_setting(block_auto_created_users: false)
end end
end end
context 'sign up' do context 'when using a button based provider' do
include_context 'sign_up' let(:provider) { :github }
it 'is allowed' do it 'does not lock the user when sign in fails' do
post provider request.env['omniauth.error.strategy'] = OmniAuth::Strategies::GitHub.new(nil)
expect(request.env['warden']).to be_authenticated subject.send(:failure)
expect(user.reload).not_to be_access_locked
end end
end end
end
context 'when OAuth is disabled' do context 'strategies' do
before do context 'github' do
stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false') let(:extern_uid) { 'my-uid' }
settings = Gitlab::CurrentSettings.current_application_settings let(:provider) { :github }
settings.update(disabled_oauth_sign_in_sources: [provider.to_s])
end
it 'prevents login via POST' do it 'allows sign in' do
post provider post provider
expect(request.env['warden']).not_to be_authenticated expect(request.env['warden']).to be_authenticated
end end
it 'shows warning when attempting login' do shared_context 'sign_up' do
post provider let(:user) { double(email: 'new@example.com') }
expect(response).to redirect_to new_user_session_path before do
expect(flash[:alert]).to eq('Signing in using GitHub has been disabled') stub_omniauth_setting(block_auto_created_users: false)
end
end end
it 'allows linking the disabled provider' do context 'sign up' do
user.identities.destroy_all include_context 'sign_up'
sign_in(user)
it 'is allowed' do
post provider
expect { post provider }.to change { user.reload.identities.count }.by(1) expect(request.env['warden']).to be_authenticated
end
end end
context 'sign up' do context 'when OAuth is disabled' do
include_context 'sign_up' 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 'is prevented' do it 'prevents login via POST' do
post provider post provider
expect(request.env['warden']).not_to be_authenticated expect(request.env['warden']).not_to be_authenticated
end 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
end end
end
context 'auth0' do context 'auth0' do
let(:extern_uid) { '' } let(:extern_uid) { '' }
let(:provider) { :auth0 } let(:provider) { :auth0 }
it 'does not allow sign in without extern_uid' do it 'does not allow sign in without extern_uid' do
post 'auth0' post 'auth0'
expect(request.env['warden']).not_to be_authenticated expect(request.env['warden']).not_to be_authenticated
expect(response.status).to eq(302) expect(response.status).to eq(302)
expect(controller).to set_flash[:alert].to('Wrong extern UID provided. Make sure Auth0 is configured correctly.') expect(controller).to set_flash[:alert].to('Wrong extern UID provided. Make sure Auth0 is configured correctly.')
end
end end
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment