manticore 0.3.2-java → 0.3.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb2cec897fad8daff54f1823bb5a01f33da18d2e
-  data.tar.gz: 4ee22665fa497aceaa9b5df01c79264ef47a8667
+  metadata.gz: 6d1a619a796954b17b56a23381741f57e603d174
+  data.tar.gz: bf682e7d96bcb816abf0dacdaa6bb0e6760777d6
 SHA512:
-  metadata.gz: 2be50f1dff4384bd95f61d6d5328aa4690461436c9d57dadae905fba897602b1c470d41763edca4955ea1d45f96f48ef80a52eccab4b3679e26bda1317cd78d6
-  data.tar.gz: 174cae4b6fef3465b339bbd4e831eed8aeb40284459102fe68fa32b3412b04460b3cbc8c649267339e50830263d0a894760fe14c55ee6c778c9370e021a6db45
+  metadata.gz: 2fb94165a8770dddf5dc1c4c7972433ea12934402a83284fa3890fbf058924dc67205c6d3bed3844cd7a2437c2c2825c90a6bb339935249c9531c272bf7e79f2
+  data.tar.gz: 300152b1d96c32d4edbb7df6dcff295c780ebc2d568dbc7562e863cf8da6840fd6ab33e8080a01f0711fb3798d9955b75e25fa8159da846b51edf5cf05233c7b

checksums.yaml.gz.sig

@@ -1 +1,2 @@
-��.ѝ*�_�$٤����vQH�Id9�
,t�U.l��e�S� Q���(���f5`��m��;E	�{�=�3
+I��HO�q���$G��z��^K���v�*N����HX?��e�9�0�+[;݃���Q��f��D�����c���h�]7;�M�D���3�
+[`J��"��m�����g�
�8\��d]�B�Y'�˝:�bk��*��D��h(���v2����[��F�~��I�B�s!A�?�� ��ťf�֝�{�\��>!�1C2m4S�լ�~�{���\�T��\'q�SS��$O��8�痸�p)��xo

data/.travis.yml

@@ -1,3 +1,7 @@
 language: ruby
 rvm:
   - jruby
+jdk:
+  - oraclejdk8
+  - oraclejdk7
+  - openjdk7

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## v0.3
-### v0.3.3 (pending)
+### v0.3.4 (pending)
+### v0.3.3
+
+* Update to HttpCommons 4.3.6
+* Added Response#message (thanks @zanker)
+* Fix issues with HTTP error messages that didn't contain a useful message
+* Fixed an issue that would prevent the :protocols and :cipher_suites options from working
+
 ### v0.3.2
 * :ignore_ssl_validation is now deprecated. It has been replaced with :ssl, which takes a hash of options. These include:
 

data/Gemfile

@@ -4,7 +4,8 @@ source 'https://rubygems.org'
 gemspec
 
 gem "net-http-server", "~> 0.2"
-gem "rspec", "~> 2.14"
+gem "rspec", "~> 2.0"
+gem "rspec-its"
 gem "httpclient", "~> 2.3"
 gem "rack", "~> 1.5"
 gem "rake-compiler"

data/lib/manticore/client.rb

@@ -523,7 +523,7 @@ module Manticore
         context.load_key_material(key_store, ssl_options.fetch(:keystore_password, nil).to_java.toCharArray)
       end
 
-      SSLConnectionSocketFactory.new context.build, ssl_options[:protocols], ssl_options[:cipher_suites], verifier
+      SSLConnectionSocketFactory.new context.build, ssl_options[:protocols].to_java(:string), ssl_options[:cipher_suites].to_java(:string), verifier
     end
 
     def get_trust_store(options)

data/lib/manticore/response.rb

@@ -48,14 +48,14 @@ module Manticore
         execute_complete
         return self
       rescue Java::JavaNet::SocketTimeoutException, Java::OrgApacheHttpConn::ConnectTimeoutException => e
-        ex = Manticore::Timeout.new(e.get_cause)
+        ex = Manticore::Timeout.new(e.cause || e.message)
       rescue Java::JavaNet::SocketException => e
-        ex = Manticore::SocketException.new(e.get_cause)
+        ex = Manticore::SocketException.new(e.cause || e.message)
       rescue Java::OrgApacheHttpClient::ClientProtocolException, Java::JavaxNetSsl::SSLHandshakeException, Java::OrgApacheHttpConn::HttpHostConnectException,
              Java::OrgApacheHttp::NoHttpResponseException, Java::OrgApacheHttp::ConnectionClosedException => e
-        ex = Manticore::ClientProtocolException.new(e.get_cause)
+        ex = Manticore::ClientProtocolException.new(e.cause || e.message)
       rescue Java::JavaNet::UnknownHostException => e
