manticore 0.6.3-java → 0.6.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b96d1eb1f7f1e5b6885a5f08e24ba394ac9fac0
-  data.tar.gz: 1ff15070f745905119d536ae7df328ce845990a6
+  metadata.gz: 00b846373d0dce20d74cb4e2434868f908006e63
+  data.tar.gz: e136b3550efea6343291f9264d45ff1b6fa24448
 SHA512:
-  metadata.gz: 1f08d3632cbe683ce2456e4cde41d05545bdf5926992067f06f25af1477d9a31bac90d797a88a4f4d4a7a56477afd9f725981958ac3082e501c18199da4875b3
-  data.tar.gz: d2231b58a53b86bd77af5c2f27f79d9a4ece0d72cffbace8c1a830fefcd33a84f5c710f93d1e55e76637ab48d5966c79f466ee40c911418a59e4ce440576a8c7
+  metadata.gz: 6a02ebe1e15e565212f135d760cb83eaaaecbd73f8664c9470ef14feb00a163d76a8383918f3b51a28018853c8e88c0bb1f5af7eae28f9f5e0f7840806b70d79
+  data.tar.gz: 74f89a4d46806461ae86b2554ac418ebd3673e8b4c55a4add68da84d88cb54418ada667d1f4673f549782b693982e4f2a4ec84fb41f8248fd9fab1a2a150e817

data/.gitlab-ci.yml

@@ -0,0 +1,42 @@
+.default: &default
+  variables:
+    TERM: xterm-256color
+    JRUBY_OPTS: --debug
+  cache:
+    paths:
+      - bundler --path vendor/bundle
+      - $HOME/.m2
+  before_script:
+    - apt update && apt install -y git
+    - gem install ruby-maven bundler
+    - bundle install --path vendor/bundle
+  script:
+    - bundle exec rake
+
+test jruby-9.2:
+  <<: *default
+  image: jruby:9.2
+  artifacts:
+    expire_in: 3 days
+    paths:
+      - coverage
+
+test jruby-9.1:
+  <<: *default
+  image: jruby:9.1
+
+test jruby-1.7:
+  <<: *default
+  image: jruby:1.7
+
+pages:
+  stage: deploy
+  only:
+    - master
+  artifacts:
+    expire_in: 3 days
+    paths:
+      - public
+  script:
+    - mkdir -p public
+    - mv coverage/ public/coverage/

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 ## v0.6
 
