httpi 0.7.1 → 0.7.2

data/lib/httpi/adapter/httpclient.rb

@@ -83,9 +83,11 @@ module HTTPI
       end
 
       def setup_ssl_auth(ssl)
-        client.ssl_config.client_cert = ssl.cert
-        client.ssl_config.client_key = ssl.cert_key
-        client.ssl_config.client_ca = ssl.ca_cert if ssl.ca_cert_file
+        unless ssl.verify_mode == :none
+          client.ssl_config.client_cert = ssl.cert
+          client.ssl_config.client_key = ssl.cert_key
+          client.ssl_config.client_ca = ssl.ca_cert if ssl.ca_cert_file
+        end
         client.ssl_config.verify_mode = ssl.openssl_verify_mode
       end
 

data/lib/httpi/auth/ssl.rb

@@ -12,7 +12,7 @@ module HTTPI
 
       # Returns whether SSL configuration is present.
       def present?
-        cert && cert_key
+        (verify_mode == :none) || (cert && cert_key)
       rescue TypeError, Errno::ENOENT
         false
       end

data/lib/httpi/version.rb

@@ -1,5 +1,5 @@
 module HTTPI
 
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 
 end

data/spec/httpi/adapter/httpclient_spec.rb

@@ -27,7 +27,7 @@ describe HTTPI::Adapter::HTTPClient do
     it "should return a valid HTTPI::Response" do
       request = HTTPI::Request.new :url => "http://example.com", :body => Fixture.xml
       httpclient.expects(:post).with(request.url, request.body, request.headers).returns(http_message)
-      
+
       adapter.post(request).should match_response(:body => Fixture.xml)
     end
   end
@@ -43,7 +43,7 @@ describe HTTPI::Adapter::HTTPClient do
     it "should return a valid HTTPI::Response" do
       request = HTTPI::Request.new :url => "http://example.com", :body => Fixture.xml
       httpclient.expects(:put).with(request.url, request.body, request.headers).returns(http_message)
-      
+
       adapter.put(request).should match_response(:body => Fixture.xml)
     end
   end
@@ -118,17 +118,42 @@ describe HTTPI::Adapter::HTTPClient do
         ssl_config.expects(:client_cert=).with(ssl_auth_request.auth.ssl.cert)
         ssl_config.expects(:client_key=).with(ssl_auth_request.auth.ssl.cert_key)
         ssl_config.expects(:verify_mode=).with(ssl_auth_request.auth.ssl.openssl_verify_mode)
-        
+
         adapter.get(ssl_auth_request)
       end
 
       it "should set the client_ca if specified" do
         ssl_auth_request.auth.ssl.ca_cert_file = "spec/fixtures/client_cert.pem"
         ssl_config.expects(:client_ca=).with(ssl_auth_request.auth.ssl.ca_cert)
-        
+
         adapter.get(ssl_auth_request)
       end
     end
+
+    context "(for SSL client auth with a verify mode of :none with no certs provided)" do
+      let(:ssl_auth_request) do
+        basic_request do |request|
+          request.auth.ssl.verify_mode = :none
+        end
+      end
+
+      it "verify_mode should be set" do
+        ssl_config.expects(:verify_mode=).with(ssl_auth_request.auth.ssl.openssl_verify_mode)
+
+        adapter.get(ssl_auth_request)
+      end
+
+      it "should not set client_cert and client_key "do
+        ssl_config.expects(:client_cert=).never
+        ssl_config.expects(:client_key=).never
+
+        adapter.get(ssl_auth_request)
+      end
+
+      it "should raise an exception" do
+        lambda { adapter.get(ssl_auth_request)  }.should_not raise_error
+      end
+    end
   end
 
   def http_message(body = Fixture.xml)

data/spec/httpi/auth/ssl_spec.rb

@@ -18,20 +18,26 @@ describe HTTPI::Auth::SSL do
     it "should return false if only a client key was specified" do
       ssl = HTTPI::Auth::SSL.new
       ssl.cert_key_file = "spec/fixtures/client_key.pem"
-      
+
       ssl.should_not be_present
     end
 
     it "should return false if only a client key was specified" do
       ssl = HTTPI::Auth::SSL.new
       ssl.cert_file = "spec/fixtures/client_cert.pem"
-      
+
       ssl.should_not be_present
     end
 
     it "should return true if both client key and cert are present" do
       ssl.should be_present
     end
+
+    it "should return true of the verify_mode is :none" do
+      ssl = HTTPI::Auth::SSL.new
+      ssl.verify_mode = :none
+      ssl.should be_present
+    end
   end
 
   describe "#verify_mode" do
@@ -41,7 +47,7 @@ describe HTTPI::Auth::SSL do
 
     it "should set the verify mode to use" do
       ssl = HTTPI::Auth::SSL.new
-      
+
       ssl.verify_mode = :none
       ssl.verify_mode.should == :none
     end
@@ -66,7 +72,7 @@ describe HTTPI::Auth::SSL do
   describe "#ca_cert" do
     it "should return an OpenSSL::X509::Certificate for the given ca_cert_file" do
       ssl = HTTPI::Auth::SSL.new
-      
+
       ssl.ca_cert_file = "spec/fixtures/client_cert.pem"
       ssl.ca_cert.should be_a(OpenSSL::X509::Certificate)
     end
@@ -75,28 +81,28 @@ describe HTTPI::Auth::SSL do
   describe "#openssl_verify_mode" do
     it "should return the OpenSSL verify mode for :none" do
       ssl = HTTPI::Auth::SSL.new
-      
+
       ssl.verify_mode = :none
       ssl.openssl_verify_mode.should == OpenSSL::SSL::VERIFY_NONE
     end
 
     it "should return the OpenSSL verify mode for :peer" do
       ssl = HTTPI::Auth::SSL.new
-      
+
       ssl.verify_mode = :peer
       ssl.openssl_verify_mode.should == OpenSSL::SSL::VERIFY_PEER
     end
 
     it "should return the OpenSSL verify mode for :fail_if_no_peer_cert" do
       ssl = HTTPI::Auth::SSL.new
-      
+
       ssl.verify_mode = :fail_if_no_peer_cert
       ssl.openssl_verify_mode.should == OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
     end
 
     it "should return the OpenSSL verify mode for :client_once" do
       ssl = HTTPI::Auth::SSL.new
-      
+
       ssl.verify_mode = :client_once
       ssl.openssl_verify_mode.should == OpenSSL::SSL::VERIFY_CLIENT_ONCE
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: httpi
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 7
-  - 1
-  version: 0.7.1
+  - 2
+  version: 0.7.2
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-23 00:00:00 +01:00
+date: 2010-12-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency