savon 2.10.1 → 2.12.1

data/spec/fixtures/wsdl/elements_in_types.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<wsdl:definitions xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:tns="www.example.com/XML" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:s1="http://microsoft.com/wsdl/types/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" targetNamespace="www.example.com/XML" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+  <wsdl:types>
+    <s:schema elementFormDefault="qualified" targetNamespace="www.example.com/XML">
+      <s:complexType name="Transaction" abstract="true">
+        <s:sequence>
+          <s:element minOccurs="0" maxOccurs="1" name="Qualified" type="s:string" />
+        </s:sequence>
+      </s:complexType>
+      <s:complexType name="TopLevelTransaction">
+        <s:complexContent mixed="false">
+          <s:extension base="tns:Transaction">
+          </s:extension>
+        </s:complexContent>
+      </s:complexType>
+      <s:element name="TopLevelTransaction">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="TopLevelTransaction" type="tns:TopLevelTransaction" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+    </s:schema>
+  </wsdl:types>
+  <wsdl:message name="TopLevelTransactionSoapIn">
+    <wsdl:part name="parameters" element="tns:TopLevelTransaction" />
+  </wsdl:message>
+  <wsdl:portType name="XMLTESoap">
+    <wsdl:operation name="TopLevelTransaction">
+      <wsdl:documentation xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">TopLevelTransaction.</wsdl:documentation>
+      <wsdl:input message="tns:TopLevelTransactionSoapIn" />
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="XMLTESoap12" type="tns:XMLTESoap">
+    <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" />
+    <wsdl:operation name="TopLevelTransaction">
+      <soap12:operation soapAction="www.example.com/XML/TopLevelTransaction" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+    </wsdl:operation>
+  </wsdl:binding>
+</wsdl:definitions>

data/spec/integration/centra_spec.rb

@@ -2,14 +2,16 @@ require 'spec_helper'
 
 module LogInterceptor
   @@intercepted_request = ""
-  def self.debug(message)
+  def self.debug(message = nil)
+    message ||= yield if block_given?
+
     # save only the first XMLly message
     if message.include? "xml version"
       @@intercepted_request = message if @@intercepted_request == ""
     end
   end
 
-  def self.info(message)
+  def self.info(message = nil)
   end
 
   def self.get_intercepted_request
@@ -27,6 +29,7 @@ describe 'Correct translation of attributes to XML' do
 
     client = Savon.client(
       :wsdl => "http://mt205.sabameeting.com/CWS/CWS.asmx?WSDL",
+      :log => true,
       :logger => LogInterceptor
     )
 
@@ -48,14 +51,12 @@ describe 'Correct translation of attributes to XML' do
 
     client = Savon.client(
       :wsdl => "http://mt205.sabameeting.com/CWS/CWS.asmx?WSDL",
+      :log => true,
       :logger => LogInterceptor
     )
 
     response = nil
-    begin
-      response = call_and_fail_gracefully(client, :add_new_user, :message => { :user => {}, :attributes! => { :user => { :userID => "test" } } })
-    rescue
-    end
+    response = call_and_fail_gracefully(client, :add_new_user, :message => { :user => {}, :attributes! => { :user => { :userID => "test" } } })
 
     xml_doc = Nokogiri::XML(LogInterceptor.get_intercepted_request)
     xml_doc.remove_namespaces!

data/spec/integration/random_quote_spec.rb

@@ -16,7 +16,7 @@ describe 'rpc/encoded binding test' do
       $stderr.puts e.to_hash.inspect
       f_c = e.to_hash[:fault][:faultstring]
       expect(f_c).not_to  eq('No such operation \'getQuoteRequest\'')
-      expect(f_c).to eq('soapenv:Server.userException')
+      expect(f_c).to eq('lucee.runtime.exp.DatabaseException: ')
       pending e
     end
   end

data/spec/integration/stockquote_example_spec.rb

@@ -19,6 +19,12 @@ describe "Stockquote example" do
 
     cdata = response.body[:get_quote_response][:get_quote_result]
 
