manticore 0.6.1-java → 0.6.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1e6b7d1ea5d4bb60011c89d4b3e7b10abff3b42
-  data.tar.gz: db35b3f276b9f5040cee58407a16858f291435d6
+  metadata.gz: 52e7c6c63c54c59317eb836e5caa6cc1dbb08fc1
+  data.tar.gz: 362d618ee0a1e92762bd5acbb9639c0ea18af0e9
 SHA512:
-  metadata.gz: e8a1d7749fd671e7f44970067dd67899d5485de989c320baa39ab6f05df886e34148a3ccdd05ec7513792138314d4d37421509a5a7fd6b47231c30f2f862acec
-  data.tar.gz: f83f8a304ad9c12d94c3b8fd8b5914fded62083a6b90ed61a67e80aa754683ec69fa122e802377f250cc6eaa40f79a09930bb482d5c337cabce3bc799271945c
+  metadata.gz: ab0c5c529908001ac420bc3c82234ff9016139024211dc2e1e9111dc71e43b37b6ce92c674a5b67c270329de752e3d33fc9e8cb726246a792bdc060e02bb3881
+  data.tar.gz: 1aa799e26509c9e0ce51be46b5cf3f156bd0bfc33f9ecc8a41c136a039f2547ef8e8d0ad479afcfd69a34b6d0fbdb7525e670d65c8c594e51d50a4c53a04a62f

data/.travis.yml

@@ -9,14 +9,15 @@ rvm:
   - jruby-9.0.5.0
 jdk:
   - oraclejdk8
-  - oraclejdk7
   - openjdk7
 before_install:
   - gem install ruby-maven bundler
   - bundle install
 matrix:
   include:
+    - rvm: jruby-9.2.0.0
+      jdk: oraclejdk8
     - rvm: jruby-head
       jdk: oraclejdk8
   allow_failures:
-    - rvm: jruby-head
+    - rvm: jruby-head

data/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## v0.6
 
-### v0.6.1 (pending)
+### 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/README.md

@@ -1,6 +1,6 @@
 # Manticore
 
