Changes for certificate signing stuff in Akami.

lib/savon/client.rb

@@ -78,6 +78,11 @@ def request(*args, &block)
 
       response = SOAP::Request.new(http, soap).response
       set_cookie response.http.headers
+
+      if wsse.verify_response
+        WSSE::VerifySignature.new(response.http.body).verify!
+      end
+
       response
     end
 

lib/savon/soap/request.rb

@@ -38,7 +38,20 @@ def response
       # Configures a given +http+ from the +soap+ object.
       def configure(http)
         http.url = soap.endpoint
-        http.body = soap.to_xml
+
+        if soap.signature?
+          # First generate the document so that Signature can digest sections
+          soap.wsse.signature.document = soap.to_xml(true)
+
+          # Then re-generate the document so that Signature can sign the digest
+          soap.wsse.signature.document = soap.to_xml(true)
+
+          # The third time we generate the document, we should have a signature
+          http.body = soap.to_xml(true)
+        else
+          http.body = soap.to_xml
+        end
+
         http.headers["Content-Type"] = ContentType[soap.version]
         http.headers["Content-Length"] = soap.to_xml.bytesize.to_s
         http

lib/savon/soap/xml.rb

@@ -1,5 +1,6 @@
 require "builder"
 require "gyoku"
+require "rexml/document"
 require "nori"
 
 require "savon/soap"
@@ -119,6 +120,10 @@ def namespace_identifier
       # Accessor for the <tt>Savon::WSSE</tt> object.
       attr_accessor :wsse
 
+      def signature?
+        wsse.respond_to?(:signature?) && wsse.signature?
+      end
+
       # Returns the SOAP request encoding. Defaults to "UTF-8".
       def encoding
         @encoding ||= "UTF-8"
@@ -148,14 +153,23 @@ def xml(directive_tag = :xml, attrs = {})
       attr_writer :xml
 
       # Returns the XML for a SOAP request.
-      def to_xml
+      def to_xml(clear_cache = false)
+        if clear_cache
+          @xml = nil
+          @header_for_xml = nil
+        end
+
         @xml ||= tag(builder, :Envelope, complete_namespaces) do |xml|
           tag(xml, :Header) { xml << header_for_xml } unless header_for_xml.empty?
 
+          # TODO: Maybe there should be some sort of plugin architecture where
+          #       classes like WSSE::Signature can hook into this process.
+          body_attributes = (signature? ? wsse.signature.body_attributes : {})
+
           if input.nil?
-            tag(xml, :Body)
+            tag(xml, :Body, body_attributes)
           else
-            tag(xml, :Body) { xml.tag!(*add_namespace_to_input) { xml << body_to_xml } }
+            tag(xml, :Body, body_attributes) { xml.tag!(*add_namespace_to_input) { xml << body_to_xml } }
           end
         end
       end