httpi 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b00e0eb6313b47ac5eb3be9f3330bac10a9321b7
-  data.tar.gz: b49e8aaba759e1384bae07bf825b17f511c809ec
+SHA256:
+  metadata.gz: 613b8bb3b0fa730f0920296081683075b6de1c34164bd347a1d93d5928d4af0b
+  data.tar.gz: 84d1328228a15c27afee7a4bbe04d3a29079129b7227697c6993728c96b4a4c9
 SHA512:
-  metadata.gz: b3a31c1b2ac5ebbb82336104e64130f3f214462838175c7d966677c5e1cb03b77273d80b0282e9a1a032ea38b963215974a29777223c0da287d7755418b1b05a
-  data.tar.gz: 1c9baad44d8900f1bad06e9c991079300541476dded64e9bd44468a77552fc8d1143c6abe1d6e1ef42c11adf6427ed1d4241f02f9538fccb820e83b985bafc1a
+  metadata.gz: d4ea5d0acbfb93fd0599268946a062cb20d162195469bc92d548b241a75902b4b5f2131a5d95fc21c9165b8cf68058bc156126e265676d083b888558f4e32d35
+  data.tar.gz: '069622ebb89c624bb74d12a883506af7b38553f016a90c223a91a0230fb3b11115b665bafcdcf8c0f3a26c121abdf817581ff7fcddb68acd727ad9218ead6ba8'

data/.travis.yml

@@ -6,4 +6,10 @@ rvm:
   - 2.1.8
   - 2.2.4
   - 2.3.0
