diff options
author | Nick Thomas <nick@gitlab.com> | 2017-07-12 09:41:41 +0100 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2017-07-12 09:41:41 +0100 |
commit | 7f350ba16d85efff992a9fe6bd6ad734244656d9 (patch) | |
tree | cda73de94aed7b36452ca764700a5828bfaf00c1 /lib | |
parent | 2b827d05786a2175281b8f3319570a839b66a627 (diff) | |
download | gitlab-ce-7f350ba16d85efff992a9fe6bd6ad734244656d9.tar.gz |
Extract the finder portion of ldap_person so it can be overridden in EE
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/o_auth/user.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/gitlab/o_auth/user.rb b/lib/gitlab/o_auth/user.rb index b3f453e506d..3f2bbd9f6a6 100644 --- a/lib/gitlab/o_auth/user.rb +++ b/lib/gitlab/o_auth/user.rb @@ -101,14 +101,18 @@ module Gitlab # Look for a corresponding person with same uid in any of the configured LDAP providers Gitlab::LDAP::Config.providers.each do |provider| adapter = Gitlab::LDAP::Adapter.new(provider) - @ldap_person = Gitlab::LDAP::Person.find_by_uid(auth_hash.uid, adapter) - # The `uid` might actually be a DN. Try it next. - @ldap_person ||= Gitlab::LDAP::Person.find_by_dn(auth_hash.uid, adapter) + @ldap_person = find_ldap_person(auth_hash, adapter) break if @ldap_person end @ldap_person end + def find_ldap_person(auth_hash, adapter) + by_uid = Gitlab::LDAP::Person.find_by_uid(auth_hash.uid, adapter) + # The `uid` might actually be a DN. Try it next. + by_uid || Gitlab::LDAP::Person.find_by_dn(auth_hash.uid, adapter) + end + def ldap_config Gitlab::LDAP::Config.new(ldap_person.provider) if ldap_person end |