gitlab_omniauth-ldap 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 107e59861e46c73e0ef7ecce99aae216a71f9dd1
-  data.tar.gz: 0eee9f8076ecad7e956ddd666e5b921b0fcd55e8
+  metadata.gz: 6d0257f9f6fc7f3368403940bba04ecc860b8c52
+  data.tar.gz: 706ce31f13aa10bc0e5e982ae2ad52d611ec1dbd
 SHA512:
-  metadata.gz: 91734fda37560214286bfce376042ad99a972f285de2e6c61d189ddab9a81c0ae3d8eab2ff209c41b1eb378e680f1570942e5cb08b1e729f245b65223618ee59
-  data.tar.gz: efe11e7dc19bf70bc74f2ac3e71cf345bf0ac20c8ef36fabceaa01c1066228d48acf5b5226ff9f951249080e0d0d5b31f79ee1c3788f2bf4cd0782e18726dec9
+  metadata.gz: 22c81461f04cd89702366adabeeff539195a887f046ebd1d0235f9bbbed2d0c8ace4a74e151924a37d330de3806727475e2d27790a328eb824e623e1e0e9295d
+  data.tar.gz: 29bcd91f9be90911956f7891f81f33fcc591c0258861e2a99f2b99312b8ae6473cec4dfcef4dd535081254530e8e50b0968aa385b127ba530459ec97ba2ae6c7

data/CHANGELOG

@@ -1,3 +1,6 @@
+## 2.1.1
+  - Add a String check to `tls_options` sanitization to allow other objects
+
 ## 2.1.0
   - Expose `:tls_options` SSL configuration option. Deprecate :ca_file, :ssl_version
 

data/lib/omniauth-ldap/adaptor.rb

@@ -213,8 +213,14 @@ module OmniAuth
       end
 
       # Removes keys that have blank values
+      #
+      # This gem may not always be in the context of Rails so we
+      # do this rather than `.blank?`.
       def sanitize_hash_values(hash)
-        hash.delete_if { |_, value| value.nil? || value !~ /\S/ }
+        hash.delete_if do |_, value|
+          value.nil? ||
+          (value.is_a?(String) && value !~ /\S/)
+        end
       end
 
       def symbolize_hash_keys(hash)

data/lib/omniauth-ldap/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module LDAP
-    VERSION = "2.1.0"
+    VERSION = "2.1.1"
   end
 end

data/spec/omniauth-ldap/adaptor_spec.rb

@@ -128,8 +128,11 @@ describe OmniAuth::LDAP::Adaptor do
 
       context 'when tls_options are specified' do
         it 'should pass the values along with defaults' do
-          adaptor = OmniAuth::LDAP::Adaptor.new({host: "192.168.1.145", encryption: 'ssl', base: 'dc=intridea, dc=com', port: 636, uid: 'sAMAccountName', bind_dn: 'bind_dn', password: 'password', tls_options: { ca_file: '/etc/ca.pem', ssl_version: 'TLSv1_2' }})
-          adaptor.connection.instance_variable_get('@encryption').should include tls_options: OpenSSL::SSL::SSLContext::DEFAULT_PARAMS.merge(ca_file: '/etc/ca.pem', ssl_version: 'TLSv1_2')
+          cert = OpenSSL::X509::Certificate.new
+          key  = OpenSSL::PKey::RSA.new
+
+          adaptor = OmniAuth::LDAP::Adaptor.new({host: "192.168.1.145", encryption: 'ssl', base: 'dc=intridea, dc=com', port: 636, uid: 'sAMAccountName', bind_dn: 'bind_dn', password: 'password', tls_options: { ca_file: '/etc/ca.pem', ssl_version: 'TLSv1_2', cert: cert, key: key }})
+          adaptor.connection.instance_variable_get('@encryption').should include tls_options: OpenSSL::SSL::SSLContext::DEFAULT_PARAMS.merge(ca_file: '/etc/ca.pem', ssl_version: 'TLSv1_2', cert: cert, key: key)
         end
 
         it 'does not pass nil or blank values' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_omniauth-ldap
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Ping Yu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-18 00:00:00.000000000 Z
+date: 2019-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.14.3
 signing_key: 
 specification_version: 4
 summary: A LDAP strategy for OmniAuth.