manticore 0.7.0-java → 0.7.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 508b2d2c3ce9fc25ca2ac915954807783cc8266aac23936a6896d103121a2f0c
-  data.tar.gz: a8ac97bd7fb22df23ac164d5f06f3a35c926d9eac57ae7bfb8e84c0c8d9e7907
+  metadata.gz: 67e67c0611ad51fbaf279f456ef5a9e463038f1017c0eb8c7665032a05534b59
+  data.tar.gz: 0ecf2a3014befbbc5b26d95c3ee36809ccc8605e450631e4ec0f1c143225bbc5
 SHA512:
-  metadata.gz: 56a60c747c187ddd1255e5da7cbc2ad78570c2ebf5390841298f45366133b48c857df8ac7b7b8bdbbb5194546e3b3112a8c08b5109c66a1299f6fe787ae890fc
-  data.tar.gz: 78e29e767486b820f1d1a280ae4db04b1ad33eccb7da7538bae9e48116305b44d069dc13ee322484146f9cce28b6edf71e868d73be8e075957404c50a99416eb
+  metadata.gz: 19f7db686cff19817b8310f7838f9115d343ab7516e7cbab066c0f0f7d223c7a0a42c40f9e361426c07345088dbdb818cabab59fb2a481d35050f939e27afafd
+  data.tar.gz: ebc35118980baac6eff3e1f795f5ad3aa0af01c7ac29cd6a9502f9300fb1da88d8b97ecfc7c1198d5902a35ab2501179df775791e3306e27004e85d690145bc2

data/.travis.yml

@@ -1,20 +1,22 @@
-dist: xenial
+dist: trusty # due Oracle JDK
 language: ruby
 cache:
   - bundler
   - directories:
     - $HOME/.m2
 rvm:
-  - jruby-9.1.17.0 # Ruby 2.3
-  - jruby-9.2.13.0 # Ruby 2.5
+  - jruby-9.2.16.0 # Ruby 2.5
 jdk:
-  - openjdk9
+  - oraclejdk8
+  - openjdk8
   - openjdk11
 before_install:
   - gem install bundler -v 1.17.3
 matrix:
   include:
     - rvm: jruby-head
-      jdk: openjdk10
+      jdk: openjdk11
+    - rvm: jruby-9.1.17.0 # Ruby 2.3
+      jdk: openjdk8
   allow_failures:
     - rvm: jruby-head

data/CHANGELOG.md

