From e0fea696c6e4eb007c945d63faca594a70dd45e7 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Wed, 6 Aug 2014 15:17:12 +0200
Subject: [PATCH] Skip LDAP cache check when LDAP is disabled
---
app/models/user.rb | 4 +++-
spec/models/user_spec.rb | 31 +++++++++++++++++++++----------
2 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/app/models/user.rb b/app/models/user.rb
index 7e3a7262afc7f..8f9f319aa9edf 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -403,7 +403,9 @@ def sanitize_attrs
end
def requires_ldap_check?
- if ldap_user?
+ if !Gitlab.config.ldap.enabled
+ false
+ elsif ldap_user?
!last_credential_check_at || (last_credential_check_at + 1.hour) < Time.now
else
false
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index c4bd80cc96a5f..e18e76cd69ef4 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -315,22 +315,33 @@
describe :requires_ldap_check? do
let(:user) { User.new }
- it 'is false for non-LDAP users' do
- user.stub(ldap_user?: false)
+ it 'is false when LDAP is disabled' do
+ # Create a condition which would otherwise cause 'true' to be returned
+ user.stub(ldap_user?: true)
+ user.last_credential_check_at = nil
expect(user.requires_ldap_check?).to be_false
end
- context 'when the user is an LDAP user' do
- before { user.stub(ldap_user?: true) }
+ context 'when LDAP is enabled' do
+ before { Gitlab.config.ldap.stub(enabled: true) }
- it 'is true when the user has never had an LDAP check before' do
- user.last_credential_check_at = nil
- expect(user.requires_ldap_check?).to be_true
+ it 'is false for non-LDAP users' do
+ user.stub(ldap_user?: false)
+ expect(user.requires_ldap_check?).to be_false
end
- it 'is true when the last LDAP check happened over 1 hour ago' do
- user.last_credential_check_at = 2.hours.ago
- expect(user.requires_ldap_check?).to be_true
+ context 'and when the user is an LDAP user' do
+ before { user.stub(ldap_user?: true) }
+
+ it 'is true when the user has never had an LDAP check before' do
+ user.last_credential_check_at = nil
+ expect(user.requires_ldap_check?).to be_true
+ end
+
+ it 'is true when the last LDAP check happened over 1 hour ago' do
+ user.last_credential_check_at = 2.hours.ago
+ expect(user.requires_ldap_check?).to be_true
+ end
end
end
end
--
GitLab