Don't include Nonce and Created for PasswordText.

savonrb · Jan 11, 2011 · 4e57b31 · 4e57b31
1 parent 26b4eae
commit 4e57b31
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/lib/savon/wsse.rb b/lib/savon/wsse.rb
@@ -81,12 +81,19 @@ def to_xml
 
     # Returns a Hash containing wsse:UsernameToken details.
     def wsse_username_token
-      wsse_security "UsernameToken",
-        "wsse:Username" => username,
-        "wsse:Nonce" => nonce,
-        "wsu:Created" => timestamp,
-        "wsse:Password" => password_value,
-        :attributes! => { "wsse:Password" => { "Type" => password_type } }
+      if digest?
+        wsse_security "UsernameToken",
+          "wsse:Username" => username,
+          "wsse:Nonce" => nonce,
+          "wsu:Created" => timestamp,
+          "wsse:Password" => password_value,
+          :attributes! => { "wsse:Password" => { "Type" => PasswordDigestURI } }
+      else
+        wsse_security "UsernameToken",
+          "wsse:Username" => username,
+          "wsse:Password" => password,
+          :attributes! => { "wsse:Password" => { "Type" => PasswordTextURI } }
+      end
     end
 
     # Returns a Hash containing wsse:Timestamp details.
@@ -107,19 +114,14 @@ def wsse_security(tag, hash)
       }
     end
 
-    # Returns the WSSE password. Encrypts the password for digest authentication.
+    # Returns the WSSE password, encrypted for digest authentication.
     def password_value
-      return password unless digest?
+      raise "internal error: digest only" unless digest?
 
       token = nonce + timestamp + password
       Base64.encode64(Digest::SHA1.hexdigest(token)).chomp!
     end
 
-    # Returns the URI for the "wsse:Password/@Type" attribute.
-    def password_type
-      digest? ? PasswordDigestURI : PasswordTextURI
-    end
-
     # Returns a WSSE nonce.
     def nonce
       @nonce ||= Digest::SHA1.hexdigest random_string + timestamp

diff --git a/spec/savon/wsse_spec.rb b/spec/savon/wsse_spec.rb
@@ -118,12 +118,12 @@
         wsse.to_xml.should include("username", "password")
       end
 
-      it "should contain a wsse:Nonce tag" do
-        wsse.to_xml.should match(/<wsse:Nonce>\w+<\/wsse:Nonce>/)
+      it "should not contain a wsse:Nonce tag" do
+        wsse.to_xml.should_not match(/<wsse:Nonce>.*<\/wsse:Nonce>/)
       end
 
-      it "should contain a wsu:Created tag" do
-        wsse.to_xml.should match(/<wsu:Created>#{Savon::SOAP::DateTimeRegexp}.+<\/wsu:Created>/)
+      it "should not contain a wsu:Created tag" do
+        wsse.to_xml.should_not match(/<wsu:Created>.*<\/wsu:Created>/)
       end
 
       it "should contain the PasswordText type attribute" do