Commit 94b4c9f3 authored by Michael Kozono's avatar Michael Kozono

Use encryption instead of method

The method key is deprecated in the `gitlab_omniauth-ldap` gem.
parent 6dbff966
...@@ -50,7 +50,7 @@ module Gitlab ...@@ -50,7 +50,7 @@ module Gitlab
def omniauth_options def omniauth_options
opts = base_options.merge( opts = base_options.merge(
base: base, base: base,
method: options['method'], encryption: options['encryption'],
filter: omniauth_user_filter, filter: omniauth_user_filter,
name_proc: name_proc name_proc: name_proc
) )
...@@ -158,7 +158,7 @@ module Gitlab ...@@ -158,7 +158,7 @@ module Gitlab
end end
def encryption def encryption
case options['method'].to_s case options['encryption'].to_s
when 'ssl' when 'ssl'
:simple_tls :simple_tls
when 'tls' when 'tls'
......
...@@ -25,7 +25,7 @@ describe Gitlab::LDAP::Config, lib: true do ...@@ -25,7 +25,7 @@ describe Gitlab::LDAP::Config, lib: true do
options: { options: {
'host' => 'ldap.example.com', 'host' => 'ldap.example.com',
'port' => 386, 'port' => 386,
'method' => 'plain' 'encryption' => 'plain'
} }
) )
...@@ -41,7 +41,7 @@ describe Gitlab::LDAP::Config, lib: true do ...@@ -41,7 +41,7 @@ describe Gitlab::LDAP::Config, lib: true do
options: { options: {
'host' => 'ldap.example.com', 'host' => 'ldap.example.com',
'port' => 686, 'port' => 686,
'method' => 'ssl', 'encryption' => 'ssl',
'bind_dn' => 'uid=admin,dc=example,dc=com', 'bind_dn' => 'uid=admin,dc=example,dc=com',
'password' => 'super_secret' 'password' => 'super_secret'
} }
...@@ -67,7 +67,7 @@ describe Gitlab::LDAP::Config, lib: true do ...@@ -67,7 +67,7 @@ describe Gitlab::LDAP::Config, lib: true do
'host' => 'ldap.example.com', 'host' => 'ldap.example.com',
'port' => 386, 'port' => 386,
'base' => 'ou=users,dc=example,dc=com', 'base' => 'ou=users,dc=example,dc=com',
'method' => 'plain', 'encryption' => 'plain',
'uid' => 'uid' 'uid' => 'uid'
} }
) )
...@@ -76,7 +76,7 @@ describe Gitlab::LDAP::Config, lib: true do ...@@ -76,7 +76,7 @@ describe Gitlab::LDAP::Config, lib: true do
host: 'ldap.example.com', host: 'ldap.example.com',
port: 386, port: 386,
base: 'ou=users,dc=example,dc=com', base: 'ou=users,dc=example,dc=com',
method: 'plain', encryption: 'plain',
filter: '(uid=%{username})' filter: '(uid=%{username})'
) )
expect(config.omniauth_options.keys).not_to include(:bind_dn, :password) expect(config.omniauth_options.keys).not_to include(:bind_dn, :password)
......
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