httpclient 2.8.2.1 → 2.8.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b5686de1cd51430fc814921d00eef9589abb460
-  data.tar.gz: f4882d0555214f10727a0f0f43e76952167a5bc0
+  metadata.gz: 021f9c066d91d9a0bd923a76e8129bd11cefcda1
+  data.tar.gz: 937c6478b2fad5ad419cf2a840475490f094edbf
 SHA512:
-  metadata.gz: 47c2d49d8395a7c2c3d5994f3d91315d787a6b18d7b6cb7b7f0b85144c41930092d7518a3be7df990db2918e6dc661d0422a7d0c699f413c58bd62dd9b8c3119
-  data.tar.gz: e37781d77163754c473a2b0e73990c079788b3117ce11fed68d7761060f765bb51ddeca0c3acea4d45ddc9cf9ba5c37c5c443e589d3ccfefb36359c07a4c57b2
+  metadata.gz: 9fcc4b920feb54cbe8a1b0e6108f155cb219fbf7416fb0063168c65db9ec3c2210003c37f24399395ca81ea6627a410596d280174631fc7c53b7b1fc1563964b
+  data.tar.gz: f8d5ecf16b6aea4f12c1d7ed9e8cefb5ef797610996a73b1923d9142cc85d6580f599e539c77fa1aca194a1d6f2622f547a6a3ee6145a0c7f0fb047c6d9b42f9

data/lib/httpclient/ssl_config.rb

@@ -39,27 +39,25 @@ class HTTPClient
     if SSLEnabled
       include OpenSSL
 
-      if RUBY_ENGINE == 'jruby'
-        module ::OpenSSL
-          module X509
-            class Store
-              attr_reader :_httpclient_cert_store_items
-
-              # TODO: use prepend instead when we drop JRuby + 1.9.x support
-              wrapped = {}
-
-              wrapped[:initialize] = instance_method(:initialize)
-              define_method(:initialize) do |*args|
-                wrapped[:initialize].bind(self).call(*args)
-                @_httpclient_cert_store_items = [ENV['SSL_CERT_FILE'] || :default]
-              end
+      module ::OpenSSL
+        module X509
+          class Store
+            attr_reader :_httpclient_cert_store_items
+
+            # TODO: use prepend instead when we drop JRuby + 1.9.x support
+            wrapped = {}
+
+            wrapped[:initialize] = instance_method(:initialize)
+            define_method(:initialize) do |*args|
+              wrapped[:initialize].bind(self).call(*args)
+              @_httpclient_cert_store_items = [ENV['SSL_CERT_FILE'] || :default]
+            end
 
-              [:add_cert, :add_file, :add_path].each do |m|
-                wrapped[m] = instance_method(m)
-                define_method(m) do |cert|
-                  wrapped[m].bind(self).call(cert)
-                  @_httpclient_cert_store_items << cert
-                end
+            [:add_cert, :add_file, :add_path].each do |m|
+              wrapped[m] = instance_method(m)
+              define_method(m) do |cert|
+                wrapped[m].bind(self).call(cert)
+                @_httpclient_cert_store_items << cert
               end
             end
           end
@@ -118,7 +116,7 @@ class HTTPClient
     attr_reader :client_ca # :nodoc:
 
     # These array keeps original files/dirs that was added to @cert_store
-    def cert_store_items; @cert_store._httpclient_cert_store_items || []; end
+    def cert_store_items; @cert_store._httpclient_cert_store_items; end
     attr_reader :cert_store_crl_items
 
     # Creates a SSLConfig.

data/lib/httpclient/version.rb

@@ -1,3 +1,3 @@
 class HTTPClient
-  VERSION = '2.8.2.1'
+  VERSION = '2.8.2.2'
 end

data/test/test_ssl.rb

@@ -175,6 +175,13 @@ end
     #
     cfg.cert_store.add_cert(cert('subca.cert'))
     assert_equal("hello", @client.get_content(@url))
+    cfg.clear_cert_store
+    begin
+      @client.get(@url)
+      assert(false)
+    rescue OpenSSL::SSL::SSLError => ssle
+      assert_match(/(certificate verify failed|unable to find valid certification path to requested target)/, ssle.message)
+    end
   end
 
 if defined?(HTTPClient::JRubySSLSocket)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpclient
 version: !ruby/object:Gem::Version
-  version: 2.8.2.1
+  version: 2.8.2.2
 platform: ruby
 authors:
 - Hiroshi Nakamura