httpi 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c23ccc97a8d193073d3796267e1cf8152c44d95
-  data.tar.gz: 151683feedc6b3a4fbbc4564536a2e3fb0c426db
+  metadata.gz: 64f90cd54aeecb3d644ddc16fec7b315c1f3b04b
+  data.tar.gz: dfd7327d1ec9c29435c45225142e4d7dbb9f69f6
 SHA512:
-  metadata.gz: 8fc7555afdfba157961116ba52ba8d1ff6db64d8cf62a02772d2030978be74ebb66f18fea45a21ad6089a0eae8b747735f696eebb625c8be8a99a74f22651ea4
-  data.tar.gz: ec8e1195056d31a2a57bcaa5603ffad3e76190d7db423db303433ae94260fc1e812788cd658935011c064ed7b9b6780941a5e2c7e55318a357fabe6dc640413a
+  metadata.gz: ecd189b6104973f1286423bf498f37849ad37acaab443d108dda5d2d87d663bfd44171dd291506bd4dc8db45ac1fd57fbf90cd107e1b367dae0442e3b7d0f170
+  data.tar.gz: 904207471eed6b713d613f97453bc2a8e0abf156aadfde9ed228a93018c31ee3360b58a399f02c06833a769b3275bc3b483e5c69076f938c509617d288571145

data/.travis.yml

@@ -1,11 +1,5 @@
 language: "ruby"
 script: "bundle exec rake ci"
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
-  - jruby-18mode
   - jruby-19mode