-[![Build Status](https://travis-ci.org/cheald/manticore.png?branch=master)](https://travis-ci.org/cheald/manticore)
+[![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/Rakefile

@@ -1,27 +1,27 @@
 require "bundler/gem_tasks"
 
-require 'rspec/core/rake_task'
+require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rspec_opts = ['--tty --color --format documentation']
+  spec.pattern = "spec/**/*_spec.rb"
+  spec.rspec_opts = ["--tty --color --format documentation"]
 end
 task :default => [:generate_certs, :spec]
 
 # Download and vendor the jars needed
-require 'jars/installer'
+require "jars/installer"
 task :install_jars do
   Jars::Installer.vendor_jars!
 end
 
 ## Build the Manticore extensions into a jar. You may need to install_jars first
 # Dependency jars for the Manticore ext build
-require 'rake/javaextensiontask'
-jars = ["#{ENV['MY_RUBY_HOME']}/lib/jruby.jar"] + Dir.glob("lib/**/*.jar")
-jars.reject! {|j| j.match("manticore-ext") }
+require "rake/javaextensiontask"
+jars = ["#{ENV["MY_RUBY_HOME"]}/lib/jruby.jar"] + Dir.glob("lib/**/*.jar")
+jars.reject! { |j| j.match("manticore-ext") }
 Rake::JavaExtensionTask.new do |ext|
   ext.name = "manticore-ext"
   ext.lib_dir = "lib/org/manticore"
-  ext.classpath = jars.map {|x| File.expand_path x}.join ':'
+  ext.classpath = jars.map { |x| File.expand_path x }.join ":"
 end
 
 # Generate all the stuff we need for a full test run
@@ -30,10 +30,10 @@ task :generate_certs do
   openssl = `which openssl`.strip
   keytool = `which keytool`.strip
 
-  Dir.glob("#{root}/*").each {|f| File.unlink f }
+  Dir.glob("#{root}/*").each { |f| File.unlink f }
 
-  # Create the CA
   cmds = [
+    # Create the CA
     "#{openssl} genrsa 4096 | #{openssl} pkcs8 -topk8 -nocrypt -out #{root}/root-ca.key",
     "#{openssl} req -sha256 -x509 -newkey rsa:4096 -nodes -key #{root}/root-ca.key -sha256 -days 365 -out #{root}/root-ca.crt -subj \"/C=US/ST=The Internet/L=The Internet/O=Manticore CA/OU=Manticore/CN=localhost\"",
 
@@ -41,15 +41,17 @@ task :generate_certs do
     "#{openssl} genrsa 4096 | #{openssl} pkcs8 -topk8 -nocrypt -out #{root}/client.key",
     "#{openssl} req -sha256 -key #{root}/client.key -newkey rsa:4096 -out #{root}/client.csr -subj \"/C=US/ST=The Internet/L=The Internet/O=Manticore Client/OU=Manticore/CN=localhost\"",
     "#{openssl} x509 -req -in #{root}/client.csr -CA #{root}/root-ca.crt -CAkey #{root}/root-ca.key -CAcreateserial -out #{root}/client.crt -sha256 -days 1",
+    "#{openssl} x509 -req -in #{root}/client.csr -CA #{root}/root-ca.crt -CAkey #{root}/root-ca.key -CAcreateserial -out #{root}/client-expired.crt -sha256 -days -7",
 
     # Create the server cert
     "#{openssl} genrsa 4096 | #{openssl} pkcs8 -topk8 -nocrypt -out #{root}/host.key",
     "#{openssl} req -sha256 -key #{root}/host.key -newkey rsa:4096 -out #{root}/host.csr -subj \"/C=US/ST=The Internet/L=The Internet/O=Manticore Host/OU=Manticore/CN=localhost\"",
     "#{openssl} x509 -req -in #{root}/host.csr -CA #{root}/root-ca.crt -CAkey #{root}/root-ca.key -CAcreateserial -out #{root}/host.crt -sha256 -days 1",
+    "#{openssl} x509 -req -in #{root}/host.csr -CA #{root}/root-ca.crt -CAkey #{root}/root-ca.key -CAcreateserial -out #{root}/host-expired.crt -sha256 -days -7",
 
     "#{keytool} -import -file #{root}/root-ca.crt -alias rootCA -keystore #{root}/truststore.jks -noprompt -storepass test123",
     "#{openssl} pkcs12 -export -clcerts -out #{root}/client.p12 -inkey #{root}/client.key -in #{root}/client.crt -certfile #{root}/root-ca.crt -password pass:test123",
   ]
 
-  cmds.each.with_index {|cmd, index| puts "#{index}. #{cmd}"; system cmd }
-end
+  cmds.each.with_index { |cmd, index| puts "#{index}. #{cmd}"; system cmd }
+end

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

@@ -43,6 +43,10 @@ public class Manticore implements Library {
       if(charset == null) { charset = HTTP.DEFAULT_CONTENT_CHARSET; }
       Encoding encoding;
       try {
+        String mimeType = EntityUtils.getContentMimeType(entity);
+        if (mimeType.startsWith("application/json")) {
+          charset = "UTF-8";
+        }
         encoding = context.getRuntime().getEncodingService().getEncodingFromString(charset);
       } catch(Throwable e) {
         encoding = context.getRuntime().getEncodingService().getEncodingFromString(HTTP.DEFAULT_CONTENT_CHARSET);

data/lib/faraday/adapter/manticore.rb

@@ -1,9 +1,9 @@
-require 'faraday'
+require "faraday"
 
 module Faraday
   class Adapter
     class Manticore < Faraday::Adapter
-      dependency { require 'manticore' }
+      dependency { require "manticore" }
 
       class ParallelManager
         def client=(client)
@@ -30,10 +30,10 @@ module Faraday
           opts = {}
           if ssl = env[:ssl].to_hash
             opts[:ssl] = {}
-            opts[:ssl][:verify]      = :disable if ssl[:verify] == false
-            opts[:ssl][:ca_file]     = ssl[:ca_file]
+            opts[:ssl][:verify] = :disable if ssl[:verify] == false
+            opts[:ssl][:ca_file] = ssl[:ca_file]
             opts[:ssl][:client_cert] = ssl[:client_cert]
-            opts[:ssl][:client_key]  = ssl[:client_key]
+            opts[:ssl][:client_key] = ssl[:client_key]
           end
           conn_opts = @connection_options.dup
           if conn_opts.key?(:ssl)
@@ -50,7 +50,7 @@ module Faraday
         opts = {}
         if env.key? :request_headers
           opts[:headers] = env[:request_headers]
-          opts[:headers].reject! {|k, _| k.downcase == "content-length" }  # Manticore computes Content-Length
+          opts[:headers].reject! { |k, _| k.downcase == "content-length" }  # Manticore computes Content-Length
         end
         body = read_body(env)
         opts[:body] = body if body
@@ -60,9 +60,9 @@ module Faraday
           opts[:connect_timeout] = req[:open_timeout] if req.key?(:open_timeout)
           if prx = req[:proxy]
             opts[:proxy] = {
-              :url      => prx[:uri].to_s,
-              :user     => prx[:user],
-              :password => prx[:password]
+              :url => prx[:uri].to_s,
+              :user => prx[:user],
+              :password => prx[:password],
             }
           end
         end
@@ -106,6 +106,7 @@ module Faraday
         env[:body].respond_to?(:read) ? env[:body].read : env[:body]
       end
     end
+
     register_middleware nil, :manticore => :Manticore
   end
-end
+end

data/lib/manticore.rb

@@ -1,6 +1,6 @@
-require 'java'
-require 'uri'
-require 'cgi'
+require "java"
+require "uri"
+require "cgi"
 
 require_relative "./manticore_jars.rb"
 require_relative "./org/manticore/manticore-ext"
@@ -42,12 +42,12 @@ module Manticore
   class UnknownException < ManticoreException; end
 
   require_relative "./manticore/java_extensions"
-  require_relative './manticore/client/proxies'
-  require_relative './manticore/client'
-  require_relative './manticore/response'
-  require_relative './manticore/stubbed_response'
-  require_relative './manticore/cookie'
-  require_relative './manticore/facade'
+  require_relative "./manticore/client/proxies"
+  require_relative "./manticore/client"
+  require_relative "./manticore/response"
+  require_relative "./manticore/stubbed_response"
+  require_relative "./manticore/cookie"
+  require_relative "./manticore/facade"
 
   include Facade
   include_http_client
@@ -57,4 +57,4 @@ module Manticore
     props.setProperty("org.apache.commons.logging.Log", "org.apache.commons.logging.impl.SimpleLog")
     props.setProperty("org.apache.commons.logging.simplelog.log.org.apache.http", "error")
   end
-end
+end

data/lib/manticore/client.rb

@@ -1,6 +1,6 @@
-require 'thread'
-require 'base64'
-require 'weakref'
+require "thread"
+require "base64"
+require "weakref"
 
 module Manticore
   # @!macro [new] http_method_shared
@@ -13,9 +13,9 @@ module Manticore
   #   @option options [String]   proxy              Proxy host in form: http://proxy.org:1234
   #   @option options [Hash]     proxy              Proxy host in form: {host: 'proxy.org'[, port: 80[, scheme: 'http']]}
   #   @option options [URI]      proxy              Proxy host as a URI object
-  #   @option options [Integer]  connect_timeout    Request-specific connect timeout
-  #   @option options [Integer]  socket_timeout     Request-specific socket timeout
-  #   @option options [Integer]  request_timeout    Request-specific request timeout
+  #   @option options [Float]    connect_timeout    Request-specific connect timeout (in seconds)
+  #   @option options [Float]    socket_timeout     Request-specific socket timeout (in seconds)
+  #   @option options [Float]    request_timeout    Request-specific request timeout (in seconds)
   #   @option options [Integer]  max_redirects      Request-specific maximum redirect limit
   #   @option options [Boolean]  follow_redirects   Specify whether this request should follow redirects
   #   @option options [Hash]     auth               Specify authentication for the request
@@ -79,7 +79,7 @@ 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 "org.apache.http.conn.ssl"
     include_package "java.security.cert"
     include_package "java.security.spec"
     include_package "java.security"
@@ -105,14 +105,14 @@ module Manticore
     include ProxiesInterface
 
     # The default maximum pool size for requests
-    DEFAULT_MAX_POOL_SIZE   = 50
+    DEFAULT_MAX_POOL_SIZE = 50
 
     DEFAULT_REQUEST_TIMEOUT = 60
-    DEFAULT_SOCKET_TIMEOUT  = 10
+    DEFAULT_SOCKET_TIMEOUT = 10
     DEFAULT_CONNECT_TIMEOUT = 10
-    DEFAULT_MAX_REDIRECTS   = 5
+    DEFAULT_MAX_REDIRECTS = 5
     DEFAULT_EXPECT_CONTINUE = false
-    DEFAULT_STALE_CHECK     = false
+    DEFAULT_STALE_CHECK = false
 
     attr_reader :client
 
@@ -177,7 +177,7 @@ module Manticore
       @finalizers = []
       self.class.shutdown_on_finalize self, @finalizers
 
-      builder  = client_builder
+      builder = client_builder
       builder.set_user_agent options.fetch(:user_agent, "Manticore #{VERSION}")
       @options = options
       @use_cookies = options.fetch(:cookies, false)
@@ -195,24 +195,24 @@ module Manticore
 
       @keepalive = options.fetch(:keepalive, true)
       if @keepalive == false
-        builder.set_connection_reuse_strategy {|response, context| false }
+        builder.set_connection_reuse_strategy { |response, context| false }
       else
         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) )
+      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_connection_manager pool(options)
 
       request_config = RequestConfig.custom
-      request_config.set_connection_request_timeout     options.fetch(:request_timeout, DEFAULT_REQUEST_TIMEOUT) * 1000
-      request_config.set_connect_timeout                options.fetch(:connect_timeout, DEFAULT_CONNECT_TIMEOUT) * 1000
-      request_config.set_socket_timeout                 options.fetch(:socket_timeout, DEFAULT_SOCKET_TIMEOUT) * 1000
-      request_config.set_max_redirects                  options.fetch(:max_redirects, DEFAULT_MAX_REDIRECTS)
-      request_config.set_expect_continue_enabled        options.fetch(:expect_continue, DEFAULT_EXPECT_CONTINUE)
+      request_config.set_connection_request_timeout options.fetch(:request_timeout, DEFAULT_REQUEST_TIMEOUT) * 1000
+      request_config.set_connect_timeout options.fetch(:connect_timeout, DEFAULT_CONNECT_TIMEOUT) * 1000
+      request_config.set_socket_timeout options.fetch(:socket_timeout, DEFAULT_SOCKET_TIMEOUT) * 1000
+      request_config.set_max_redirects options.fetch(:max_redirects, DEFAULT_MAX_REDIRECTS)
+      request_config.set_expect_continue_enabled options.fetch(:expect_continue, DEFAULT_EXPECT_CONTINUE)
       request_config.set_stale_connection_check_enabled options.fetch(:stale_check, DEFAULT_STALE_CHECK)
       request_config.set_circular_redirects_allowed false
 
@@ -233,7 +233,7 @@ module Manticore
         max: stats.get_max,
         leased: stats.get_leased,
         pending: stats.get_pending,
-        available: stats.get_available
+        available: stats.get_available,
       }
     end
 
@@ -333,7 +333,7 @@ module Manticore
     # @return [Array] An array of the responses from the requests executed.
     def execute!
       method = executor.java_method(:submit, [java.util.concurrent.Callable.java_class])
-      result = @async_requests.map {|r| method.call r }
+      result = @async_requests.map { |r| method.call r }
       @async_requests.clear
       result.map do |future|
         begin
@@ -357,8 +357,8 @@ module Manticore
 
     def self.shutdown_on_finalize(client, objs)
       ObjectSpace.define_finalizer client, -> {
-        objs.each {|obj, args| obj.send(*args) rescue nil }
-      }
+                                     objs.each { |obj, args| obj.send(*args) rescue nil }
+                                   }
     end
 
     protected
@@ -383,12 +383,12 @@ module Manticore
     end
 
     def pool_builder(options)
-      http_sf  = PlainConnectionSocketFactory.new
+      http_sf = PlainConnectionSocketFactory.new
 
       if options[:ignore_ssl_validation]
-        $stderr.puts 'The options[:ignore_ssl_validation] setting is deprecated in favor of options[:ssl][:verify]'
+        $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])
+        options[:ssl] = {:verify => !options.delete(:ignore_ssl_validation)}.merge(options[:ssl])
       end
 
       https_sf = ssl_socket_factory_from_options options.fetch(:ssl, {})
