savon 2.0.1 → 2.0.2

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 2.0.2 (2012-12-20)
+
+* Fix: [#297](https://github.com/savonrb/savon/issues/297#issuecomment-11536517) added the global
+  `:ssl_verify_mode` and `:ssl_version` options which were missing.
+
+* Fix: [#344](https://github.com/savonrb/savon/issues/344) added missing global ssl cert options
+  `:ssl_cert_file`, `:ssl_cert_key_file` and `:ssl_ca_cert_file`.
+
 ## 2.0.1 (2012-12-19)
 
 * Fix [#342](https://github.com/savonrb/savon/issues/342) fixes an issue where namespaces could

data/Gemfile

@@ -1,4 +1,4 @@
 source :rubygems
 gemspec
 
-gem "httpclient", "~> 2.1.5"
+gem "httpclient", "~> 2.3.0"

data/lib/savon/options.rb

@@ -180,6 +180,31 @@ module Savon
       @options[:last_response] = last_response
     end
 
+    # Specifies the SSL version to use.
+    def ssl_version(version)
+      @options[:ssl_version] = version
+    end
+
+    # Whether and how to to verify the connection.
+    def ssl_verify_mode(verify_mode)
+      @options[:ssl_verify_mode] = verify_mode
+    end
+
+    # Sets the cert key file to use.
+    def ssl_cert_key_file(file)
+      @options[:ssl_cert_key_file] = file
+    end
+
+    # Sets the cert file to use.
+    def ssl_cert_file(file)
+      @options[:ssl_cert_file] = file
+    end
+
+    # Sets the ca cert file to use.
+    def ssl_ca_cert_file(file)
+      @options[:ssl_ca_cert_file] = file
+    end
+
     # HTTP basic auth credentials.
     def basic_auth(*credentials)
       @options[:basic_auth] = credentials.flatten

data/lib/savon/request.rb

@@ -36,22 +36,45 @@ module Savon
 
     def create_http_client
       http = HTTPI::Request.new
-      http.url = @globals[:endpoint] || @wsdl.endpoint
 
+      configure_request(http)
+      configure_timeouts(http)
+      configure_headers(http)
+      configure_ssl(http)
+      configure_auth(http)
+
+      http
+    end
+
+    def configure_request(http)
+      http.url = @globals[:endpoint] || @wsdl.endpoint
       http.proxy = @globals[:proxy] if @globals.include? :proxy
       http.set_cookies @globals[:last_response] if @globals.include? :last_response
+    end
 
+    def configure_timeouts(http)
       http.open_timeout = @globals[:open_timeout] if @globals.include? :open_timeout
       http.read_timeout = @globals[:read_timeout] if @globals.include? :read_timeout
+    end
 
+    def configure_headers(http)
       http.headers = @globals[:headers] if @globals.include? :headers
       http.headers["SOAPAction"] ||= %{"#{soap_action}"} if soap_action
       http.headers["Content-Type"] = CONTENT_TYPE[@globals[:soap_version]] % @globals[:encoding]
+    end
 
+    def configure_ssl(http)
+      http.auth.ssl.ssl_version = @globals[:ssl_version] if @globals.include? :ssl_version
+      http.auth.ssl.verify_mode = @globals[:ssl_verify_mode] if @globals.include? :ssl_verify_mode
+
+      http.auth.ssl.cert_key_file = @globals[:ssl_cert_key_file] if @globals.include? :ssl_cert_key_file
+      http.auth.ssl.cert_file = @globals[:ssl_cert_file] if @globals.include? :ssl_cert_file
+      http.auth.ssl.ca_cert_file = @globals[:ssl_ca_cert_file] if @globals.include? :ssl_ca_cert_file
+    end
+
+    def configure_auth(http)
       http.auth.basic(*@globals[:basic_auth]) if @globals.include? :basic_auth
       http.auth.digest(*@globals[:digest_auth]) if @globals.include? :digest_auth
-
-      http
     end
 
     def soap_action

data/lib/savon/version.rb

@@ -1,5 +1,5 @@
 module Savon
 
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 
 end

data/spec/fixtures/ssl/client_cert.pem

@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE-----
+MIICbTCCAdYCCQDC4v8d04615DANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJE
+RTEQMA4GA1UECBMHSGFtYnVyZzEQMA4GA1UEBxMHSGFtYnVyZzEOMAwGA1UEChMF
+aHR0cGkxFDASBgNVBAMTC2V4YW1wbGUuY29tMSIwIAYJKoZIhvcNAQkBFhNleGFt
+cGxlQGV4YW1wbGUuY29tMB4XDTEwMTAxNTE4NTg0N1oXDTExMTAxNTE4NTg0N1ow
+ezELMAkGA1UEBhMCREUxEDAOBgNVBAgTB0hhbWJ1cmcxEDAOBgNVBAcTB0hhbWJ1
+cmcxDjAMBgNVBAoTBWh0dHBpMRQwEgYDVQQDEwtleGFtcGxlLmNvbTEiMCAGCSqG
+SIb3DQEJARYTZXhhbXBsZUBleGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOB
+jQAwgYkCgYEAvJiaojIFQAbFczXkBmjxpxra9LbQm0VIESFSl8uBSjmG/gmCBwKg
+8O94P3tAjDNClC+fEqBLE37KH4qe76yw7upgRruP5jQzUEL1yCaVtA/DoqgaCxZy
+7VhB2A3f71Zw6kQPt3BOME68fnGsTX65x9XAawCGzGmJSk/Z6wvml1MCAwEAATAN
+BgkqhkiG9w0BAQUFAAOBgQCxOyni9LOKf17vUKVG8Y4TBzRYwm8/hlEdVEU3JKG0
+/aCCwIJLHl+z+3L4r81IN3+YKrHilqx9K0emboJbBRQklYsv/AE+J44Bq3llRiro
+0e5zwH61jb1j+kxhcxoGiiy8R7hYho24ljuMgFGqtK3kZSP/t9tBLLVp+ItWQ6xX
+5g==
+-----END CERTIFICATE-----

data/spec/fixtures/ssl/client_key.pem

@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQC8mJqiMgVABsVzNeQGaPGnGtr0ttCbRUgRIVKXy4FKOYb+CYIH
+AqDw73g/e0CMM0KUL58SoEsTfsofip7vrLDu6mBGu4/mNDNQQvXIJpW0D8OiqBoL
+FnLtWEHYDd/vVnDqRA+3cE4wTrx+caxNfrnH1cBrAIbMaYlKT9nrC+aXUwIDAQAB
+AoGBAKjrGh1KJg+pwPInA5yGJGMil5h1obRgwmKtcPeKi7u6eOFSDMdQoGwMYKyj
+LTYlt21Yleat8XB9sHW9yAstpq5dU8Id2A4wfbJeaBYpek7u5+QwBENO4UrnulTk
+W0d+jECBVYECn8wCStxfoFcQQRhlGrsOn05379cD8e1odMOJAkEA3o/7CsgXqahG
+7L1HaWYtKnpFfTS+EQgdGvSahOolByAKTtMA2TUBU1FdlCk+ggWBGorqmWON5Qnm
+7UDHjOasZQJBANjuPOqa9ubqHccGwHec+72pQz6q5e8f1gf1XPn7EEuXsBzYiMMH
+qEa8zpfF0TmhQ0oWN75Cq709gfVVBfx/bVcCQHan1HN/Ef6FlKqKjxQGQXYwEfQa
+tmpmJP5GAktyeaM+1cAIhp9GvxooeveOtaCkRpxcC48ToIbHrLI4oyrfoHECQQC6
+bAHtmz6TMp5ka2j7Yez1EIC5WiQ/WxyTukgsi5V1YOX35B2jfPEf2SGxTE6BOBSb
+lnxRBPqRpkoIiwiZ9OgBAkBOWKBuHXmXM6wr+0p4KQ/DOeStZiBxUT8rYbX/i1BI
+/9Xo48KNerTx7qoDK+jIslDrilahvcwUz0fuVV7rHy/X
+-----END RSA PRIVATE KEY-----

data/spec/integration/ratp_example_spec.rb

@@ -16,20 +16,6 @@ describe "RATP example" do
     end
 
     response = client.call(:get_stations) do
-      # For the corrent values to pass for :from_unit and :to_unit, I searched the WSDL for
-      # the "FromUnit" type which is a "TemperatureUnit" enumeration that looks like this:
-      #
-      # <s:simpleType name="TemperatureUnit">
-      #   <s:restriction base="s:string">
-      #     <s:enumeration value="degreeCelsius"/>
-      #     <s:enumeration value="degreeFahrenheit"/>
-      #     <s:enumeration value="degreeRankine"/>
-      #     <s:enumeration value="degreeReaumur"/>
-      #     <s:enumeration value="kelvin"/>
-      #   </s:restriction>
-      # </s:simpleType>
-      #
-      # Support for XS schema types needs to be improved.
       message(:station => { :id => 1975 }, :limit => 1)
     end
 

data/spec/savon/options_spec.rb

@@ -75,18 +75,18 @@ describe "Options" do
 
   context "global :encoding" do
     it "changes the XML instruction" do
-      client = new_client(:endpoint => @server.url(:repeat), :encoding => "UTF-16")
+      client = new_client(:endpoint => @server.url(:repeat), :encoding => "ISO-8859-1")
       response = client.call(:authenticate)
 
-      expect(response.http.body).to match(/<\?xml version="1\.0" encoding="UTF-16"\?>/)
+      expect(response.http.body).to match(/<\?xml version="1\.0" encoding="ISO-8859-1"\?>/)
     end
 
     it "changes the Content-Type header" do
-      client = new_client(:endpoint => @server.url(:inspect_header), :encoding => "UTF-16",
+      client = new_client(:endpoint => @server.url(:inspect_header), :encoding => "ISO-8859-1",
                           :headers => { "Inspect" => "CONTENT_TYPE" })
 
       response = client.call(:authenticate)
-      expect(response.http.body).to eq("text/xml;charset=UTF-16")
+      expect(response.http.body).to eq("text/xml;charset=ISO-8859-1")
     end
   end
 
@@ -255,6 +255,54 @@ describe "Options" do
     end
   end
 
+  context "global :ssl_version" do
+    it "sets the SSL version to use" do
+      HTTPI::Auth::SSL.any_instance.expects(:ssl_version=).with(:SSLv3)
+
+      client = new_client(:endpoint => @server.url, :ssl_version => :SSLv3)
+      client.call(:authenticate)
+    end
+  end
+
+  context "global :ssl_verify_mode" do
+    it "sets the verify mode to use" do
+      HTTPI::Auth::SSL.any_instance.expects(:verify_mode=).with(:none)
+
+      client = new_client(:endpoint => @server.url, :ssl_verify_mode => :none)
+      client.call(:authenticate)
+    end
+  end
+
+  context "global :ssl_cert_key_file" do
+    it "sets the cert key file to use" do
+      cert_key = File.expand_path("../../fixtures/ssl/client_key.pem", __FILE__)
+      HTTPI::Auth::SSL.any_instance.expects(:cert_key_file=).with(cert_key)
+
+      client = new_client(:endpoint => @server.url, :ssl_cert_key_file => cert_key)
+      client.call(:authenticate)
+    end
+  end
+
+  context "global :ssl_cert_file" do
+    it "sets the cert file to use" do
+      cert = File.expand_path("../../fixtures/ssl/client_cert.pem", __FILE__)
+      HTTPI::Auth::SSL.any_instance.expects(:cert_file=).with(cert)
+
+      client = new_client(:endpoint => @server.url, :ssl_cert_file => cert)
+      client.call(:authenticate)
+    end
+  end
+
+  context "global :ssl_ca_cert_file" do
+    it "sets the ca cert file to use" do
+      ca_cert = File.expand_path("../../fixtures/ssl/client_cert.pem", __FILE__)
+      HTTPI::Auth::SSL.any_instance.expects(:ca_cert_file=).with(ca_cert)
+
+      client = new_client(:endpoint => @server.url, :ssl_ca_cert_file => ca_cert)
+      client.call(:authenticate)
+    end
+  end
+
   context "global :basic_auth" do
     it "sets the basic auth credentials" do
       client = new_client(:endpoint => @server.url(:basic_auth), :basic_auth => ["admin", "secret"])
@@ -410,7 +458,7 @@ describe "Options" do
       end
 
       response = client.call(:find_user) do |locals|
-        locals.message(user_name: "luke", "pass_word" => "secret")
+        locals.message(:user_name => "luke", "pass_word" => "secret")
       end
 
       request = response.http.body
@@ -486,7 +534,10 @@ describe "Options" do
   context "request :message" do
     it "accepts a Hash which is passed to Gyoku to be converted to XML" do
       response = new_client(:endpoint => @server.url(:repeat)).call(:authenticate, :message => { :user => "luke", :password => "secret" })
-      expect(response.http.body).to include("<tns:authenticate><user>luke</user><password>secret</password></tns:authenticate>")
+
+      request = response.http.body
+      expect(request).to include("<user>luke</user>")
+      expect(request).to include("<password>secret</password>")
     end
 
     it "also accepts a String of raw XML" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: savon
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-19 00:00:00.000000000 Z
+date: 2012-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nori
@@ -248,6 +248,8 @@ files:
 - spec/fixtures/response/soap_fault.xml
 - spec/fixtures/response/soap_fault12.xml
 - spec/fixtures/response/taxcloud.xml
+- spec/fixtures/ssl/client_cert.pem
+- spec/fixtures/ssl/client_key.pem
 - spec/fixtures/wsdl/authentication.xml
 - spec/fixtures/wsdl/lower_camel.xml
 - spec/fixtures/wsdl/multiple_namespaces.xml
@@ -290,7 +292,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2358911871960345880
+      hash: 2724646448334842614
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -299,7 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2358911871960345880
+      hash: 2724646448334842614
 requirements: []
 rubyforge_project: savon
 rubygems_version: 1.8.24