Commit 823f89ed authored by Jacob Vosmaer's avatar Jacob Vosmaer

Pass LDAP adapter to finders in update_permissions

parent 826404a8
...@@ -31,13 +31,13 @@ module Gitlab ...@@ -31,13 +31,13 @@ module Gitlab
return true unless Gitlab.config.ldap['group_base'].present? return true unless Gitlab.config.ldap['group_base'].present?
# Get LDAP user entry # Get LDAP user entry
ldap_user = Gitlab::LDAP::Person.find_by_dn(user.extern_uid) ldap_user = Gitlab::LDAP::Person.find_by_dn(user.extern_uid, adapter)
# Get all GitLab groups with activated LDAP # Get all GitLab groups with activated LDAP
groups = ::Group.where('ldap_cn IS NOT NULL') groups = ::Group.where('ldap_cn IS NOT NULL')
# Get LDAP groups based on cn from GitLab groups # Get LDAP groups based on cn from GitLab groups
ldap_groups = groups.pluck(:ldap_cn).map { |cn| Gitlab::LDAP::Group.find_by_cn(cn) } ldap_groups = groups.pluck(:ldap_cn).map { |cn| Gitlab::LDAP::Group.find_by_cn(cn, adapter) }
ldap_groups = ldap_groups.compact.uniq ldap_groups = ldap_groups.compact.uniq
# Iterate over ldap groups and check user membership # Iterate over ldap groups and check user membership
......
...@@ -7,8 +7,9 @@ ...@@ -7,8 +7,9 @@
module Gitlab module Gitlab
module LDAP module LDAP
class Group class Group
def self.find_by_cn(cn) def self.find_by_cn(cn, adapter=nil)
Gitlab::LDAP::Adapter.new.group(cn) adapter ||= Gitlab::LDAP::Adapter.new
adapter.group(cn)
end end
def initialize(entry) def initialize(entry)
......
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