+    if cdata == "exception"
+      # Fallback to not fail the specs when the service's API limit is reached,
+      # but to mark the spec as pending instead.
+      pending "Exception on API"
+    end
+
     nori_options = { :convert_tags_to => lambda { |tag| tag.snakecase.to_sym } }
     result = Nori.new(nori_options).parse(cdata)
 

data/spec/integration/support/application.rb

@@ -1,4 +1,4 @@
-require "rack/builder"
+require "rack"
 require "json"
 
 class IntegrationServer

data/spec/savon/builder_spec.rb

@@ -83,10 +83,19 @@ describe Savon::Builder do
     end
 
     describe "#wsse_signature" do
-      let(:private_key) { "spec/fixtures/ssl/client_key.pem" }
-      let(:cert)        { "spec/fixtures/ssl/client_cert.pem" }
-      let(:signature)   { Akami::WSSE::Signature.new(Akami::WSSE::Certs.new(:cert_file => cert, :private_key_file => private_key))}
-      let(:globals)     { Savon::GlobalOptions.new(wsse_signature: signature) }
+      fixture_dir = File.join(File.dirname(__FILE__), '..', 'fixtures', 'ssl')
+
+      let(:cert)        { File.join(fixture_dir, 'client_cert.pem') }
+      let(:private_key) { File.join(fixture_dir, 'client_key.pem') }
+      let(:signature) do
+        Akami::WSSE::Signature.new(
+          Akami::WSSE::Certs.new(
+            :cert_file => cert,
+            :private_key_file => private_key
+          )
+        )
+      end
+      let(:globals) { Savon::GlobalOptions.new(wsse_signature: signature) }
 
       subject(:signed_message_nn) {Nokogiri::XML(builder.to_s).remove_namespaces!}
       subject(:signed_message) {Nokogiri::XML(builder.to_s)}

data/spec/savon/log_message_spec.rb

@@ -21,9 +21,15 @@ describe Savon::LogMessage do
     expect(message).to include("\n  <body>")
   end
 
-  it "filters tags in a given message" do
+  it "filters tags in a given message without pretty printing" do
     message = log_message("<root><password>secret</password></root>", [:password], false).to_s
     expect(message).to include("<password>***FILTERED***</password>")
+    expect(message).to_not include("\n  <password>***FILTERED***</password>") # no pretty printing
+  end
+
+  it "filters tags in a given message with pretty printing" do
+    message = log_message("<root><password>secret</password></root>", [:password], true).to_s
+    expect(message).to include("\n  <password>***FILTERED***</password>")
   end
 
   it "properly applies Proc filter" do

data/spec/savon/mock_spec.rb

@@ -23,6 +23,17 @@ describe "Savon's mock interface" do
     expect(response.http.body).to eq("<fixture/>")
   end
 
+  it "can verify a request with any parameters and return a fixture response" do
+    message = { :username => "luke", :password => :any }
+    savon.expects(:authenticate).with(:message => message).returns("<fixture/>")
+
+    response = new_client.call(:authenticate) do
+      message(:username => "luke", :password => "secret")
+    end
+
+    expect(response.http.body).to eq("<fixture/>")
+  end
+
   it "accepts a Hash to specify the response code, headers and body" do
     soap_fault = Fixture.response(:soap_fault)
     response = { :code => 500, :headers => { "X-Result" => "invalid" }, :body => soap_fault }

data/spec/savon/options_spec.rb

@@ -114,6 +114,15 @@ describe "Options" do
     end
   end
 
+  context "global :host" do
+    it "overrides the WSDL endpoint host" do
+      client = new_client(:wsdl => Fixture.wsdl(:no_message_tag), host: "https://example.com:8080")
+
+      request = client.build_request(:update_orders)
+      expect(request.url.to_s).to eq "https://example.com:8080/webserviceexternal/contracts.asmx"
+    end
+  end
+
   context "global :headers" do
     it "sets the HTTP headers for the next request" do
       client = new_client(:endpoint => @server.url(:inspect_request), :headers => { "X-Token" => "secret" })
@@ -210,6 +219,17 @@ describe "Options" do
       expect(response.http.body).to include("<user>lea</user>")
       expect(response.http.body).to include("<password>top-secret</password>")
     end
+
+    it "qualifies elements embedded in complex types" do
+      client = new_client(:endpoint => @server.url(:repeat),
+                          :wsdl => Fixture.wsdl(:elements_in_types))
+      msg = {":TopLevelTransaction"=>{":Qualified"=>"A Value"}}
+
+      response = client.call(:top_level_transaction, :message => msg)
+
+      expect(response.http.body.scan(/<tns:Qualified>/).count).to eq(1)
+    end
+
   end
 
   context "global :env_namespace" do
@@ -380,18 +400,27 @@ describe "Options" do
 
   context "global :ssl_version" do
     it "sets the SSL version to use" do
-      HTTPI::Auth::SSL.any_instance.expects(:ssl_version=).with(:SSLv3).twice
+      HTTPI::Auth::SSL.any_instance.expects(:ssl_version=).with(:TLSv1).twice
 
-      client = new_client(:endpoint => @server.url, :ssl_version => :SSLv3)
+      client = new_client(:endpoint => @server.url, :ssl_version => :TLSv1)
       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).twice
+      HTTPI::Auth::SSL.any_instance.expects(:verify_mode=).with(:peer).twice
+
+      client = new_client(:endpoint => @server.url, :ssl_verify_mode => :peer)
+      client.call(:authenticate)
+    end
+  end
+
+  context "global :ssl_ciphers" do
+    it "sets the ciphers to use" do
+      HTTPI::Auth::SSL.any_instance.expects(:ciphers=).with(:none).twice
 
-      client = new_client(:endpoint => @server.url, :ssl_verify_mode => :none)
+      client = new_client(:endpoint => @server.url, :ssl_ciphers => :none)
       client.call(:authenticate)
     end
   end
@@ -460,6 +489,26 @@ describe "Options" do
     end
   end
 
+  context "global :ssl_ca_cert_path" do
+    it "sets the ca cert path to use" do
+      ca_cert_path = "../../fixtures/ssl"
+      HTTPI::Auth::SSL.any_instance.expects(:ca_cert_path=).with(ca_cert_path).twice
+
+      client = new_client(:endpoint => @server.url, :ssl_ca_cert_path => ca_cert_path)
+      client.call(:authenticate)
+    end
+  end
+
+  context "global :ssl_ca_cert_store" do
+    it "sets the cert store to use" do
+      cert_store = OpenSSL::X509::Store.new
+      HTTPI::Auth::SSL.any_instance.expects(:cert_store=).with(cert_store).twice
+
+      client = new_client(:endpoint => @server.url, :ssl_cert_store => cert_store)
+      client.call(:authenticate)
+    end
+  end
+
   context "global :ssl_ca_cert" do
     it "sets the ca cert file to use" do
       ca_cert = File.open(File.expand_path("../../fixtures/ssl/client_cert.pem", __FILE__)).read
@@ -578,7 +627,7 @@ describe "Options" do
         expect(request).to include("<wsse:Username>#{username}</wsse:Username>")
 
         # the nonce node
-        expect(request).to match(/<wsse:Nonce.*>.+\n<\/wsse:Nonce>/)
+        expect(request).to match(/<wsse:Nonce.*>.+\n?<\/wsse:Nonce>/)
 
         # the created node with a timestamp
         expect(request).to match(/<wsu:Created>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.*<\/wsu:Created>/)
@@ -1037,6 +1086,17 @@ describe "Options" do
     end
   end
 
+  context "request :headers" do
+    it "sets headers" do
+      client = new_client(:endpoint => @server.url(:inspect_request))
+
+      response = client.call(:authenticate, :headers => { "X-Token" => "secret" })
+      x_token  = inspect_request(response).x_token
+
+      expect(x_token).to eq("secret")
+    end
+  end
+
   def new_client(globals = {}, &block)
     globals = { :wsdl => Fixture.wsdl(:authentication), :log => false }.merge(globals)
     Savon.client(globals, &block)