@@ -416,10 +416,10 @@ module Manticore
 
     def request(klass, url, options, &block)
       req, context = request_from_options(klass, url, options)
-      async        = options.delete(:async)
-      background   = options.delete(:async_background)
+      async = options.delete(:async)
+      background = options.delete(:async_background)
       create_executor_if_needed if (background || async)
-      response     = response_object_for(req, context, &block)
+      response = response_object_for(req, context, &block)
 
       if async
         @async_requests << response
@@ -439,7 +439,7 @@ module Manticore
 
       match_key = @stubs.keys.find { |k| request_uri.match(k) }
       if match_key
-        StubbedResponse.new(self, request, context, &block).stub( @stubs[match_key] )
+        StubbedResponse.new(self, request, context, &block).stub(@stubs[match_key])
       else
         Response.new(self, request, context, &block)
       end
@@ -456,7 +456,7 @@ module Manticore
     def request_from_options(klass, url, options)
       req = klass.new uri_from_url_and_options(url, options).to_s
 
-      if ( options[:params] || options[:body] || options[:entity]) && req.kind_of?(HttpEntityEnclosingRequestBase)
+      if (options[:params] || options[:body] || options[:entity]) && req.kind_of?(HttpEntityEnclosingRequestBase)
         if options[:params]
           pairs = struct_to_name_value_pairs(options[:params])
           encoding = minimum_encoding_for options[:params].to_s