-        ex = Manticore::ResolutionFailure.new(e.get_cause)
+        ex = Manticore::ResolutionFailure.new(e.cause || e.message)
       end
       @exception = ex
       @handlers[:failure].call ex
@@ -128,6 +128,14 @@ module Manticore
       @code
     end
 
+    # Return the response text for a request as a string (Not Found, Ok, Bad Request, etc). Will call the request if it has not been called yet.
+    #
+    # @return [String] The response code text
+    def message
+      call_once
+      @message
+    end
+
     # Returns the length of the response body. Returns -1 if content-length is not present in the response.
     #
     # @return [Integer]
@@ -206,6 +214,7 @@ module Manticore
     def handleResponse(response)
       @response        = response
       @code            = response.get_status_line.get_status_code
+      @message         = response.get_status_line.get_reason_phrase
       @headers         = Hash[* response.get_all_headers.flat_map {|h| [h.get_name.downcase, h.get_value]} ]
       @callback_result = @handlers[:success].call(self)
       nil
@@ -220,4 +229,4 @@ module Manticore
       @handlers[:complete].each &:call
     end
   end
-end
+end

data/lib/manticore/version.rb

@@ -1,3 +1,3 @@
 module Manticore
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/lib/manticore.rb

@@ -3,7 +3,7 @@ require 'uri'
 require 'cgi'
 require 'cgi/cookie'
 
-jars = ["httpcore-4.3.1", "httpclient-4.3.2-patched", "commons-logging-1.1.3", "commons-codec-1.6.jar", "httpmime-4.3.2.jar"]
+jars = ["httpcore-4.3.3", "httpclient-4.3.6", "commons-logging-1.1.3", "commons-codec-1.6.jar", "httpmime-4.3.6.jar"]
 jars.each do |jar|
   begin
     require_relative "./jar/#{jar}"

data/spec/manticore/client_spec.rb

@@ -44,7 +44,7 @@ describe Manticore::Client do
 
   describe "ignore_ssl_validation (deprecated option)" do
     context "when on" do
-      let(:client) { Manticore::Client.new ignore_ssl_validation: true }
+      let(:client) { Manticore::Client.new ssl: {verify: false} }
 
       it "should not break on SSL validation errors" do
         expect { client.get("https://localhost:55444/").body }.to_not raise_exception
@@ -52,7 +52,7 @@ describe Manticore::Client do
     end
 
     context "when off" do
-      let(:client) { Manticore::Client.new ignore_ssl_validation: false }
+      let(:client) { Manticore::Client.new ssl: {verify: true} }
 
       it "should break on SSL validation errors" do
         expect { client.get("https://localhost:55444/").call }.to raise_exception(Manticore::ClientProtocolException)
@@ -86,6 +86,14 @@ describe Manticore::Client do
         end
       end
 
+      context "when the client specifies a protocol list" do
+        let(:client) { Manticore::Client.new :ssl => {verify: :strict, truststore: File.expand_path("../../ssl/test_truststore", __FILE__), truststore_password: "test123", protocols: ["TLSv1", "TLSv1.1", "TLSv1.2"]} }
+
+        it "should verify the request and succeed" do
+          expect { client.get("https://localhost:55444/").body }.to_not raise_exception
+        end
+      end
+
       context 'when on and custom trust store is given with the wrong password' do
         let(:client) { Manticore::Client.new :ssl => {verify: :strict, truststore: File.expand_path("../../ssl/test_truststore", __FILE__), truststore_password: "wrongpass"} }
 
@@ -129,18 +137,19 @@ describe Manticore::Client do
           }
 
           it "should fail the request" do
-            expect { client.get("https://localhost:55445/").body }.to raise_exception(Manticore::ClientProtocolException)
+            # oraclejdk7 throws a SocketException here, oraclejdk8/openjdk7 throw ClientProtocolException
+            expect { client.get("https://localhost:55445/").body }.to raise_exception(Manticore::ManticoreException)
           end
         end
       end
     end
 
     describe ":cipher_suites" do
-      pending
+      skip
     end
 
     describe ":protocols" do
-      pending
+      skip
     end
   end
 
@@ -417,7 +426,7 @@ describe Manticore::Client do
       client.async.get("http://google.com").on_success {|r| ran = true }
       client.clear_pending
       client.execute!.should be_empty
-      ran.should be_false
+      ran.should be false
     end
   end
 
@@ -435,7 +444,7 @@ describe Manticore::Client do
         end
       }
 
-      called.should be_true
+      called.should be true
 
       client.clear_stubs!
       client.get(local_server) do |response|