-  - jruby
+  - 2.5.0
+  - jruby-9.1.9.0
+env:
+  global:
+    - JRUBY_OPTS="--2.0"
+before_install:
+  - "travis_retry gem install bundler"

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 2.4.3
+
+* Fix: [#171](https://github.com/savonrb/httpi/pull/171) bug with rubyntlm v0.6.0
+* Fix: [#181](https://github.com/savonrb/httpi/pull/181) excon and http adapters
+* Feature: [#183](https://github.com/savonrb/httpi/pull/183) Logging ssl information of a request
+* Fix: [#187](https://github.com/savonrb/httpi/pull/187) only require ntlm if ntlm auth was requested
+
+
 ### 2.4.2
 
 * Feature: [#165](https://github.com/savonrb/httpi/pull/165) Extended net_http adapter ssl options with cert_store and ca_path

data/Gemfile

@@ -3,6 +3,9 @@ gemspec
 
 gem 'jruby-openssl',                                       :platforms => :jruby
 
+# compatibility restrictions for http clients under existing travis test environments
+gem 'public_suffix', '~> 2.0'   # or remove rubies < 2.1 from travis.yml
+
 # http clients
 gem 'httpclient',          '~> 2.3',    :require => false
 gem 'curb',                '~> 0.8',    :require => false, :platforms => :ruby

data/Rakefile

@@ -10,7 +10,9 @@ RSpec::Core::RakeTask.new "spec_integration" do |t|
   t.pattern = "spec/integration/*_spec.rb"
 end
 
-task :default => :spec
-
 desc "Run RSpec code and integration examples"
-task :ci => [:spec, :spec_integration]
+RSpec::Core::RakeTask.new "ci" do |t|
+  t.pattern = "spec/{httpi,integration}/**/*_spec.rb"
+end
+
+task :default => :spec

data/lib/httpi/adapter/excon.rb

@@ -77,7 +77,11 @@ module HTTPI
       end
 
       def respond_with(response)
-        Response.new response.status, response.headers, response.body
+        headers = response.headers.dup
+        if (cookies = response.data[:cookies]) && !cookies.empty?
+          headers["Set-Cookie"] = cookies
+        end
+        Response.new response.status, headers, response.body
       end
 
     end

data/lib/httpi/adapter/http.rb

@@ -32,9 +32,13 @@ module HTTPI
         unless ::HTTP::Request::METHODS.include? method
           raise NotSupportedError, "http.rb does not support custom HTTP methods"
         end
-        response = @client.send(method, @request.url, :body => @request.body)
+        response = begin
+          @client.send(method, @request.url, :body => @request.body)
+        rescue OpenSSL::SSL::SSLError
+          raise SSLError
+        end
 
-        Response.new(response.code, response.headers, response.body.to_s)
+        Response.new(response.code, response.headers.to_h, response.body.to_s)
       end
 
       private

data/lib/httpi/adapter/net_http.rb

@@ -18,7 +18,7 @@ module HTTPI
 
       register :net_http, :deps => %w(net/https)
       def initialize(request)
-        check_net_ntlm_version!
+        check_net_ntlm_version! if request.auth.ntlm?
         @request = request
         @client = create_client
       end
@@ -55,11 +55,15 @@ module HTTPI
       end
 
       private
+      def ntlm_version
+        Net::NTLM::VERSION::STRING
+      end
+
       def check_net_ntlm_version!
         begin
           require 'net/ntlm'
-          require 'net/ntlm/version' unless Net::NTLM.const_defined?(:VERSION)
-          unless Net::NTLM::VERSION::STRING >= '0.3.2'
+          require 'net/ntlm/version' unless Net::NTLM.const_defined?(:VERSION, false)
+          unless ntlm_version >= '0.3.2'
             raise ArgumentError, 'Invalid version of rubyntlm. Please use v0.3.2+.'
           end
         rescue LoadError

data/lib/httpi/auth/ssl.rb

@@ -10,7 +10,15 @@ module HTTPI
 
       VERIFY_MODES = [:none, :peer, :fail_if_no_peer_cert, :client_once]
       CERT_TYPES = [:pem, :der]
-      SSL_VERSIONS = OpenSSL::SSL::SSLContext::METHODS.reject { |method| method.match(/server|client/) }.sort.reverse
+
+      # Fix for
+      # httpi/auth/ssl.rb:13: warning: constant OpenSSL::SSL::SSLContext::METHODS is deprecated
+      ssl_context = OpenSSL::SSL::SSLContext
+      SSL_VERSIONS = if ssl_context.const_defined? :METHODS_MAP
+        ssl_context.const_get(:METHODS_MAP).keys
+      else
+        ssl_context::METHODS.reject { |method| method.match(/server|client/) }
+      end.sort.reverse
 
       # Returns whether SSL configuration is present.
       def present?

data/lib/httpi/logger.rb

@@ -43,8 +43,13 @@ module HTTPI
     protected
 
     def log_request(method, request, adapter)
-      log("HTTPI #{method.to_s.upcase} request to #{request.url.host} (#{adapter})")
+      log("HTTPI #{request_ssl_info(request)} #{method.to_s.upcase} request to #{request.url.host} (#{adapter})")
     end
 
+    def request_ssl_info(request)
+      if request.auth && request.auth.ssl
+        "#{request.auth.ssl.ssl_version}/#{request.auth.ssl.verify_mode}"
+      end
+    end
   end
 end

data/lib/httpi/version.rb

@@ -1,3 +1,3 @@
 module HTTPI
-  VERSION = '2.4.2'
+  VERSION = '2.4.3'
 end

data/spec/httpi/adapter/curb_spec.rb

@@ -257,8 +257,7 @@ unless RUBY_PLATFORM =~ /java/
           end
 
           it 'to 2 when ssl_version is specified as SSLv2/SSLv23' do
-            version = OpenSSL::SSL::SSLContext::METHODS.reject { |method| method.match(/server|client/) }
-            version = version.select { |method| method.to_s.match(/SSLv2|SSLv23/) }.first
+            version = HTTPI::Auth::SSL::SSL_VERSIONS.select { |method| method.to_s.match(/SSLv2|SSLv23/) }.first
             request.auth.ssl.ssl_version = version
             curb.expects(:ssl_version=).with(2)
 

data/spec/httpi/adapter/net_http_spec.rb

@@ -132,6 +132,33 @@ describe HTTPI::Adapter::NetHTTP do
         to raise_error(HTTPI::NotSupportedError, /Net::NTLM is not available/)
     end
 
+    it 'does not require ntlm when ntlm authenication is not requested' do 
+      HTTPI::Adapter::NetHTTP.any_instance.stubs(:check_net_ntlm_version!).raises(RuntimeError)
+        request = HTTPI::Request.new(@server.url)
+        expect(request.auth.ntlm?).to be false
+
+        # make sure a request doesn't call ntlm check if we don't ask for it.
+        expect { HTTPI.get(request, adapter) }.not_to raise_error
+      HTTPI::Adapter::NetHTTP.any_instance.unstub(:check_net_ntlm_version!)
+    end
+
+    it 'does check ntlm when ntlm authentication is requested' do 
+      request = HTTPI::Request.new(@server.url + "ntlm-auth")
+      request.auth.ntlm("tester", "vReqSoafRe5O")
+        
+      expect { HTTPI.get(request, adapter) }.not_to raise_error
+
+      # the check should also verify that the version of ntlm is supported and still fail if it isn't
+      HTTPI::Adapter::NetHTTP.any_instance.stubs(:ntlm_version).returns("0.1.1")
+
+        request = HTTPI::Request.new(@server.url + "ntlm-auth")
+        request.auth.ntlm("tester", "vReqSoafRe5O")
+        
+        expect { HTTPI.get(request, adapter) }.to raise_error(ArgumentError, /Invalid version/)
+
+      HTTPI::Adapter::NetHTTP.any_instance.unstub(:ntlm_version)
+    end
+
     it "does not crash when authenticate header is missing (on second request)" do
       request = HTTPI::Request.new(@server.url + 'ntlm-auth')
       request.auth.ntlm("tester", "vReqSoafRe5O")

data/spec/httpi/auth/ssl_spec.rb

@@ -3,7 +3,7 @@ require "httpi/auth/ssl"
 
 describe HTTPI::Auth::SSL do
   before(:all) do
-    @ssl_versions = OpenSSL::SSL::SSLContext::METHODS.reject { |method| method.match(/server|client/) }.sort.reverse
+    @ssl_versions = HTTPI::Auth::SSL::SSL_VERSIONS
   end
 
   describe "VERIFY_MODES" do

data/spec/integration/excon_spec.rb

@@ -0,0 +1,108 @@
+require "spec_helper"
+require "integration/support/server"
+
+describe HTTPI::Adapter::HTTPClient do
+
+  subject(:adapter) { :excon }
+
+  context "http requests" do
+    before :all do
+      @server = IntegrationServer.run
+    end
+
+    after :all do
+      @server.stop
+    end
+
+    it "sends and receives HTTP headers" do
+      request = HTTPI::Request.new(@server.url + "x-header")
+      request.headers["X-Header"] = "HTTPI"
+
+      response = HTTPI.get(request, adapter)
+      expect(response.body).to include("HTTPI")
+    end
+
+    it "it supports headers with multiple values" do
+      request = HTTPI::Request.new(@server.url + "cookies")
+
+      response = HTTPI.get(request, adapter)
+      cookies = ["cookie1=chip1; path=/", "cookie2=chip2; path=/"]
+      expect(response.headers["Set-Cookie"]).to eq(cookies)
+    end
+
+    it "executes GET requests" do
+      response = HTTPI.get(@server.url, adapter)
+      expect(response.body).to eq("get")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
+    end
+
+    it "executes POST requests" do
+      response = HTTPI.post(@server.url, "<some>xml</some>", adapter)
+      expect(response.body).to eq("post")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
+    end
+
+    it "executes HEAD requests" do
+      response = HTTPI.head(@server.url, adapter)
+      expect(response.code).to eq(200)
+      expect(response.headers["Content-Type"]).to eq("text/plain")
+    end
+
+    it "executes PUT requests" do
+      response = HTTPI.put(@server.url, "<some>xml</some>", adapter)
+      expect(response.body).to eq("put")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
+    end
+
+    it "executes DELETE requests" do
+      response = HTTPI.delete(@server.url, adapter)
+      expect(response.body).to eq("delete")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
+    end
+
+    it "supports basic authentication" do
+      request = HTTPI::Request.new(@server.url + "basic-auth")
+      request.auth.basic("admin", "secret")
+
+      response = HTTPI.get(request, adapter)
+      expect(response.body).to eq("basic-auth")
+    end
+
+    it "supports chunked response" do
+      request = HTTPI::Request.new(@server.url)
+      res = ""
+      request.on_body do |body|
+        res += body
+      end
+      response = HTTPI.post(request, adapter)
+      expect(res).to eq("post")
+      expect(response.body).to eq("")
+    end
+  end
+
+  if RUBY_PLATFORM =~ /java/
+    pending "Puma Server complains: SSL not supported on JRuby"
+  else
+    context "https requests" do
+      before :all do
+        @server = IntegrationServer.run(:ssl => true)
+      end
+      after :all do
+        @server.stop
+      end
+
+      it "raises when no certificate was set up" do
+        expect { HTTPI.post(@server.url, "", adapter) }.to raise_error(HTTPI::SSLError)
+      end
+
+      it "works when set up properly" do
+        request = HTTPI::Request.new(@server.url)
+        request.auth.ssl.ca_cert_file = IntegrationServer.ssl_ca_file
+
+        response = HTTPI.get(request, adapter)
+        expect(response.body).to eq("get")
+      end
+    end
+  end
+
+end

data/spec/integration/http_spec.rb

@@ -0,0 +1,109 @@
+require "spec_helper"
+require "integration/support/server"
+
+describe HTTPI::Adapter::HTTP do
+
+  subject(:adapter) { :http }
+
+  context "http requests" do
+    before :all do
+      @server = IntegrationServer.run
+    end
+
+    after :all do
+      @server.stop
+    end
+
+    it "sends and receives HTTP headers" do
+      request = HTTPI::Request.new(@server.url + "x-header")
+      request.headers["X-Header"] = "HTTPI"
+
+      response = HTTPI.get(request, adapter)
+      expect(response.body).to include("HTTPI")
+    end
+
+    it "it supports headers with multiple values" do
+      request = HTTPI::Request.new(@server.url + "cookies")
+
+      response = HTTPI.get(request, adapter)
+      cookies = ["cookie1=chip1; path=/", "cookie2=chip2; path=/"]
+      expect(response.headers["Set-Cookie"]).to eq(cookies)
+    end
+
+    it "executes GET requests" do
+      response = HTTPI.get(@server.url, adapter)
+      expect(response.body).to eq("get")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
+    end
+
+    it "executes POST requests" do
+      response = HTTPI.post(@server.url, "<some>xml</some>", adapter)
+      expect(response.body).to eq("post")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
+    end
+
+    it "executes HEAD requests" do
+      response = HTTPI.head(@server.url, adapter)
+      expect(response.code).to eq(200)
+      expect(response.headers["Content-Type"]).to eq("text/plain")
+    end
+
+    it "executes PUT requests" do
+      response = HTTPI.put(@server.url, "<some>xml</some>", adapter)
+      expect(response.body).to eq("put")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
+    end
+
+    it "executes DELETE requests" do
+      response = HTTPI.delete(@server.url, adapter)
+      expect(response.body).to eq("delete")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
+    end
+
+    it "supports basic authentication" do
+      request = HTTPI::Request.new(@server.url + "basic-auth")
+      request.auth.basic("admin", "secret")
+
+      response = HTTPI.get(request, adapter)
+      expect(response.body).to eq("basic-auth")
+    end
+
+    it "supports chunked response" do
+      skip("Needs investigation")
+      request = HTTPI::Request.new(@server.url)
+      res = ""
+      request.on_body do |body|
+        res += body
+      end
+      response = HTTPI.post(request, adapter)
+      expect(res).to eq("post")
+      expect(response.body).to eq("")
+    end
+  end
+
+  if RUBY_PLATFORM =~ /java/
+    pending "Puma Server complains: SSL not supported on JRuby"
+  else
+    context "https requests" do
+      before :all do
+        @server = IntegrationServer.run(:ssl => true)
+      end
+      after :all do
+        @server.stop
+      end
+
+      it "raises when no certificate was set up" do
+        expect { HTTPI.post(@server.url, "", adapter) }.to raise_error(HTTPI::SSLError)
+      end
+
+      it "works when set up properly" do
+        request = HTTPI::Request.new(@server.url)
+        request.auth.ssl.ca_cert_file = IntegrationServer.ssl_ca_file
+
+        response = HTTPI.get(request, adapter)
+        expect(response.body).to eq("get")
+      end
+    end
+  end
+
+end

data/spec/integration/net_http_persistent_spec.rb

@@ -37,7 +37,9 @@ describe HTTPI::Adapter::NetHTTP do
     end
 
     it "executes POST requests" do
-      response = HTTPI.post(@server.url, "<some>xml</some>", adapter)
+      request = HTTPI::Request.new(url: @server.url, open_timeout: 1, read_timeout: 1, body: "<some>xml</some>")
+      
+      response = HTTPI.post(request, adapter)
       expect(response.body).to eq("post")
       expect(response.headers["Content-Type"]).to eq("text/plain")
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpi
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - Daniel Harrington
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2018-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -186,9 +186,11 @@ files:
 - spec/httpi/response_spec.rb
 - spec/integration/curb_spec.rb
 - spec/integration/em_http_spec.rb
+- spec/integration/excon_spec.rb
 - spec/integration/fixtures/ca_all.pem
 - spec/integration/fixtures/server.cert
 - spec/integration/fixtures/server.key
+- spec/integration/http_spec.rb
 - spec/integration/httpclient_spec.rb
 - spec/integration/net_http_persistent_spec.rb
 - spec/integration/net_http_spec.rb
@@ -218,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: httpi
-rubygems_version: 2.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Common interface for Ruby's HTTP libraries