+### v0.6.5
+
+(unreleased)
+
+### 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)
+* Reduced unnecessary string copying (!78 - thanks @kares)
+
+### v0.6.2-v0.6.3
+
+* Fixed the use of authentication information in proxy URLs (#71)
+* Changed the default encoding to UTF-8 when a response MIME is application/json (#70)
+
 ### v0.6.1
 
 * Manticore will accept a URI object (which it calls #to_s on) as an alternate to a String for the URL in client#get(url)

data/Gemfile

@@ -11,4 +11,5 @@ group :development, :test do
   gem "rack", "~> 1.5"
   gem "rake-compiler"
   gem "gserver"
-end
+  gem "simplecov"
+end

data/README.md

@@ -1,5 +1,7 @@
 # Manticore
 
+**Note**: While I'll continue to maintain the library here, I've moved the canonical copy to Gitlab at https://gitlab.com/cheald/manticore - it is preferred that you submit issues and PRs there.
+
 [![Build Status](https://travis-ci.org/cheald/manticore.svg?branch=master)](https://travis-ci.org/cheald/manticore)
 
 Manticore is a fast, robust HTTP client built on the Apache HTTPClient libraries. It is only compatible with JRuby.

data/ext/manticore/org/manticore/Manticore.java

@@ -66,7 +66,7 @@ public class Manticore implements Library {
 
     private IRubyObject readWholeEntity(ThreadContext context, HttpEntity entity, Encoding encoding) throws IOException {
       ByteList bl = new ByteList(EntityUtils.toByteArray(entity), false);
-      return RubyString.newStringShared(context.getRuntime(), bl, encoding);
+      return RubyString.newString(context.getRuntime(), bl, encoding);
     }
 
     private IRubyObject streamEntity(ThreadContext context, HttpEntity entity, Encoding encoding, Block block) throws IOException {
@@ -86,7 +86,7 @@ public class Manticore implements Library {
         byte[] tmp = new byte[4096];
         int l;
         while((l = instream.read(tmp)) != -1) {
-          block.call( context, RubyString.newString(context.getRuntime(), new ByteList(tmp, 0, l, true), encoding) );
+          block.call( context, RubyString.newStringShared(context.getRuntime(), new ByteList(tmp, 0, l, false), encoding) );
         }
       } finally {
         instream.close();
@@ -94,4 +94,4 @@ public class Manticore implements Library {
       return context.nil;
     }
   }
-}
+}

data/lib/manticore/client.rb

@@ -1,6 +1,7 @@
 require "thread"
 require "base64"
 require "weakref"
+require "openssl_pkcs8_pure"
 
 module Manticore
   # @!macro [new] http_method_shared
@@ -169,8 +170,8 @@ module Manticore
     # @option options [String]          ssl[:keystore_password]   (nil)        Password used for decrypting the client auth key store
     # @option options [String]          ssl[:keystore_type]       (nil)        Format of the key store, ie "JKS" or "PKCS12". If left nil, the type will be inferred from the keystore filename.
     # @option options [String]          ssl[:ca_file]             (nil)        OpenSSL-style path to an X.509 certificate to use to validate SSL certificates
-    # @option options [String]          ssl[:client_cert]         (nil)        OpenSSL-style path to an X.509 certificate to use for client authentication
-    # @option options [String]          ssl[:client_key]          (nil)        OpenSSL-style path to an RSA key to use for client authentication
+    # @option options [String|OpenSSL::X509::Certificate]   ssl[:client_cert]         (nil)        A string containing a base64-encoded X.509 certificate, OR a path to an OpenSSL-style X.509 certificate, OR an instance of OpenSSL::X509::Certificate
+    # @option options [String|OpenSSL::PKey::Pkey]          ssl[:client_key]          (nil)        A string containing a base64-encoded RSA key to use for client authentication, OR a path to an OpenSSL-style RSA key, OR an instance of OpenSSL::PKey::PKey
     # @option options [boolean]         ssl[:track_state]         (false)      Turn on or off connection state tracking. This helps prevent SSL information from leaking across threads, but means that connections
     #                                                                             can't be shared across those threads. This should generally be left off unless you know what you're doing.
     def initialize(options = {})
@@ -385,11 +386,13 @@ module Manticore
     def pool_builder(options)
       http_sf = PlainConnectionSocketFactory.new
 
+      # :nocov:
       if options[:ignore_ssl_validation]
         $stderr.puts "The options[:ignore_ssl_validation] setting is deprecated in favor of options[:ssl][:verify]"
         options[:ssl] ||= {}
         options[:ssl] = {:verify => !options.delete(:ignore_ssl_validation)}.merge(options[:ssl])
       end
+      # :nocov:
 
       https_sf = ssl_socket_factory_from_options options.fetch(:ssl, {})
       registry = RegistryBuilder.create.register("http", http_sf).register("https", https_sf).build
@@ -645,39 +648,44 @@ module Manticore
       keystore_password = (ssl_options[:keystore_password] || "").to_java.toCharArray
 
       # Support OpenSSL-style bare X.509 certs with an RSA key
-      # This is really dumb - we have to b64-decode the key ourselves, and we can only support PKCS8
       if ssl_options[:client_cert] && ssl_options[:client_key]
         key_store ||= blank_keystore
         certs, key = nil, nil
-        open(ssl_options[:client_cert]) do |fp|
-          certs = CertificateFactory.get_instance("X509").generate_certificates(fp.to_inputstream).to_array([].to_java(Certificate))
-        end
+
+        cert_str = if ssl_options[:client_cert].is_a?(OpenSSL::X509::Certificate)
+                     ssl_options[:client_cert].to_s
+                   elsif ssl_options[:client_cert].is_a?(String) && File.exists?(ssl_options[:client_cert])
+                     File.read(ssl_options[:client_cert])
+                   else
+                     ssl_options[:client_cert].to_s
+                   end
+
+        cert_stream = java.io.ByteArrayInputStream.new(cert_str.strip.to_java_bytes)
+        certs = CertificateFactory.get_instance("X509").generate_certificates(cert_stream).to_array([].to_java(Certificate))
+
+        key_str = if ssl_options[:client_key].is_a?(OpenSSL::PKey::PKey)
+                    ssl_options[:client_key].to_pem_pkcs8
+                  elsif ssl_options[:client_key].is_a?(String) && File.exists?(ssl_options[:client_key])
+                    File.read(ssl_options[:client_key])
+                  else
+                    ssl_options[:client_key].to_s
+                  end
 
         # Add each of the keys in the given keyfile into the keystore.
-        open(ssl_options[:client_key]) do |fp|
-          key_parts = fp.read.scan(KEY_EXTRACTION_REGEXP)
-          key_parts.each do |type, b64key|
-            body = Base64.decode64 b64key
-            spec = PKCS8EncodedKeySpec.new(body.to_java_bytes)
-            type = type.strip
-            type = "RSA" if type == ""
-            key = KeyFactory.getInstance(type).generatePrivate(spec)
-            key_store.set_key_entry("key-#{Digest::SHA1.hexdigest(body)}", key, keystore_password, certs)
-          end
+        key_parts = key_str.scan(KEY_EXTRACTION_REGEXP)
+        key_parts.each do |type, b64key|
+          body = Base64.decode64 b64key
+          spec = PKCS8EncodedKeySpec.new(body.strip.to_java_bytes)
+          type = type.strip
+          type = "RSA" if type == ""
+          key = KeyFactory.getInstance(type).generatePrivate(spec)
+          key_store.set_key_entry("key-#{Digest::SHA1.hexdigest(body)}", key, keystore_password, certs)
         end
       end
 
       context.load_key_material(key_store, keystore_password) if key_store
     end
 
-    def get_trust_store(options)
-      get_store :truststore, options
-    end
-
-    def get_key_store(options)
-      get_store :keystore, options
-    end
-
     def get_store(prefix, options)
       KeyStore.get_instance(options[:"#{prefix}_type"] || guess_store_type(options[prefix])).tap do |store|
         instream = open(options[prefix], "rb").to_inputstream

data/lib/manticore/version.rb

@@ -1,3 +1,3 @@
 module Manticore
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/manticore.gemspec

@@ -25,6 +25,8 @@ Gem::Specification.new do |spec|
     spec.cert_chain  = ['gem-public_cert.pem']
   end
 
+  spec.add_dependency "openssl_pkcs8_pure"
+
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "jar-dependencies"

data/spec/manticore/client_spec.rb

@@ -166,7 +166,7 @@ describe Manticore::Client do
         end
       end
 
-      context "when client_cert and client_key are given" do
+      context "when client_cert and client_key are given as file paths" do
         let(:client) {
           Manticore::Client.new(
             :ssl => {
@@ -183,6 +183,40 @@ describe Manticore::Client do
         end
       end
 
+      context "when client_cert and client_key are given as OpenSSL::X509::Certificate" do
+        let(:client) {
+          Manticore::Client.new(
+            :ssl => {
+              verify: :strict,
+              ca_file: File.expand_path("../../ssl/root-ca.crt", __FILE__),
+              client_cert: OpenSSL::X509::Certificate.new(File.read(File.expand_path("../../ssl/client.crt", __FILE__))),
+              client_key: OpenSSL::PKey::RSA.new(File.read(File.expand_path("../../ssl/client.key", __FILE__))),
+            },
+          )
+        }
+
+        it "successfully auths requests" do
+          expect(client.get("https://localhost:55445/").body).to match("hello")
+        end
+      end
+
+      context "when client_cert and client_key are given as strings" do
+        let(:client) {
+          Manticore::Client.new(
+            :ssl => {
+              verify: :strict,
+              ca_file: File.expand_path("../../ssl/root-ca.crt", __FILE__),
+              client_cert: File.read(File.expand_path("../../ssl/client.crt", __FILE__)),
+              client_key: File.read(File.expand_path("../../ssl/client.key", __FILE__)),
+            },
+          )
+        }
+
+        it "successfully auths requests" do
+          expect(client.get("https://localhost:55445/").body).to match("hello")
+        end
+      end
+
       context "when off" do
         let(:client) { Manticore::Client.new :ssl => {:verify => :disable} }
 
@@ -730,11 +764,16 @@ describe Manticore::Client do
             ].join("\n"))
             client.close
           rescue IOError => e
+            break
           end
         end
       end
     end
 
+    after do
+      @server.kill
+    end
+
     let(:client) { Manticore::Client.new keepalive: true, pool_max: 1 }
 
     it "retries 3 times by default" do

data/spec/spec_helper.rb

@@ -1,6 +1,12 @@
 # encoding: utf-8
 require "rubygems"
 require "bundler/setup"
+require "simplecov"
+
+SimpleCov.start do
+  add_filter "spec/"
+end
+
 require "manticore"
 require "zlib"
 require "json"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: manticore
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: java
 authors:
 - Chris Heald
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-28 00:00:00.000000000 Z
+date: 2018-06-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: openssl_pkcs8_pure
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -60,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".travis.yml"
 - APACHE-LICENSE-2.0.txt
 - CHANGELOG.md
@@ -122,7 +137,7 @@ requirements:
 - jar commons-codec:commons-codec,          '~> 1.9'
 - jar org.apache.httpcomponents:httpcore,   '~> 4.4.4'
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.6.14.1
 signing_key:
 specification_version: 4
 summary: Manticore is an HTTP client built on the Apache HttpCore components