diff --git a/Gemfile.lock b/Gemfile.lock index 20c5fab..c16b0ea 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - entitlements-app (0.2.0) + entitlements-app (0.2.1) concurrent-ruby (= 1.1.9) faraday (~> 2.0) net-ldap (~> 0.17) @@ -27,10 +27,10 @@ GEM reline (>= 0.3.1) diff-lcs (1.5.0) docile (1.4.0) - faraday (2.5.2) + faraday (2.7.4) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.0) + faraday-net_http (3.0.2) hashdiff (1.0.1) i18n (1.12.0) concurrent-ruby (~> 1.0) diff --git a/VERSION b/VERSION index 0ea3a94..0c62199 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.2.0 +0.2.1 diff --git a/lib/entitlements/service/ldap.rb b/lib/entitlements/service/ldap.rb index 759daff..1e209f9 100644 --- a/lib/entitlements/service/ldap.rb +++ b/lib/entitlements/service/ldap.rb @@ -239,8 +239,6 @@ def ldap verify_mode: @disable_ssl_verification ? OpenSSL::SSL::VERIFY_NONE : OpenSSL::SSL::VERIFY_PEER } } - else - ldap_options[:encryption] = { method: nil } end if @ca_file && ldap_options[:encryption].key?(:tls_options) diff --git a/spec/unit/entitlements/service/ldap_spec.rb b/spec/unit/entitlements/service/ldap_spec.rb index 20cbab0..bcb9cb2 100644 --- a/spec/unit/entitlements/service/ldap_spec.rb +++ b/spec/unit/entitlements/service/ldap_spec.rb @@ -64,7 +64,6 @@ .with( host: "ldap.example.net", port: 389, - encryption: { method: nil }, auth: { method: :simple, username: "uid=some-user,ou=system-accounts,dc=example,dc=net", diff --git a/vendor/cache/faraday-2.5.2.gem b/vendor/cache/faraday-2.5.2.gem deleted file mode 100644 index a66f174..0000000 Binary files a/vendor/cache/faraday-2.5.2.gem and /dev/null differ diff --git a/vendor/cache/faraday-2.7.4.gem b/vendor/cache/faraday-2.7.4.gem new file mode 100644 index 0000000..7b04dd8 Binary files /dev/null and b/vendor/cache/faraday-2.7.4.gem differ diff --git a/vendor/cache/faraday-net_http-3.0.0.gem b/vendor/cache/faraday-net_http-3.0.0.gem deleted file mode 100644 index a990f3a..0000000 Binary files a/vendor/cache/faraday-net_http-3.0.0.gem and /dev/null differ diff --git a/vendor/cache/faraday-net_http-3.0.2.gem b/vendor/cache/faraday-net_http-3.0.2.gem new file mode 100644 index 0000000..f6b5175 Binary files /dev/null and b/vendor/cache/faraday-net_http-3.0.2.gem differ