Use LDAP::Config in all of the adapter methods

parent 212b406f
...@@ -31,7 +31,7 @@ module Gitlab ...@@ -31,7 +31,7 @@ module Gitlab
# #
def groups(cn = "*", size = nil) def groups(cn = "*", size = nil)
options = { options = {
base: config['group_base'], base: config.group_base,
filter: Net::LDAP::Filter.eq("cn", cn) filter: Net::LDAP::Filter.eq("cn", cn)
} }
...@@ -54,13 +54,13 @@ module Gitlab ...@@ -54,13 +54,13 @@ module Gitlab
} }
else else
options = { options = {
base: config['base'], base: config.base,
filter: Net::LDAP::Filter.eq(field, value) filter: Net::LDAP::Filter.eq(field, value)
} }
end end
if config['user_filter'].present? if config.user_filter.present?
user_filter = Net::LDAP::Filter.construct(config['user_filter']) user_filter = Net::LDAP::Filter.construct(config.user_filter)
options[:filter] = if options[:filter] options[:filter] = if options[:filter]
Net::LDAP::Filter.join(options[:filter], user_filter) Net::LDAP::Filter.join(options[:filter], user_filter)
......
...@@ -23,6 +23,14 @@ module Gitlab ...@@ -23,6 +23,14 @@ module Gitlab
end end
end end
def base
options['base']
end
def uid
options['uid']
end
def sync_ssh_keys? def sync_ssh_keys?
sync_ssh_keys.present? sync_ssh_keys.present?
end end
......
...@@ -34,7 +34,7 @@ describe Gitlab::LDAP::Access do ...@@ -34,7 +34,7 @@ describe Gitlab::LDAP::Access do
subject { access.update_permissions } subject { access.update_permissions }
it "syncs ssh keys if enabled by configuration" do it "syncs ssh keys if enabled by configuration" do
access.stub sync_ssh_keys?: true access.stub sync_ssh_keys?: 'sshpublickey'
expect(access).to receive(:update_ssh_keys).once expect(access).to receive(:update_ssh_keys).once
subject subject
......
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