@@ -1,10 +1,18 @@
-## v0.6
+## v0.7
+
+### v0.7.1
+
+* Don't override certificates with same Subject (#93)
+* Set Java cause for ManticoreException types (#96)
+* Fix SSL handshake hang indefinitely (#98)
 
 ### v0.7.0
 
 * Drop support for JRuby 1.7. It probably still works, but we don't test against it anymore
 * Fix a thread safety issue with regards to adding requests to the parallel execution queue while the client is already processing a queue (#80)
 
+## v0.6
+
 ### v0.6.4
 
 * client_cert and client_key now take the literal keys as strings, OpenSSL::X509::Certificate/OpenSSL::PKey::Pkey instances, or key file paths. (#77)

data/README.md

@@ -90,7 +90,11 @@ For detailed documentation, see the [full Manticore::Client documentation](http:
 Rather than using the Facade, you can create your own standalone Client instances. When you create a `Client`, you will pass various parameters that it will use to set up the pool.
 
 ```ruby
-client = Manticore::Client.new(request_timeout: 5, connect_timeout: 5, socket_timeout: 5, pool_max: 10, pool_max_per_route: 2)
+client = Manticore::Client.new(request_timeout: 5,
+                               connect_timeout: 5,
+                               socket_timeout: 5,
+                               pool_max: 10,
+                               pool_max_per_route: 2)
 ```
 
 Then, you can make requests from the client. Pooling and route maximum constraints are automatically managed:
@@ -122,11 +126,20 @@ per-route concurrency limits, and other neat things. In general, you should crea
 To set this up, you might create 2 pools, each configured for the task:
 
 ```ruby
-general_http_client    = Manticore::Client.new connect_timeout: 10, socket_timeout: 10, request_timeout: 10, follow_redirects: true, max_per_route: 2
+general_http_client    = Manticore::Client.new(connect_timeout: 10,
+                                               socket_timeout: 10,
+                                               request_timeout: 10,
+                                               follow_redirects: true,
+                                               max_per_route: 2)
 # With an OpenSSL CA store
-proxied_backend_client = Manticore::Client.new proxy: "https://backend.internal:4242", ssl: {ca_file: "my_certs.pem"}
+proxied_backend_client = Manticore::Client.new(proxy: "https://backend.internal:4242",
+                                               ssl: { ca_file: "my_certs.pem" })
 # Or with a .jks truststore
-# proxied_backend_client = Manticore::Client.new proxy: "https://backend.internal:4242", ssl: {truststore: "./truststore.jks", truststore_password: "s3cr3t"}
+proxied_backend_client = Manticore::Client.new(proxy: "https://backend.internal:4242",
+                                               ssl: {
+                                                 truststore: "./truststore.jks",
+                                                 truststore_password: "s3cr3t"
+                                               })
 ```
 
 This would create 2 separate request pools; the first would be configured with generous timeouts and redirect following, and would use the system

data/lib/manticore.rb

@@ -5,7 +5,11 @@ require "cgi"
 require_relative "./manticore_jars.rb"
 require_relative "./org/manticore/manticore-ext"
 
-org.manticore.Manticore.new.load(JRuby.runtime, false)
+if defined? JRuby::Util.load_ext
+  JRuby::Util.load_ext 'org.manticore.Manticore'
+else
+  org.manticore.Manticore.new.load(JRuby.runtime, false)
+end
 
 require_relative "./manticore/version"
 
@@ -13,7 +17,27 @@ require_relative "./manticore/version"
 # with the beauty of Ruby.
 module Manticore
   # General base class for all Manticore exceptions
-  class ManticoreException < StandardError; end
+  class ManticoreException < StandardError
+    def initialize(arg = nil)
+      case arg
+      when nil
+        @_cause = nil
+        super()
+      when java.lang.Throwable
+        @_cause = arg
+        super(arg.message)
+      else
+        @_cause = nil
+        super(arg)
+      end
+    end
+
+    # @return cause which is likely to be a Java exception
+    # @overload Exception#cause
+    def cause
+      @_cause || super
+    end
+  end
 
   # Exception thrown if you attempt to read from a closed Response stream
   class StreamClosedException < ManticoreException; end

data/lib/manticore/client.rb

@@ -69,10 +69,8 @@ module Manticore
     include_package "org.apache.http.client.config"
     include_package "org.apache.http.config"
     include_package "org.apache.http.conn.socket"
-    include_package "org.apache.http.impl"
     include_package "org.apache.http.impl.client"
     include_package "org.apache.http.impl.conn"
-    include_package "org.apache.http.impl.auth"
     include_package "org.apache.http.entity"
     include_package "org.apache.http.message"
     include_package "org.apache.http.params"
@@ -80,16 +78,20 @@ module Manticore
     include_package "org.apache.http.auth"
     include_package "java.util.concurrent"
     include_package "org.apache.http.client.protocol"
-    include_package "org.apache.http.conn.ssl"
     include_package "java.security.cert"
     include_package "java.security.spec"
     include_package "java.security"
-    include_package "org.apache.http.client.utils"
     java_import "org.apache.http.HttpHost"
     java_import "javax.net.ssl.SSLContext"
     java_import "org.manticore.HttpGetWithEntity"
     java_import "org.manticore.HttpDeleteWithEntity"
     java_import "org.apache.http.auth.UsernamePasswordCredentials"
+    java_import "org.apache.http.conn.ssl.SSLConnectionSocketFactory"
+    java_import "org.apache.http.conn.ssl.SSLContextBuilder"
+    java_import "org.apache.http.conn.ssl.TrustSelfSignedStrategy"
+    java_import "org.apache.http.client.utils.URIBuilder"
+    java_import "org.apache.http.impl.DefaultConnectionReuseStrategy"
+    java_import "org.apache.http.impl.auth.BasicScheme"
 
     # This is a class rather than a proc because the proc holds a closure around
     # the instance of the Client that creates it.
@@ -201,11 +203,7 @@ module Manticore
         builder.set_connection_reuse_strategy DefaultConnectionReuseStrategy.new
       end
 
-      socket_config_builder = SocketConfig.custom
-      socket_config_builder.set_so_timeout(options.fetch(:socket_timeout, DEFAULT_SOCKET_TIMEOUT) * 1000)
-      socket_config_builder.set_tcp_no_delay(options.fetch(:tcp_no_delay, true))
-      builder.set_default_socket_config socket_config_builder.build
-
+      builder.set_default_socket_config socket_config_from_options(options)
       builder.set_connection_manager pool(options)
 
       request_config = RequestConfig.custom
@@ -407,10 +405,19 @@ module Manticore
           cm.set_validate_after_inactivity options.fetch(:check_connection_timeout, 2_000)
           cm.set_default_max_per_route options.fetch(:pool_max_per_route, @max_pool_size)
           cm.set_max_total @max_pool_size
+          cm.set_default_socket_config socket_config_from_options(options)
+
           finalize cm, :shutdown
         end
       end
     end
+    
+    def socket_config_from_options(options)
+      socket_config_builder = SocketConfig.custom
+      socket_config_builder.set_so_timeout(options.fetch(:socket_timeout, DEFAULT_SOCKET_TIMEOUT) * 1000)
+      socket_config_builder.set_tcp_no_delay(options.fetch(:tcp_no_delay, true))
+      socket_config_builder.build
+    end
 
     def create_executor_if_needed
       return @executor if @executor
@@ -510,7 +517,7 @@ module Manticore
 
       if @use_cookies == :per_request
         store = BasicCookieStore.new
-        context.setAttribute(ClientContext.COOKIE_STORE, store)
+        context.setAttribute(ClientContext::COOKIE_STORE, store)
       end
 
       return req, context
@@ -618,7 +625,7 @@ module Manticore
         raise "Invalid value for :verify. Valid values are (:all, :browser, :default)"
       end
 
-      context = SSLContexts.custom
+      context = SSLContextBuilder.new
       setup_trust_store ssl_options, context, trust_strategy
       setup_key_store ssl_options, context
 
@@ -633,8 +640,8 @@ module Manticore
         trust_store ||= blank_keystore
         open(ssl_options[:ca_file]) do |fp|
           cert_collection = CertificateFactory.get_instance("X509").generate_certificates(fp.to_inputstream).to_a
-          cert_collection.each do |cert|
-            trust_store.set_certificate_entry(cert.getSubjectX500Principal.name, cert)
+          cert_collection.each_with_index do |cert, i|
+            trust_store.set_certificate_entry("#{i}#" + cert.getSubjectX500Principal.name, cert)
           end
         end
       end

data/lib/manticore/response.rb

@@ -11,14 +11,13 @@ module Manticore
   # @!attribute [r] callback_result
   #   @return Value returned from any given on_success/response block
   class Response
-    include_package "org.apache.http.client"
-    include_package "org.apache.http.util"
-    include_package "org.apache.http.protocol"
+
+    java_import "org.apache.http.client.ResponseHandler"
     java_import "org.apache.http.client.protocol.HttpClientContext"
-    java_import "java.util.concurrent.Callable"
+    java_import "org.apache.http.protocol.ExecutionContext"
 
-    include ResponseHandler
-    include Callable
+    include org.apache.http.client.ResponseHandler
+    include java.util.concurrent.Callable
 
     attr_accessor :background
     attr_reader :context, :request, :callback_result, :called, :future
@@ -54,15 +53,16 @@ module Manticore
         ex = Manticore::ConnectTimeout
       rescue Java::JavaNet::SocketException => e
         ex = Manticore::SocketException
-      rescue Java::OrgApacheHttpClient::ClientProtocolException, Java::JavaxNetSsl::SSLHandshakeException, Java::OrgApacheHttpConn::HttpHostConnectException,
-             Java::OrgApacheHttp::NoHttpResponseException, Java::OrgApacheHttp::ConnectionClosedException => e
+      rescue Java::OrgApacheHttpClient::ClientProtocolException, Java::JavaxNetSsl::SSLHandshakeException,
+             Java::OrgApacheHttpConn::HttpHostConnectException, Java::OrgApacheHttp::NoHttpResponseException,
+             Java::OrgApacheHttp::ConnectionClosedException => e
         ex = Manticore::ClientProtocolException
       rescue Java::JavaNet::UnknownHostException => e
         ex = Manticore::ResolutionFailure
       rescue Java::JavaLang::IllegalArgumentException => e
         ex = Manticore::InvalidArgumentException
       rescue Java::JavaLang::IllegalStateException => e
-        if e.message.match(/Connection pool shut down/)
+        if (e.message || '').index('Connection pool shut down')
           ex = Manticore::ClientStoppedException
         else
           @exception = e
@@ -75,7 +75,7 @@ module Manticore
 
       # TODO: If calling async, execute_complete may fail and then silently swallow exceptions. How do we fix that?
       if ex || @exception
-        @exception ||= ex.new(e.cause || e.message)
+        @exception ||= ex.new(e)
         @handlers[:failure].call @exception
         execute_complete
         nil
@@ -90,8 +90,8 @@ module Manticore
     # @return [String]
     def final_url
       call_once
-      last_request = context.get_attribute ExecutionContext.HTTP_REQUEST
-      last_host = context.get_attribute ExecutionContext.HTTP_TARGET_HOST
+      last_request = context.get_attribute ExecutionContext::HTTP_REQUEST
+      last_host = context.get_attribute ExecutionContext::HTTP_TARGET_HOST
       host = last_host.to_uri
       url = last_request.get_uri
       URI.join(host, url.to_s)

data/lib/manticore/version.rb

@@ -1,3 +1,3 @@
 module Manticore
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/manticore.gemspec

@@ -19,6 +19,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 2.3' # JRuby >= 9.1
+
   private_key = File.expand_path("~/.gemcert/gem-private_key.pem")
   if File.exists? private_key
     spec.signing_key = private_key

data/spec/manticore/client_spec.rb

@@ -130,7 +130,13 @@ describe Manticore::Client do
         let(:client) { Manticore::Client.new :ssl => {:verify => :strict} }
 
         it "breaks on SSL validation errors" do
-          expect { client.get("https://localhost:55444/").call }.to raise_exception(Manticore::ClientProtocolException)
+          begin
+            client.get("https://localhost:55445/").body
+          rescue Manticore::ClientProtocolException => e
+            expect( e.cause ).to be_a javax.net.ssl.SSLHandshakeException
+          else
+            fail "exception not raised"
+          end
         end
       end
 
@@ -830,7 +836,13 @@ describe Manticore::Client do
     let(:client) { Manticore::Client.new request_timeout: 1, connect_timeout: 1, socket_timeout: 1 }
 
     it "times out" do
-      expect { client.get(local_server "/?sleep=2").body }.to raise_exception(Manticore::SocketTimeout)
+      begin
+        client.get(local_server "/?sleep=2").body
+      rescue Manticore::SocketTimeout => e
+        expect( e.cause ).to be_a java.net.SocketTimeoutException
+      else
+        fail "exception not raised"
+      end
     end
 
     it "times out when custom request options are passed" do

data/spec/manticore/response_spec.rb

@@ -6,7 +6,7 @@ describe Manticore::Response do
 
   its(:headers) { is_expected.to be_a Hash }
   its(:body) { is_expected.to be_a String }
-  its(:length) { is_expected.to be_a Fixnum }
+  its(:length) { is_expected.to be_a Integer }
 
   it "provides response header lookup via #[]" do
     expect(subject["Content-Type"]).to eq "application/json"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manticore
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: java
 authors:
 - Chris Heald
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-29 00:00:00.000000000 Z
+date: 2021-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +124,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="