summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab
diff options
context:
space:
mode:
authorMichael Kozono <mkozono@gmail.com>2017-06-09 10:30:38 -0700
committerMichael Kozono <mkozono@gmail.com>2017-07-26 02:43:36 -0700
commit2d7d1fa69db2b5e0056d5ab8884684886229f852 (patch)
tree0cb7cb14dc30701f34325b27671684b897a9582c /spec/lib/gitlab
parentc8dd77de81f42c593dcbf0b373afd0ab33f18071 (diff)
downloadgitlab-ce-2d7d1fa69db2b5e0056d5ab8884684886229f852.tar.gz
Pass configured `ssl_version` to `omniauth-ldap`
Diffstat (limited to 'spec/lib/gitlab')
-rw-r--r--spec/lib/gitlab/ldap/config_spec.rb31
1 files changed, 31 insertions, 0 deletions
diff --git a/spec/lib/gitlab/ldap/config_spec.rb b/spec/lib/gitlab/ldap/config_spec.rb
index 107084519f9..7679c9ea913 100644
--- a/spec/lib/gitlab/ldap/config_spec.rb
+++ b/spec/lib/gitlab/ldap/config_spec.rb
@@ -301,6 +301,37 @@ describe Gitlab::LDAP::Config, lib: true do
end
end
+ context 'when ssl_version is present' do
+ it 'passes it through' do
+ stub_ldap_config(
+ options: {
+ 'host' => 'ldap.example.com',
+ 'port' => 686,
+ 'encryption' => 'simple_tls',
+ 'verify_certificates' => true,
+ 'ssl_version' => 'TLSv1_2'
+ }
+ )
+
+ expect(config.omniauth_options).to include({ ssl_version: 'TLSv1_2' })
+ end
+ end
+
+ context 'when ssl_version is blank' do
+ it 'does not include the ssl_version option' do
+ stub_ldap_config(
+ options: {
+ 'host' => 'ldap.example.com',
+ 'port' => 686,
+ 'encryption' => 'simple_tls',
+ 'verify_certificates' => true,
+ 'ssl_version' => ' '
+ }
+ )
+
+ expect(config.omniauth_options).not_to have_key(:ssl_version)
+ end
+ end
end
describe '#has_auth?' do