data/spec/savon/qualified_message_spec.rb

@@ -4,15 +4,96 @@ module Savon
   describe QualifiedMessage, "#to_hash" do
 
     context "if a key ends with !" do
-      it "restores the ! in a key" do
-        used_namespaces = {}
-        key_converter = :camelcase
-        types = {}
+      let(:used_namespaces) { {} }
+      let(:key_converter) { :camelcase }
+      let(:types) { {} }
 
+      it "restores the ! in a key" do
         message = described_class.new(types, used_namespaces, key_converter)
         resulting_hash = message.to_hash({:Metal! => "<Nice/>"}, ["Rock"])
 
-        expect(resulting_hash).to eq({"Metal!" => "<Nice/>"})
+        expect(resulting_hash).to eq({ :Metal! => "<Nice/>" })
+      end
+
+      it "properly handles special keys when namespaces are present" do
+        used_namespaces = {
+          %w(tns Foo) => 'ns',
+          %w(tns Foo Bar) => 'ns'
+        }
+
+        hash = {
+          :foo => {
+            :bar => {
+              :zing => 'pow'
+            },
+            :cash => {
+              :@attr1 => 'val1',
+              :content! => 'Chunky Bacon'
+            },
+            :attributes! => {
+              :bar => { :attr2 => 'val2' },
+            },
+            :"self_closing/" => '',
+            :order! => [:cash, :bar, :"self_closing/"]
+          }
+        }
+
+        good_result = {
+          "ns:Foo" => {
+            'ns:Bar' => { :zing => "pow" },
+            :cash => {
+              :@attr1 => "val1",
+              :content! => "Chunky Bacon"
+            },
+            :attributes! => {
+              'ns:Bar' => { :attr2 => 'val2' }
+            },
+            :"self_closing/" => '',
+            :order! => [:cash, 'ns:Bar', :"self_closing/"]
+          }
+        }
+
+        good_xml = %(<ns:Foo><Cash attr1="val1">Chunky Bacon</Cash><ns:Bar attr2="val2"><Zing>pow</Zing></ns:Bar><SelfClosing/></ns:Foo>)
+
+        message = described_class.new(types, used_namespaces, key_converter)
+        resulting_hash = message.to_hash(hash, ['tns'])
+        xml = Gyoku.xml(resulting_hash, key_converter: key_converter)
+
+        expect(resulting_hash).to eq good_result
+        expect(xml).to eq good_xml
+      end
+
+      it "properly handles boolean false" do
+        used_namespaces = {
+          %w(tns Foo) => 'ns'
+        }
+
+        hash = {
+          :foo => {
+            :falsey => {
+              :@attr1 => false,
+              :content! => false
+            }
+          }
+        }
+
+        good_result = {
+          "ns:Foo" => {
+            :falsey => {
+              :@attr1 => false,
+              :content! => false
+            }
+          }
+        }
+
+        good_xml = %(<ns:Foo><Falsey attr1="false">false</Falsey></ns:Foo>)
+
+        message = described_class.new(types, used_namespaces, key_converter)
+        resulting_hash = message.to_hash(hash, ['tns'])
+        xml = Gyoku.xml(resulting_hash, key_converter: key_converter)
+
+        expect(resulting_hash).to eq good_result
+        expect(xml).to eq good_xml
       end
     end
 

data/spec/savon/request_spec.rb

@@ -5,6 +5,7 @@ describe Savon::WSDLRequest do
 
   let(:globals)      { Savon::GlobalOptions.new }
   let(:http_request) { HTTPI::Request.new }
+  let(:ciphers)      { OpenSSL::Cipher.ciphers }
 
   def new_wsdl_request
     Savon::WSDLRequest.new(globals, http_request)
@@ -16,6 +17,20 @@ describe Savon::WSDLRequest do
       expect(wsdl_request.build).to be_an(HTTPI::Request)
     end
 