@@ -479,10 +479,10 @@ module Manticore
         if req_options[:proxy]
           config.set_proxy get_proxy_host(req_options[:proxy])
         end
-        config.set_max_redirects req_options[:max_redirects]                       if req_options[:max_redirects]
-        config.set_redirects_enabled !!req_options[:follow_redirects]              if req_options.fetch(:follow_redirects, nil) != nil
-        config.set_connect_timeout req_options[:connect_timeout] * 1000            if req_options[:connect_timeout]
-        config.set_socket_timeout req_options[:socket_timeout] * 1000              if req_options[:socket_timeout]
+        config.set_max_redirects req_options[:max_redirects] if req_options[:max_redirects]
+        config.set_redirects_enabled !!req_options[:follow_redirects] if req_options.fetch(:follow_redirects, nil) != nil
+        config.set_connect_timeout req_options[:connect_timeout] * 1000 if req_options[:connect_timeout]
+        config.set_socket_timeout req_options[:socket_timeout] * 1000 if req_options[:socket_timeout]
         config.set_connection_request_timeout req_options[:request_timeout] * 1000 if req_options[:request_timeout]
         req.set_config config.build
       end
@@ -502,7 +502,7 @@ module Manticore
 
       context = HttpClientContext.new
       proxy_user = req_options[:proxy].is_a?(Hash) && (req_options[:proxy][:user] || req_options[:proxy][:username])
