saml_idp 0.0.5 → 0.0.6

data/lib/saml_idp/signed_info_builder.rb

@@ -2,6 +2,23 @@ require 'builder'
 module SamlIdp
   class SignedInfoBuilder
     include Algorithmable
+
+    SIGNATURE_METHODS = {
+      "sha1" => "http://www.w3.org/2000/09/xmldsig#rsa-sha1",
+      "sha224" => "http://www.w3.org/2001/04/xmldsig-more#rsa-sha224",
+      "sha256" => "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256",
+      "sha384" => "http://www.w3.org/2001/04/xmldsig-more#rsa-sha384",
+      "sha512" => "http://www.w3.org/2001/04/xmldsig-more#rsa-sha512",
+    }
+    DIGEST_METHODS = {
+      "sha1" => "http://www.w3.org/2000/09/xmldsig#sha1",
+      "sha224" => "http://www.w3.org/2001/04/xmldsig-more#sha224",
+      "sha256" => "http://www.w3.org/2001/04/xmlenc#sha256",
+      "sha384" => "http://www.w3.org/2001/04/xmldsig-more#sha384",
+      "sha512" => "http://www.w3.org/2001/04/xmlenc#sha512",
+    }
+
+
     attr_accessor :reference_id
     attr_accessor :digest_value
     attr_accessor :raw_algorithm
@@ -16,13 +33,13 @@ module SamlIdp
       builder = Builder::XmlMarkup.new
       builder.tag! "ds:SignedInfo", "xmlns:ds" => "http://www.w3.org/2000/09/xmldsig#" do |signed_info|
         signed_info.tag!("ds:CanonicalizationMethod", Algorithm: "http://www.w3.org/2001/10/xml-exc-c14n#") {}
-        signed_info.tag!("ds:SignatureMethod", Algorithm: "http://www.w3.org/2000/09/xmldsig#rsa-#{algorithm_name}") {}
+        signed_info.tag!("ds:SignatureMethod", Algorithm: signature_method ) {}
         signed_info.tag! "ds:Reference", URI: reference_string do |reference|
           reference.tag! "ds:Transforms" do |transforms|
             transforms.tag!("ds:Transform", Algorithm: "http://www.w3.org/2000/09/xmldsig#enveloped-signature") {}
             transforms.tag!("ds:Transform", Algorithm: "http://www.w3.org/2001/10/xml-exc-c14n#") {}
           end
-          reference.tag!("ds:DigestMethod", Algorithm: "http://www.w3.org/2000/09/xmldsig##{algorithm_name}") {}
+          reference.tag!("ds:DigestMethod", Algorithm: digest_method) {}
           reference.tag! "ds:DigestValue", digest_value
         end
       end
@@ -32,6 +49,21 @@ module SamlIdp
       encoded.gsub(/\n/, "")
     end
 
+    def digest_method
+      DIGEST_METHODS.fetch(clean_algorithm_name, DIGEST_METHODS["sha1"])
+    end
+    private :digest_method
+
+    def signature_method
+      SIGNATURE_METHODS.fetch(clean_algorithm_name, SIGNATURE_METHODS["sha1"])
+    end
+    private :signature_method
+
+    def clean_algorithm_name
+      algorithm_name.to_s.downcase
+    end
+    private :clean_algorithm_name
+
     def secret_key
       SamlIdp.config.secret_key
     end

data/lib/saml_idp/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module SamlIdp
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/spec/lib/saml_idp/signed_info_builder_spec.rb

@@ -15,11 +15,11 @@ module SamlIdp
     end
 
     it "builds a legit raw XML file" do
-      subject.raw.should == "<ds:SignedInfo xmlns:ds=\"http://www.w3.org/2000/09/xmldsig#\"><ds:CanonicalizationMethod Algorithm=\"http://www.w3.org/2001/10/xml-exc-c14n#\"></ds:CanonicalizationMethod><ds:SignatureMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#rsa-sha256\"></ds:SignatureMethod><ds:Reference URI=\"#_abc\"><ds:Transforms><ds:Transform Algorithm=\"http://www.w3.org/2000/09/xmldsig#enveloped-signature\"></ds:Transform><ds:Transform Algorithm=\"http://www.w3.org/2001/10/xml-exc-c14n#\"></ds:Transform></ds:Transforms><ds:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha256\"></ds:DigestMethod><ds:DigestValue>em8csGAWynywpe8S4nN64o56/4DosXi2XWMY6RJ6YfA=</ds:DigestValue></ds:Reference></ds:SignedInfo>"
+      subject.raw.should == "<ds:SignedInfo xmlns:ds=\"http://www.w3.org/2000/09/xmldsig#\"><ds:CanonicalizationMethod Algorithm=\"http://www.w3.org/2001/10/xml-exc-c14n#\"></ds:CanonicalizationMethod><ds:SignatureMethod Algorithm=\"http://www.w3.org/2001/04/xmldsig-more#rsa-sha256\"></ds:SignatureMethod><ds:Reference URI=\"#_abc\"><ds:Transforms><ds:Transform Algorithm=\"http://www.w3.org/2000/09/xmldsig#enveloped-signature\"></ds:Transform><ds:Transform Algorithm=\"http://www.w3.org/2001/10/xml-exc-c14n#\"></ds:Transform></ds:Transforms><ds:DigestMethod Algorithm=\"http://www.w3.org/2001/04/xmlenc#sha256\"></ds:DigestMethod><ds:DigestValue>em8csGAWynywpe8S4nN64o56/4DosXi2XWMY6RJ6YfA=</ds:DigestValue></ds:Reference></ds:SignedInfo>"
     end
 
     it "builds a legit digest of the XML file" do
-      subject.signed.should == "MZd0Trzk+iQiHeMf5lKI0eXkTj5RQUBQH5j81jNNR/Ndf7Q1tIxsygcAM+CeWdt/Es8/Hvxe/nHmaXkkAB0BR5p8Pfrpv90wL1D+w6zeOLDNw9/+kn9E6Syu/2NMxrFetiVM7WwZcAJRA4WHRqxk6IIHIIf/Y3pf1tqKNWe6UgY="
+      subject.signed.should == "hKLeWLRgatHcV6N5Fc8aKveqNp6Y/J4m2WSYp0awGFtsCTa/2nab32wI3du+3kuuIy59EDKeUhHVxEfyhoHUo6xTZuO2N7XcTpSonuZ/CB3WjozC2Q/9elss3z1rOC3154v5pW4puirLPRoG+Pwi8SmptxNRHczr6NvmfYmmGfo="
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saml_idp
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -344,7 +344,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -512993472113273260
+      hash: -3552964034721380666
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -353,7 +353,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -512993472113273260
+      hash: -3552964034721380666
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25