+    describe "headers" do
+      it "are set when specified" do
+        globals.headers("Proxy-Authorization" => "Basic auth")
+        configured_http_request = new_wsdl_request.build
+
+        expect(configured_http_request.headers["Proxy-Authorization"]).to eq("Basic auth")
+      end
+
+      it "are not set otherwise" do
+        configured_http_request = new_wsdl_request.build
+        expect(configured_http_request.headers).to_not include("Proxy-Authorization")
+      end
+    end
+
     describe "proxy" do
       it "is set when specified" do
         globals.proxy("http://proxy.example.com")
@@ -60,8 +75,8 @@ describe Savon::WSDLRequest do
 
     describe "ssl version" do
       it "is set when specified" do
-        globals.ssl_version(:SSLv3)
-        http_request.auth.ssl.expects(:ssl_version=).with(:SSLv3)
+        globals.ssl_version(:TLSv1)
+        http_request.auth.ssl.expects(:ssl_version=).with(:TLSv1)
 
         new_wsdl_request.build
       end
@@ -74,8 +89,8 @@ describe Savon::WSDLRequest do
 
     describe "ssl verify mode" do
       it "is set when specified" do
-        globals.ssl_verify_mode(:none)
-        http_request.auth.ssl.expects(:verify_mode=).with(:none)
+        globals.ssl_verify_mode(:peer)
+        http_request.auth.ssl.expects(:verify_mode=).with(:peer)
 
         new_wsdl_request.build
       end
@@ -86,6 +101,20 @@ describe Savon::WSDLRequest do
       end
     end
 
+    describe "ssl ciphers" do
+      it "is set when specified" do
+        globals.ssl_ciphers(ciphers)
+        http_request.auth.ssl.expects(:ciphers=).with(ciphers)
+
+        new_wsdl_request.build
+      end
+
+      it "is not set otherwise" do
+        http_request.auth.ssl.expects(:ciphers=).never
+        new_wsdl_request.build
+      end
+    end
+
     describe "ssl cert key file" do
       it "is set when specified" do
         cert_key = File.expand_path("../../fixtures/ssl/client_key.pem", __FILE__)
@@ -232,6 +261,7 @@ describe Savon::SOAPRequest do
 
   let(:globals)      { Savon::GlobalOptions.new }
   let(:http_request) { HTTPI::Request.new }
+  let(:ciphers)      { OpenSSL::Cipher.ciphers }
 
   def new_soap_request
     Savon::SOAPRequest.new(globals, http_request)
@@ -364,8 +394,8 @@ describe Savon::SOAPRequest do
 
     describe "ssl version" do
       it "is set when specified" do
-        globals.ssl_version(:SSLv3)
-        http_request.auth.ssl.expects(:ssl_version=).with(:SSLv3)
+        globals.ssl_version(:TLSv1)
+        http_request.auth.ssl.expects(:ssl_version=).with(:TLSv1)
 
         new_soap_request.build
       end
@@ -378,8 +408,8 @@ describe Savon::SOAPRequest do
 
     describe "ssl verify mode" do
       it "is set when specified" do
-        globals.ssl_verify_mode(:none)
-        http_request.auth.ssl.expects(:verify_mode=).with(:none)
+        globals.ssl_verify_mode(:peer)
+        http_request.auth.ssl.expects(:verify_mode=).with(:peer)
 
         new_soap_request.build
       end
@@ -390,6 +420,20 @@ describe Savon::SOAPRequest do
       end
     end
 
+    describe "ssl ciphers" do
+      it "is set when specified" do
+        globals.ssl_ciphers(ciphers)
+        http_request.auth.ssl.expects(:ciphers=).with(ciphers)
+
+        new_soap_request.build
+      end
+
+      it "is not set otherwise" do
+        http_request.auth.ssl.expects(:ciphers=).never
+        new_soap_request.build
+      end
+    end
+
     describe "ssl cert key file" do
       it "is set when specified" do
         cert_key = File.expand_path("../../fixtures/ssl/client_key.pem", __FILE__)