@@ -460,10 +469,10 @@ describe Manticore::Client do
       let(:client) { Manticore::Client.new keepalive: true, pool_max: 1 }
 
       it "should keep the connection open after a request" do
-        pending
+        skip
         response = client.get(url).call
         get_connection(client, url) do |conn|
-          conn.is_open.should be_true
+          conn.is_open.should be true
         end
       end
     end
@@ -472,11 +481,11 @@ describe Manticore::Client do
       let(:client) { Manticore::Client.new keepalive: false, pool_max: 1 }
 
       it "should close the connection after a request" do
-        pending
+        skip
         response = client.get(url).call
         puts `netstat -apn`
         # get_connection(client, url) do |conn|
-        #   conn.is_open.should be_false
+        #   conn.is_open.should be false
         # end
       end
     end

data/spec/manticore/cookie_spec.rb

@@ -21,16 +21,16 @@ describe Manticore::Cookie do
     Manticore::Cookie.new({name: "foo", value: "bar"}.merge(opts))
   }
 
-  its(:secure?)     { should be_false }
-  its(:persistent?) { should be_false }
+  its(:secure?)     { should be nil }
+  its(:persistent?) { should be nil }
 
   context "created as secure" do
     let(:opts) {{ secure: true }}
-    its(:secure?) { should be_true }
+    its(:secure?) { should be true }
   end
 
   context "created as persistent" do
     let(:opts) {{ persistent: true }}
-    its(:persistent?) { should be_true }
+    its(:persistent?) { should be true }
   end
 end

data/spec/manticore/response_spec.rb

@@ -12,6 +12,14 @@ describe Manticore::Response do
     subject.body.should match "Manticore"
   end
 
+  it "should read the status code" do
+    subject.code.should eq 200
+  end
+
+  it "should read the status text" do
+    subject.message.should match "OK"
+  end
+
   context "when the client is invoked with a block" do
     it "should allow reading the body from a block" do
       response = client.get(local_server) do |response|
@@ -34,4 +42,4 @@ describe Manticore::Response do
       expect { client.get(local_server).call rescue nil }.to_not change { client.pool_stats[:available] }
     end
   end
-end
+end

data/spec/manticore/stubbed_response_spec.rb

@@ -32,7 +32,7 @@ describe Manticore::StubbedResponse do
   it "should call on_success handlers" do
     called = false
     Manticore::StubbedResponse.stub.on_success {|resp| called = true }.call
-    called.should be_true
+    called.should be true
   end
 
   it "should persist cookies passed in set-cookie" do

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@ require 'rack'
 require 'webrick'
 require 'webrick/https'
 require 'openssl'
+require 'rspec/its'
 
 PORT = 55441
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: manticore
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: java
 authors:
 - Chris Heald
@@ -30,7 +30,7 @@ cert_chain:
   E7PWS50D9moUJ6xWcemf0qKYC87qBFh0ng73awjG9uf+13lMslqJRMtek8C92cvh
   +R9zgQlbeNjy9O1i
   -----END CERTIFICATE-----
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2014-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -93,10 +93,9 @@ files:
 - gem-public_cert.pem
 - lib/jar/commons-codec-1.6.jar
 - lib/jar/commons-logging-1.1.3.jar
-- lib/jar/httpclient-4.3.2-patched.jar
-- lib/jar/httpcore-4.3.1.jar
-- lib/jar/httpmime-4.3.2.jar
-- lib/jar/lazy_decompressing_stream.patch
+- lib/jar/httpclient-4.3.6.jar
+- lib/jar/httpcore-4.3.3.jar
+- lib/jar/httpmime-4.3.6.jar
 - lib/jar/manticore-ext.jar
 - lib/manticore.rb
 - lib/manticore/client.rb

data/lib/jar/lazy_decompressing_stream.patch

@@ -1,17 +0,0 @@
-diff --git a/httpclient/src/main/java/org/apache/http/client/entity/LazyDecompressingInputStream.java b/httpclient/src/main/java/org/apache/http/client/entity/LazyDecompressingInputStream.java
-index 26e4981..ef07caf 100644
---- a/httpclient/src/main/java/org/apache/http/client/entity/LazyDecompressingInputStream.java
-+++ b/httpclient/src/main/java/org/apache/http/client/entity/LazyDecompressingInputStream.java
-@@ -57,6 +57,12 @@ class LazyDecompressingInputStream extends InputStream {
-     }
- 
-     @Override
-+    public int read(final byte[] b, final int off, final int len) throws IOException {
-+        initWrapper();
-+        return wrapperStream.read(b, off, len);
-+    }
-+
-+    @Override
-     public int available() throws IOException {
-         initWrapper();
-         return wrapperStream.available();