-  - rbx-18mode
-  - rbx-19mode
-  - ree

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 2.2.0 (edge)
+
+* Fix: [#111](https://github.com/savonrb/httpi/pull/111) Check rubyntlm version in a 0.4.0+ compatible way. Thanks to [Carl Zulauf](https://github.com/carlzulauf).
+* Fix: [#109](https://github.com/savonrb/httpi/pull/109) SSL version is set regardless of SSL auth settings. Thanks to [Mike Campbell](https://github.com/mikecmpbll).
+* Feature: [#108](https://github.com/savonrb/httpi/pull/108) Make `rubyntlm` gem, an optional dependency. Thanks to [Tim Jarratt](https://github.com/tjarratt).
+
 ### 2.1.0 (2013-07-22)
 
 * Feature: [#75](https://github.com/savonrb/httpi/pull/75) Rack adapter.

data/httpi.gemspec

@@ -1,27 +1,28 @@
-lib = File.expand_path("../lib/", __FILE__)
+lib = File.expand_path('../lib/', __FILE__)
 $:.unshift lib unless $:.include?(lib)
 
-require "httpi/version"
+require 'httpi/version'
 
 Gem::Specification.new do |s|
-  s.name        = "httpi"
+  s.name        = 'httpi'
   s.version     = HTTPI::VERSION
-  s.authors     = ["Daniel Harrington", "Martin Tepper"]
-  s.email       = "me@rubiii.com"
-  s.homepage    = "http://github.com/savonrb/#{s.name}"
+  s.authors     = ['Daniel Harrington', 'Martin Tepper']
+  s.email       = 'me@rubiii.com'
+  s.homepage    = 'http://github.com/savonrb/#{s.name}'
   s.summary     = "Common interface for Ruby's HTTP libraries"
   s.description = s.summary
 
   s.rubyforge_project = s.name
+  s.license = 'MIT'
 
-  s.add_dependency "rack"
-  s.add_dependency "rubyntlm", "~> 0.3.2"
+  s.add_dependency 'rack'
 
-  s.add_development_dependency "rake",  "~> 10.0"
-  s.add_development_dependency "rspec", "~> 2.12"
-  s.add_development_dependency "mocha", "~> 0.13"
-  s.add_development_dependency "puma",  "~> 2.3.2"
+  s.add_development_dependency 'rubyntlm', '~> 0.3.2'
+  s.add_development_dependency 'rake',     '~> 10.0'
+  s.add_development_dependency 'rspec',    '~> 2.14'
+  s.add_development_dependency 'mocha',    '~> 0.13'
+  s.add_development_dependency 'puma',     '~> 2.3.2'
 
   s.files = `git ls-files`.split("\n")
-  s.require_path = "lib"
+  s.require_path = 'lib'
 end

data/lib/httpi/adapter/curb.rb

@@ -29,7 +29,14 @@ module HTTPI
           arguments << (@request.body || "")
         end
 
-        client.on_body(&@request.on_body) if @request.on_body
+        if @request.on_body
+          client.on_body do |data|
+            @request.on_body.call(data)
+            # curb requires you to return the length of the data read from the block.
+            # It allows you to abort the connection by returning a smaller value
+            data.length
+          end
+        end
 
         do_request { |client| client.send(*arguments) }
       rescue Curl::Err::SSLCACertificateError
@@ -58,7 +65,7 @@ module HTTPI
 
         setup_http_auth if @request.auth.http?
         setup_gssnegotiate_auth if @request.auth.gssnegotiate?
-        setup_ssl_auth if @request.auth.ssl?
+        setup_ssl_auth if @request.auth.ssl? || @request.ssl?
       end
 
       def basic_setup
@@ -86,16 +93,19 @@ module HTTPI
       def setup_ssl_auth
         ssl = @request.auth.ssl
 
-        unless ssl.verify_mode == :none
-          @client.cacert = ssl.ca_cert_file if ssl.ca_cert_file
-          @client.certtype = ssl.cert_type.to_s.upcase
-        end
+        if @request.auth.ssl?
+          unless ssl.verify_mode == :none
+            @client.cacert = ssl.ca_cert_file if ssl.ca_cert_file
+            @client.certtype = ssl.cert_type.to_s.upcase
+          end
 
-        # Send client-side certificate regardless of state of SSL verify mode
-        @client.cert_key = ssl.cert_key_file
-        @client.cert = ssl.cert_file
+          # Send client-side certificate regardless of state of SSL verify mode
+          @client.cert_key = ssl.cert_key_file
+          @client.cert = ssl.cert_file
 
-        @client.ssl_verify_peer = ssl.verify_mode == :peer
+          @client.ssl_verify_peer = ssl.verify_mode == :peer
+        end
+        
         @client.ssl_version = case ssl.ssl_version
           when :TLSv1 then 1
           when :SSLv2 then 2

data/lib/httpi/adapter/excon.rb

@@ -66,7 +66,6 @@ module HTTPI
           opts[:ssl_ca_file] = ssl.ca_cert_file if ssl.ca_cert_file
           opts[:client_cert] = ssl.cert     if ssl.cert
           opts[:client_key]  = ssl.cert_key if ssl.cert_key
-	  opts[:ssl_version] = ssl.ssl_version if ssl.ssl_version
         end
 
         opts

data/lib/httpi/adapter/httpclient.rb

@@ -41,7 +41,7 @@ module HTTPI
         end
 
         setup_auth if @request.auth.http?
-        setup_ssl_auth if @request.auth.ssl?
+        setup_ssl_auth if @request.auth.ssl? || @request.ssl?
       end
 
       def basic_setup
@@ -57,15 +57,18 @@ module HTTPI
       def setup_ssl_auth
         ssl = @request.auth.ssl
 
-        if ssl.ca_cert_file && ssl.verify_mode != :none
-          @client.ssl_config.add_trust_ca(ssl.ca_cert_file)
-        end
+        if @request.auth.ssl?
+          if ssl.ca_cert_file && ssl.verify_mode != :none
+            @client.ssl_config.add_trust_ca(ssl.ca_cert_file)
+          end
 
-        # Send client-side certificate regardless of state of SSL verify mode
-        @client.ssl_config.client_cert = ssl.cert
-        @client.ssl_config.client_key = ssl.cert_key
+          # Send client-side certificate regardless of state of SSL verify mode
+          @client.ssl_config.client_cert = ssl.cert
+          @client.ssl_config.client_key = ssl.cert_key
+
+          @client.ssl_config.verify_mode = ssl.openssl_verify_mode
+        end
 
-        @client.ssl_config.verify_mode = ssl.openssl_verify_mode
         @client.ssl_config.ssl_version = ssl.ssl_version.to_s if ssl.ssl_version
       end
 

data/lib/httpi/adapter/net_http.rb

@@ -2,10 +2,19 @@ require "uri"
 
 require "httpi/adapter/base"
 require "httpi/response"
-require 'net/ntlm'
 require 'kconv'
 require 'socket'
 
+begin
+  require 'net/ntlm'
+  require 'net/ntlm/version' unless Net::NTLM.const_defined?(:VERSION)
+  unless Net::NTLM::VERSION::STRING >= '0.3.2'
+    raise ArgumentError('Invalid version of rubyntlm. Please use v0.3.2+.')
+  end
+rescue LoadError => e
+  HTTPI.logger.debug('Net::NTLM is not available. Install via gem install rubyntlm.')
+end
+
 module HTTPI
   module Adapter
 
@@ -72,10 +81,14 @@ module HTTPI
 
       def setup
         setup_client
-        setup_ssl_auth if @request.auth.ssl?
+        setup_ssl_auth if @request.auth.ssl? || @request.ssl?
       end
 
       def negotiate_ntlm_auth(http, &requester)
+        unless Net.const_defined?(:NTLM)
+          HTTPI.logger.fatal('Cannot negotiate ntlm auth if net/ntlm is not present. Perhaps the net/ntlm gem is not installed?')
+        end
+
         # first figure out if we should use NTLM or Negotiate
         nego_auth_response = respond_with(requester.call(http, request_client(:head)))
         if nego_auth_response.headers['www-authenticate'].include? 'Negotiate'
@@ -102,7 +115,7 @@ module HTTPI
         if auth_response.headers["WWW-Authenticate"] =~ /(NTLM|Negotiate) (.+)/
           auth_token = $2
           ntlm_message = Net::NTLM::Message.decode64(auth_token)
-          
+
           message_builder = {}
           # copy the username and password from the authorization parameters
           message_builder[:user] = @request.auth.ntlm[0]
@@ -110,15 +123,11 @@ module HTTPI
 
           # we need to provide a domain in the packet if an only if it was provided by the user in the auth request
           if @request.auth.ntlm[2]
-            message_builder[:domain] = Net::NTLM::EncodeUtil.encode_utf16le(@request.auth.ntlm[2].upcase)
+            message_builder[:domain] = @request.auth.ntlm[2].upcase
           else
             message_builder[:domain] = ''
           end
 
-          # we should also provide the workstation name, currently the rubyntlm provider does not automatically
-          # set the workstation name
-          message_builder[:workstation] = Net::NTLM::EncodeUtil.encode_utf16le(Socket.gethostname)
-          
           ntlm_response = ntlm_message.response(message_builder ,
                                                  {:ntlmv2 => true})
           # Finally add header of Authorization
@@ -137,15 +146,18 @@ module HTTPI
       def setup_ssl_auth
         ssl = @request.auth.ssl
 
-        unless ssl.verify_mode == :none
-          @client.ca_file = ssl.ca_cert_file if ssl.ca_cert_file
-        end
+        if @request.auth.ssl?
+          unless ssl.verify_mode == :none
+            @client.ca_file = ssl.ca_cert_file if ssl.ca_cert_file
+          end
 
-        # Send client-side certificate regardless of state of SSL verify mode
-        @client.key = ssl.cert_key
-        @client.cert = ssl.cert
+          # Send client-side certificate regardless of state of SSL verify mode
+          @client.key = ssl.cert_key
+          @client.cert = ssl.cert
+
+          @client.verify_mode = ssl.openssl_verify_mode
+        end
 
-        @client.verify_mode = ssl.openssl_verify_mode
         @client.ssl_version = ssl.ssl_version if ssl.ssl_version
       end
 

data/lib/httpi/version.rb

@@ -1,5 +1,5 @@
 module HTTPI
 
-  VERSION = "2.1.1"
+  VERSION = "2.2.0"
 
 end

data/spec/httpi/adapter/curb_spec.rb

@@ -21,7 +21,7 @@ unless RUBY_PLATFORM =~ /java/
       end
 
       it "returns a valid HTTPI::Response" do
-        adapter.request(:get).should match_response(:body => Fixture.xml)
+        expect(adapter.request(:get)).to match_response(:body => Fixture.xml)
       end
     end
 
@@ -34,7 +34,7 @@ unless RUBY_PLATFORM =~ /java/
       end
 
       it "returns a valid HTTPI::Response" do
-        adapter.request(:post).should match_response(:body => Fixture.xml)
+        expect(adapter.request(:post)).to match_response(:body => Fixture.xml)
       end
     end
 
@@ -56,7 +56,7 @@ unless RUBY_PLATFORM =~ /java/
       end
 
       it "returns a valid HTTPI::Response" do
-        adapter.request(:head).should match_response(:body => Fixture.xml)
+        expect(adapter.request(:head)).to match_response(:body => Fixture.xml)
       end
     end
 
@@ -69,7 +69,7 @@ unless RUBY_PLATFORM =~ /java/
       end
 
       it "returns a valid HTTPI::Response" do
-        adapter.request(:put).should match_response(:body => Fixture.xml)
+        expect(adapter.request(:put)).to match_response(:body => Fixture.xml)
       end
     end
 
@@ -91,7 +91,7 @@ unless RUBY_PLATFORM =~ /java/
       end
 
       it "returns a valid HTTPI::Response" do
-        adapter.request(:delete).should match_response(:body => "")
+        expect(adapter.request(:delete)).to match_response(:body => "")
       end
     end
 
@@ -218,6 +218,42 @@ unless RUBY_PLATFORM =~ /java/
         end
       end
 
+      context "(for SSL without auth)" do
+        let(:request) do
+          request = HTTPI::Request.new("http://example.com")
+          request.ssl = true
+          request
+        end
+
+        context 'sets ssl_version' do
+          it 'defaults to nil when no ssl_version is specified' do
+            curb.expects(:ssl_version=).with(nil)
+            adapter.request(:get)
+          end
+
+          it 'to 1 when ssl_version is specified as TLSv1' do
+            request.auth.ssl.ssl_version = :TLSv1
+            curb.expects(:ssl_version=).with(1)
+
+            adapter.request(:get)
+          end
+
+          it 'to 2 when ssl_version is specified as SSLv2' do
+            request.auth.ssl.ssl_version = :SSLv2
+            curb.expects(:ssl_version=).with(2)
+
+            adapter.request(:get)
+          end
+
+          it 'to 3 when ssl_version is specified as SSLv3' do
+            request.auth.ssl.ssl_version = :SSLv3
+            curb.expects(:ssl_version=).with(3)
+
+            adapter.request(:get)
+          end
+        end
+      end
+
       context "(for SSL client auth)" do
         let(:request) do
           request = HTTPI::Request.new("http://example.com")
@@ -261,34 +297,6 @@ unless RUBY_PLATFORM =~ /java/
 
           adapter.request(:get)
         end
-
-        context 'sets ssl_version' do
-          it 'defaults to nil when no ssl_version is specified' do
-            curb.expects(:ssl_version=).with(nil)
-            adapter.request(:get)
-          end
-
-          it 'to 1 when ssl_version is specified as TLSv1' do
-            request.auth.ssl.ssl_version = :TLSv1
-            curb.expects(:ssl_version=).with(1)
-
-            adapter.request(:get)
-          end
-
-          it 'to 2 when ssl_version is specified as SSLv2' do
-            request.auth.ssl.ssl_version = :SSLv2
-            curb.expects(:ssl_version=).with(2)
-
-            adapter.request(:get)
-          end
-
-          it 'to 3 when ssl_version is specified as SSLv3' do
-            request.auth.ssl.ssl_version = :SSLv3
-            curb.expects(:ssl_version=).with(3)
-
-            adapter.request(:get)
-          end
-        end
       end
     end
 

data/spec/httpi/adapter/em_http_spec.rb

@@ -24,7 +24,7 @@ begin
           with(:query => nil, :head => {}, :body => nil).
           returns(http_message)
 
-        adapter.request(:get).should match_response(:body => Fixture.xml)
+        expect(adapter.request(:get)).to match_response(:body => Fixture.xml)
       end
     end
 
@@ -35,7 +35,7 @@ begin
           returns(http_message)
 
         request.body = Fixture.xml
-        adapter.request(:post).should match_response(:body => Fixture.xml)
+        expect(adapter.request(:post)).to match_response(:body => Fixture.xml)
       end
     end
 
@@ -45,7 +45,7 @@ begin
           with(:query => nil, :head => {}, :body => nil).
           returns(http_message)
 
-        adapter.request(:head).should match_response(:body => Fixture.xml)
+        expect(adapter.request(:head)).to match_response(:body => Fixture.xml)
       end
     end
 
@@ -56,7 +56,7 @@ begin
           returns(http_message)
 
         request.body = Fixture.xml
-        adapter.request(:put).should match_response(:body => Fixture.xml)
+        expect(adapter.request(:put)).to match_response(:body => Fixture.xml)
       end
     end
 
@@ -66,7 +66,7 @@ begin
           with(:query => nil, :head => {}, :body => nil).
           returns(http_message(""))
 
-        adapter.request(:delete).should match_response(:body => "")
+        expect(adapter.request(:delete)).to match_response(:body => "")
       end
     end
 
@@ -76,7 +76,7 @@ begin
           with(:query => nil, :head => {}, :body => nil).
           returns(http_message(""))
 
-        adapter.request(:custom).should match_response(:body => "")
+        expect(adapter.request(:custom)).to match_response(:body => "")
       end
     end
 

data/spec/httpi/adapter/excon_spec.rb

@@ -19,37 +19,37 @@ describe HTTPI::Adapter::Excon do
       request.headers["X-Header"] = "HTTPI"
 
       response = HTTPI.get(request, adapter)
-      response.body.should include("HTTPI")
+      expect(response.body).to include("HTTPI")
     end
 
     it "executes GET requests" do
       response = HTTPI.get(@server.url, adapter)
-      response.body.should eq("get")
-      response.headers["Content-Type"].should eq("text/plain")
+      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)
-      response.body.should eq("post")
-      response.headers["Content-Type"].should eq("text/plain")
+      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)
-      response.code.should == 200
-      response.headers["Content-Type"].should eq("text/plain")
+      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)
-      response.body.should eq("put")
-      response.headers["Content-Type"].should eq("text/plain")
+      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)
-      response.body.should eq("delete")
-      response.headers["Content-Type"].should eq("text/plain")
+      expect(response.body).to eq("delete")
+      expect(response.headers["Content-Type"]).to eq("text/plain")
     end
 
     it "supports basic authentication" do
@@ -57,7 +57,7 @@ describe HTTPI::Adapter::Excon do
       request.auth.basic("admin", "secret")
 
       response = HTTPI.get(request, adapter)
-      response.body.should eq("basic-auth")
+      expect(response.body).to eq("basic-auth")
     end
 
     it "does not support ntlm authentication" do