httpclient 2.7.0 → 2.7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95c951cb65bd356f98db7a576bbedfd059e2cbd1
-  data.tar.gz: c507088b33276d2fb7a905efef7bfa0999d5de5c
+  metadata.gz: e7236cf89169c32802c8800f4f679904f1f24e95
+  data.tar.gz: 8096cd3b370e83a391239e6daa2657c3efa79e45
 SHA512:
-  metadata.gz: a44aee123f0c187b7441fa1585bc473ef4bd4cdfd6407230c13903513e07416621ddfa4935875e9849efeefbda366c121444a55ded21ca961ed26c5621d236d6
-  data.tar.gz: ef09f5103bbbf1aa257dbb3fc76abd7b7cd226986052ef70f778a18267fef38deff783f055a8ea29047efc3109cbdd0e8b12a3690c356e96473f3d30096e5121
+  metadata.gz: 60008ef0e10fa99bf0255cc7d78228af00eb25b457963d4108f942871925a41b0d71d90e697d66e2373b38d913349a198cd4cb818e8104536aa1670c7213d83e
+  data.tar.gz: 859e12aadea51b63e5892ea0b162472a36bc75b683ec4b2fde065fda8f29a45e2d17aa1f7283773cd76e17f0f4b8f2a0a4ecf7c4d99900ae96a14bbd15dbaac9

data/lib/httpclient/jruby_ssl_socket.rb

@@ -442,9 +442,10 @@ unless defined?(SSLSocket)
       new(socket, session.dest, session.ssl_config, session.debug_dev)
     end
 
+    DEFAULT_SSL_PROTOCOL = 'TLS'
     def initialize(socket, dest, config, debug_dev = nil)
       if config.ssl_version == :auto
-        ssl_version = 'TLSv1'
+        ssl_version = DEFAULT_SSL_PROTOCOL
       else
         ssl_version = config.to_s.gsub(/_/, '.')
       end
@@ -485,13 +486,17 @@ unless defined?(SSLSocket)
       factory = ctx.getSocketFactory
       begin
         ssl_socket = factory.createSocket(socket, dest.host, dest.port, true)
-        ssl_socket.setEnabledProtocols([ssl_version].to_java(java.lang.String))
+        ssl_socket.setEnabledProtocols([ssl_version].to_java(java.lang.String)) if ssl_version != DEFAULT_SSL_PROTOCOL
         if config.ciphers != SSLConfig::CIPHERS_DEFAULT
           ssl_socket.setEnabledCipherSuites(config.ciphers.to_java(java.lang.String))
         end
         ssl_socket.startHandshake
-        @peer_cert = JavaCertificate.new(ssl_socket.getSession.getPeerCertificates.first)
-        @ciphersuite = ssl_socket.getSession.getCipherSuite
+        ssl_session = ssl_socket.getSession
+        @peer_cert = JavaCertificate.new(ssl_session.getPeerCertificates.first)
+        if $DEBUG
+          warn("Protocol version: #{ssl_session.getProtocol}")
+          warn("Cipher: #{ssl_socket.getSession.getCipherSuite}")
+        end
         post_connection_check(dest.host, @peer_cert)
       rescue java.security.GeneralSecurityException => e
         raise OpenSSL::SSL::SSLError.new(e.getMessage)
@@ -508,10 +513,6 @@ unless defined?(SSLSocket)
       @peer_cert
     end
 
-    def ciphersuite
-      @ciphersuite
-    end
-
   private
 
     def post_connection_check(hostname, wrap_cert)

data/lib/httpclient/ssl_config.rb

@@ -26,6 +26,12 @@ class HTTPClient
   # like Web browsers.  'httpclient/cacert.pem' is downloaded from curl web
   # site by the author and included in released package.
   #
+  # On JRuby, HTTPClient uses Java runtime's trusted CA certificates, not
+  # cacert.pem by default. You can load cacert.pem by calling
+  # SSLConfig#load_trust_ca manually like:
+  #
+  #   HTTPClient.new { self.ssl_config.load_trust_ca }.get("https://...")
+  #
   # You may want to change trust anchor by yourself.  Call clear_cert_store
   # then add_trust_ca for that purpose.
   class SSLConfig
@@ -437,9 +443,10 @@ class HTTPClient
     def load_cacerts(cert_store)
       ver = OpenSSL::OPENSSL_VERSION
       if (ver.start_with?('OpenSSL 1.0.1') && ver >= 'OpenSSL 1.0.1p') ||
-          (ver.start_with?('OpenSSL ') && ver >= 'OpenSSL 1.0.2d')
+          (ver.start_with?('OpenSSL ') && ver >= 'OpenSSL 1.0.2d') || defined?(JRuby)
         filename = 'cacert.pem'
       else
+        warn("RSA 1024 bit CA certificates are loaded due to old openssl compatibility")
         filename = 'cacert1024.pem'
       end
       file = File.join(File.dirname(__FILE__), filename)

data/lib/httpclient/ssl_socket.rb

@@ -49,7 +49,6 @@ class HTTPClient
           warn("Protocol version: #{@ssl_socket.ssl_version}")
         end
         warn("Cipher: #{@ssl_socket.cipher.inspect}")
-        warn("State: #{@ssl_socket.state}")
       end
       post_connection_check(hostname)
     end

data/lib/httpclient/version.rb

@@ -1,3 +1,3 @@
 class HTTPClient
-  VERSION = '2.7.0'
+  VERSION = '2.7.0.1'
 end

data/test/test_ssl.rb

@@ -236,6 +236,18 @@ end
     end
   end
 
+  def test_use_higher_TLS
+    omit('TODO: it does not pass with Java 7 or old openssl ')
+    teardown_server
+    setup_server_with_ssl_version(:TLSv1_2)
+    assert_nothing_raised do
+      @client.ssl_config.verify_mode = nil
+      @client.get("https://localhost:#{serverport}/hello")
+      # TODO: should check JRubySSLSocket.ssl_socket.getSession.getProtocol
+      # but it's not thread safe. How can I return protocol version to the caller?
+    end
+  end
+
 private
 
   def cert(filename)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httpclient
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.0.1
 platform: ruby
 authors:
 - Hiroshi Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2015-11-07 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: nahi@ruby-lang.org