httpi 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fdb3bb23a9cba076a235fac76aa7aa0aa04a803
-  data.tar.gz: 7740630503dc0ffedc3f909f1418d45f0a443156
+  metadata.gz: e6ca1f335780f0839e9e5316c9ecf1a6d3753bea
+  data.tar.gz: f5e52a1dde48d6c783c2bc66b691df4cb4e1f4cd
 SHA512:
-  metadata.gz: 14a720954983eecb0fd4497f2c0e87269ceb5373c0856e19d4de9b7a102c7adba108e8fb44b020a80dc038b820355efffff9dfcdf0dad94f24668953c4d9b38d
-  data.tar.gz: 5f8119a473f8daf6c7dfd597a172002ead1f5b1fceea7456c083e14a9daee93da63d23a7018030103389a3397ae9e6df986780e032a7612f5d39a482b3619f5c
+  metadata.gz: f7e7e5d0cf5c2a2f59ad4b8bf331c4917cfcef503c0e905b6613b08ad03a8a23e20727668b51a3e27762167905b5a3c1a526a9fb987cd1d528dd6429090ee98c
+  data.tar.gz: ffe4093b24fc493cda6c8b7e266a5abcdc97785759e59024a6f02ef984f15b9c6707e70dfbd76e7f29bd91ed5077af219bd5c593d99bc675f720024e467193c6

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 2.4.1
+
+* Fix: [#147](https://github.com/savonrb/httpi/pull/147) Fix call Curb client "SSL peer certificate or SSH remote key was not OK" bug
+* Feature: [#145](https://github.com/savonrb/httpi/pull/145) Add support to http.rb adapter
+* Feature: [#144](https://github.com/savonrb/httpi/pull/144) Add NTLM support for CURB
+
 ### 2.4.0
 
 * Formally drop support for ruby 1.8.7

data/Gemfile

@@ -10,6 +10,7 @@ gem 'em-http-request',                  :require => false, :platforms => [:ruby,
 gem 'em-synchrony',                     :require => false, :platforms => [:ruby, :jruby]
 gem 'excon',               '~> 0.21.0', :require => false, :platforms => [:ruby, :jruby]
 gem 'net-http-persistent', '~> 2.8',    :require => false
+gem 'http',                             :require => false
 
 # coverage
 gem 'simplecov',                        :require => false

data/lib/httpi.rb

@@ -11,6 +11,7 @@ require "httpi/adapter/net_http"
 require "httpi/adapter/net_http_persistent"
 require "httpi/adapter/em_http"
 require "httpi/adapter/rack"
+require "httpi/adapter/http"
 
 # = HTTPI
 #

data/lib/httpi/adapter.rb

@@ -13,7 +13,7 @@ module HTTPI
     ADAPTERS = {}
     ADAPTER_CLASS_MAP = {}
 
-    LOAD_ORDER = [:httpclient, :curb, :em_http, :excon, :net_http, :net_http_persistent]
+    LOAD_ORDER = [:httpclient, :curb, :em_http, :excon, :http, :net_http, :net_http_persistent]
 
     class << self
 

data/lib/httpi/adapter/curb.rb

@@ -59,10 +59,11 @@ module HTTPI
       def setup_client
         basic_setup
 
-        if @request.auth.ntlm?
-          raise NotSupportedError, "curb does not support NTLM authentication"
+        if @request.auth.ntlm? && !Curl.ntlm?
+          raise NotSupportedError, "installed version of libcurl does not support NTLM authentication"
         end
 
+        setup_ntlm_auth if @request.auth.ntlm?
         setup_http_auth if @request.auth.http?
         setup_gssnegotiate_auth if @request.auth.gssnegotiate?
         setup_ssl_auth if @request.auth.ssl? || @request.ssl?
@@ -81,6 +82,11 @@ module HTTPI
         @client.set(:NOSIGNAL, true)
       end
 
+      def setup_ntlm_auth
+        @client.http_auth_types = @request.auth.type
+        @client.username, @client.password = *@request.auth.credentials
+      end
+
       def setup_http_auth
         @client.http_auth_types = @request.auth.type
         @client.username, @client.password = *@request.auth.credentials
@@ -98,7 +104,9 @@ module HTTPI
         ssl = @request.auth.ssl
 
         if @request.auth.ssl?
-          unless ssl.verify_mode == :none
+          if ssl.verify_mode == :none
+            @client.ssl_verify_host = 0
+          else
             @client.cacert = ssl.ca_cert_file if ssl.ca_cert_file
             @client.certtype = ssl.cert_type.to_s.upcase
           end

data/lib/httpi/adapter/http.rb

@@ -0,0 +1,76 @@
+require "httpi/adapter/base"
+require "httpi/response"
+
+module HTTPI
+  module Adapter
+
+    # = HTTPI::Adapter::HTTP
+    #
+    # Adapter for the http.rb client.
+    # https://github.com/httprb/http.rb
+    class HTTP < Base
+
+      register :http, :deps => %w(http)
+
+      def initialize(request)
+        if request.auth.digest?
+          raise NotSupportedError, "http.rb does not support HTTP digest authentication"
+        end
+        if request.auth.ntlm?
+          raise NotSupportedError, "http.rb does not support NTLM digest authentication"
+        end
+
+        @request = request
+        @client = create_client
+      end
+
+      attr_reader :client
+
+      # Executes arbitrary HTTP requests.
+      # @see HTTPI.request
+      def request(method)
+        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.new(response.code, response.headers, response.body.to_s)
+      end
+
+      private
+
+      def create_client
+        if @request.ssl?
+          context = OpenSSL::SSL::SSLContext.new
+
+          context.options = OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:options]
+
+          if @request.auth.ssl.ca_cert_file != nil
+            context.ca_file = @request.auth.ssl.ca_cert_file
+          else
+            context.cert_store = OpenSSL::SSL::SSLContext::DEFAULT_CERT_STORE
+          end
+
+          context.cert        = @request.auth.ssl.cert
+          context.key         = @request.auth.ssl.cert_key
+          context.ssl_version = @request.auth.ssl.ssl_version if @request.auth.ssl.ssl_version != nil
+          context.verify_mode = @request.auth.ssl.openssl_verify_mode
+
+          client = ::HTTP::Client.new(:ssl_context => context)
+        else
+          client = ::HTTP
+        end
+
+        if @request.auth.basic?
+          client = client.basic_auth(:user => @request.auth.credentials[0], :pass => @request.auth.credentials[1])
+        end
+
+        if @request.proxy != nil
+          client = client.via(@request.proxy.host, @request.proxy.port, @request.proxy.user, @request.proxy.password)
+        end
+
+        client.headers(@request.headers)
+      end
+    end
+  end
+end

data/lib/httpi/version.rb

@@ -1,3 +1,3 @@
 module HTTPI
-  VERSION = '2.4.0'
+  VERSION = '2.4.1'
 end

data/spec/httpi/adapter/curb_spec.rb

@@ -2,10 +2,30 @@ require "spec_helper"
 require "httpi/adapter/curb"
 require "httpi/request"
 
+require "integration/support/server"
+
 # curb does not run on jruby
 unless RUBY_PLATFORM =~ /java/
   HTTPI::Adapter.load_adapter(:curb)
 
+  describe "NTLM authentication" do
+    before :all do
+      @server = IntegrationServer.run
+    end
+
+    after :all do
+      @server.stop
+    end
+
+    it "supports ntlm authentication" do
+      request = HTTPI::Request.new(@server.url + "ntlm-auth")
+      adapter = HTTPI::Adapter::Curb.new(request)
+      
+      request.auth.ntlm("tester", "vReqSoafRe5O")
+      expect(adapter.request(:get).body).to eq("ntlm-auth")
+    end
+  end
+
   describe HTTPI::Adapter::Curb do
 
     let(:adapter) { HTTPI::Adapter::Curb.new(request) }
@@ -168,15 +188,6 @@ unless RUBY_PLATFORM =~ /java/
         end
       end
 
-      describe "NTLM authentication" do
-        it "is not supported" do
-          request.auth.ntlm("tester", "vReqSoafRe5O")
-
-          expect { adapter.request(:get) }.
-            to raise_error(HTTPI::NotSupportedError, /does not support NTLM authentication/)
-        end
-      end
-
       describe "http_auth_types" do
         it "is set to :basic for HTTP basic auth" do
           request.auth.basic "username", "password"
@@ -198,6 +209,13 @@ unless RUBY_PLATFORM =~ /java/
 
           adapter.request(:get)
         end
+
+        it "is set to :ntlm for HTTP NTLM auth" do
+          request.auth.ntlm("tester", "vReqSoafRe5O")
+          curb.expects(:http_auth_types=).with(:ntlm)
+
+          adapter.request(:get)
+        end
       end
 
       describe "username and password" do
@@ -266,6 +284,7 @@ unless RUBY_PLATFORM =~ /java/
 
         it "send certificate regardless of state of SSL verify mode" do
           request.auth.ssl.verify_mode = :none
+          curb.expects(:ssl_verify_host=).with(0) # avoid "SSL peer certificate" error
           curb.expects(:cert_key=).with(request.auth.ssl.cert_key_file)
           curb.expects(:cert=).with(request.auth.ssl.cert_file)
 

data/spec/httpi/adapter/http_spec.rb

@@ -0,0 +1,101 @@
+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 "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 "does not support digest authentication" do
+      request = HTTPI::Request.new(@server.url + "digest-auth")
+      request.auth.digest("admin", "secret")
+
+      expect { HTTPI.get(request, adapter) }.
+        to raise_error(HTTPI::NotSupportedError, /does not support HTTP digest authentication/)
+    end
+
+    it "does not support ntlm authentication" do
+      request = HTTPI::Request.new(@server.url + "ntlm-auth")
+      request.auth.ntlm("tester", "vReqSoafRe5O")
+
+      expect { HTTPI.get(request, adapter) }.
+        to raise_error(HTTPI::NotSupportedError, /does not support NTLM digest authentication/)
+    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 "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/httpi/httpi_spec.rb

@@ -4,6 +4,7 @@ require "integration/support/server"
 # find out why httpi doesn't load these automatically. [dh, 2012-12-15]
 require "excon"
 require "net/http/persistent"
+require "http"
 
 unless RUBY_VERSION < "1.9"
   require "em-synchrony"
@@ -287,7 +288,8 @@ describe HTTPI do
             :net_http_persistent => lambda { Net::HTTP::Persistent },
             :em_http    => lambda { EventMachine::HttpConnection },
             :rack       => lambda { Rack::MockRequest },
-            :excon      => lambda { Excon::Connection }
+            :excon      => lambda { Excon::Connection },
+            :http       => lambda { ::HTTP::Client }
           }
 
           context "using #{adapter}" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpi
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Daniel Harrington
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -116,6 +116,7 @@ files:
 - lib/httpi/adapter/curb.rb
 - lib/httpi/adapter/em_http.rb
 - lib/httpi/adapter/excon.rb
+- lib/httpi/adapter/http.rb
 - lib/httpi/adapter/httpclient.rb
 - lib/httpi/adapter/net_http.rb
 - lib/httpi/adapter/net_http_persistent.rb
@@ -141,6 +142,7 @@ files:
 - spec/httpi/adapter/curb_spec.rb
 - spec/httpi/adapter/em_http_spec.rb
 - spec/httpi/adapter/excon_spec.rb
+- spec/httpi/adapter/http_spec.rb
 - spec/httpi/adapter/httpclient_spec.rb
 - spec/httpi/adapter/net_http_persistent_spec.rb
 - spec/httpi/adapter/net_http_spec.rb
@@ -188,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: httpi
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Common interface for Ruby's HTTP libraries