-      auth_from_options(req, req_options, context) if req_options.key?(:auth) || proxy_user
+      auth_from_options(req, req_options, context)
 
       if @use_cookies == :per_request
         store = BasicCookieStore.new
@@ -537,16 +537,15 @@ module Manticore
 
     def auth_from_options(req, options, context)
       proxy = options.fetch(:proxy, {})
-      
+
       proxy_user, proxy_pass = if proxy.is_a?(String)
-        proxy_uri = URI.parse(proxy)
-        [proxy_uri.user, proxy_uri.password]
-      else
-        [(proxy[:user] || proxy[:username]), 
-         (proxy[:pass] || proxy[:password])]
-      end
-      
-      
+                                 proxy_uri = URI.parse(proxy)
+                                 [proxy_uri.user, proxy_uri.password]
+                               else
+                                 [(proxy[:user] || proxy[:username]),
+                                  (proxy[:pass] || proxy[:password])]
+                               end
+
       if options[:auth] || proxy_user
         provider = BasicCredentialsProvider.new
         if options[:auth]
@@ -577,9 +576,9 @@ module Manticore
       when nil
         []
       when Hash
-        value.flat_map {|key, val| struct_to_name_value_pairs val, namespace ? "#{namespace}[#{key}]" : key }
+        value.flat_map { |key, val| struct_to_name_value_pairs val, namespace ? "#{namespace}[#{key}]" : key }
       when Array
-        value.flat_map {|val| struct_to_name_value_pairs val, namespace }
+        value.flat_map { |val| struct_to_name_value_pairs val, namespace }
       else
         BasicNameValuePair.new(namespace, value.to_s)
       end
@@ -588,6 +587,7 @@ module Manticore
     # Apache HTTP assumes ISO_8859_1 for StringEntities; we'll try to be nice and pass that when possible
     # so that it doesn't have to any multibyte work.
     ISO_8859_1 = "ISO-8859-1".freeze
+
     def minimum_encoding_for(string)
       if string.ascii_only?
         ISO_8859_1
@@ -639,6 +639,7 @@ module Manticore
     end
 
     KEY_EXTRACTION_REGEXP = /(?:^-----BEGIN(.* )PRIVATE KEY-----\n)(.*?)(?:-----END\1PRIVATE KEY.*$)/m
+
     def setup_key_store(ssl_options, context)
       key_store = get_store(:keystore, ssl_options) if ssl_options.key?(:keystore)
       keystore_password = (ssl_options[:keystore_password] || "").to_java.toCharArray
@@ -685,7 +686,7 @@ module Manticore
     end
 
     def blank_keystore
-      KeyStore.get_instance(KeyStore.get_default_type).tap {|k| k.load(nil, nil) }
+      KeyStore.get_instance(KeyStore.get_default_type).tap { |k| k.load(nil, nil) }
     end
 
     def guess_store_type(filename)
@@ -698,7 +699,7 @@ module Manticore
 
     def treat_params_as_query(options)
       if options.key?(:params) && !options.key?(:query)
-        options.dup.tap {|o| o[:query] = o.delete(:params) }
+        options.dup.tap { |o| o[:query] = o.delete(:params) }
       else
         options
       end