gitlab_omniauth-ldap 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db6838fb57912673dc6d4f8fd4089ae1b9831f9c
-  data.tar.gz: 3ee20be54a32a77fb7e89e73332f2f58c50ed426
+  metadata.gz: 490e5818be98881b26e804e7d75021b1a22aaca2
+  data.tar.gz: 185305045176824f1f43de77cf762fc0094a3db9
 SHA512:
-  metadata.gz: 02136014d91a8bdc9f989c9010e7a076852281d708123bfd97300aa5b55ef82f2f169f4b10154978f63cca3dd4dd48ddd4a5c9afc8ea6c272d47eb06d26cf00b
-  data.tar.gz: 6ec729393916b48600105bdbf041b50cc45172a537b760cd33be0e4150a03cfc1f0bb263b6577bb6d0661967f4b3f2def6262faaa96f56c982a1320d6361d83b
+  metadata.gz: e74ed52e82763ff87707d60339b24107737dc03c62e25fca0897e18b25bf4cfa3a0af8eb27e7899ebb9141c90918eac200eb699394ff0165fef059a68d63760d
+  data.tar.gz: 20aff7c1a787d21313981cdc6849245306d17778602f368f8f11a0c5a3c69c08f16aaa4b57982d9d1e101512f3fc8890255f1d3b8cf1c19a40204eeb9f9bd378

data/lib/omniauth-ldap/adaptor.rb

@@ -69,6 +69,7 @@ module OmniAuth
           hosts: @hosts,
           host: @host,
           port: @port,
+          encryption: encryption_options
         }
         @bind_method = @try_sasl ? :sasl : (@allow_anonymous||!@bind_dn||!@password ? :anonymous : :simple)
 
@@ -80,7 +81,6 @@ module OmniAuth
                   }
         config[:auth] = @auth
         @connection = Net::LDAP.new(config)
-        @connection.encryption(encryption_options)
       end
 
       #:base => "dc=yourcompany, dc=com",
@@ -109,6 +109,7 @@ module OmniAuth
 
       def encryption_options
         translated_method = translate_method
+        return nil unless translated_method
 
         {
           method: translated_method,

data/lib/omniauth-ldap/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module LDAP
-    VERSION = "2.0.1"
+    VERSION = "2.0.2"
   end
 end

data/spec/omniauth-ldap/adaptor_spec.rb

@@ -38,7 +38,7 @@ describe OmniAuth::LDAP::Adaptor do
       adaptor.connection.port.should == 389
       adaptor.connection.base.should == 'dc=intridea, dc=com'
       adaptor.connection.instance_variable_get('@auth').should == {:method => :simple, :username => 'bind_dn', :password => 'password'}
-      adaptor.connection.instance_variable_get('@encryption').should == {:method => nil, :tls_options => {}}
+      adaptor.connection.instance_variable_get('@encryption').should == nil
     end
 
     it 'should setup ldap connection with sasl-md5' do
@@ -93,14 +93,9 @@ describe OmniAuth::LDAP::Adaptor do
     end
 
     context 'when encryption is plain' do
-      it 'should set the encryption method to nil' do
+      it 'should set encryption to nil' do
         adaptor = OmniAuth::LDAP::Adaptor.new({host: "192.168.1.145", encryption: 'plain', base: 'dc=intridea, dc=com', port: 389, uid: 'sAMAccountName'})
-        adaptor.connection.instance_variable_get('@encryption').should include method: nil
-      end
-
-      it 'should set the encryption tls_options to empty' do
-        adaptor = OmniAuth::LDAP::Adaptor.new({host: "192.168.1.145", encryption: 'plain', base: 'dc=intridea, dc=com', port: 389, uid: 'sAMAccountName'})
-        adaptor.connection.instance_variable_get('@encryption').should include tls_options: {}
+        adaptor.connection.instance_variable_get('@encryption').should eq(nil)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_omniauth-ldap
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Ping Yu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-09 00:00:00.000000000 Z
+date: 2017-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth