kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Use encryption instead of method

Browse source 
The method key is deprecated in the `gitlab_omniauth-ldap` gem.
This commit is contained in:
Michael Kozono 2017-06-08 15:46:06 -07:00
parent 6dbff9663d
commit 94b4c9f34f
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/gitlab/ldap/config.rb
View file

@ -50,7 +50,7 @@ module Gitlab
def omniauth_options
opts = base_options.merge(
base: base,
method: options['method'],
encryption: options['encryption'],
filter: omniauth_user_filter,
name_proc: name_proc
)
@ -158,7 +158,7 @@ module Gitlab
end
def encryption
case options['method'].to_s
case options['encryption'].to_s
when 'ssl'
:simple_tls
when 'tls'

28
spec/lib/gitlab/ldap/config_spec.rb
View file

@ -23,9 +23,9 @@ describe Gitlab::LDAP::Config, lib: true do
it 'constructs basic options' do
stub_ldap_config(
options: {
'host' => 'ldap.example.com',
'port' => 386,
'method' => 'plain'
'host' => 'ldap.example.com',
'port' => 386,
'encryption' => 'plain'
}
)
@ -39,11 +39,11 @@ describe Gitlab::LDAP::Config, lib: true do
it 'includes authentication options when auth is configured' do
stub_ldap_config(
options: {
'host' => 'ldap.example.com',
'port' => 686,
'method' => 'ssl',
'bind_dn' => 'uid=admin,dc=example,dc=com',
'password' => 'super_secret'
'host' => 'ldap.example.com',
'port' => 686,
'encryption' => 'ssl',
'bind_dn' => 'uid=admin,dc=example,dc=com',
'password' => 'super_secret'
}
)
@ -64,11 +64,11 @@ describe Gitlab::LDAP::Config, lib: true do
it 'constructs basic options' do
stub_ldap_config(
options: {
'host' => 'ldap.example.com',
'port' => 386,
'base' => 'ou=users,dc=example,dc=com',
'method' => 'plain',
'uid' => 'uid'
'host' => 'ldap.example.com',
'port' => 386,
'base' => 'ou=users,dc=example,dc=com',
'encryption' => 'plain',
'uid' => 'uid'
}
)
@ -76,7 +76,7 @@ describe Gitlab::LDAP::Config, lib: true do
host: 'ldap.example.com',
port: 386,
base: 'ou=users,dc=example,dc=com',
method: 'plain',
encryption: 'plain',
filter: '(uid=%{username})'
)
expect(config.omniauth_options.keys).not_to include(:bind_dn, :password)