ruby-saml-mod 0.1.20 → 0.1.21

data/lib/onelogin/saml/settings.rb

@@ -52,7 +52,15 @@ module Onelogin::Saml
     
     # The PEM-encoded private key
     attr_accessor :xmlsec_privatekey
-    
+
+    # Additional private keys to attempt decryption with
+    # To be used for key rotation
+    attr_accessor :xmlsec_additional_privatekeys
+
+    def all_private_keys
+      Array(xmlsec_additional_privatekeys).unshift(xmlsec_privatekey).compact
+    end
+
     def encryption_configured?
       !!self.xmlsec_privatekey
     end

data/lib/xml_sec.rb

@@ -355,6 +355,14 @@ module XMLSecurity
     end
 
     def decrypt_node(settings, xmlstr)
+      settings.all_private_keys.each do |key|
+        result = xmlsec_decrypt(xmlstr, key)
+        return result if result
+      end
+      nil
+    end
+
+    def xmlsec_decrypt(xmlstr, private_key)
       kmgr = nil
       ctx = nil
       doc = nil
@@ -363,7 +371,7 @@ module XMLSecurity
         kmgr = XMLSecurity.xmlSecKeysMngrCreate
         raise "Failed initializing key mgr" if XMLSecurity.xmlSecOpenSSLAppDefaultKeysMngrInit(kmgr) < 0
 
-        key = XMLSecurity.xmlSecOpenSSLAppKeyLoad(settings.xmlsec_privatekey, :xmlSecKeyDataFormatPem, nil, nil, nil)
+        key = XMLSecurity.xmlSecOpenSSLAppKeyLoad(private_key, :xmlSecKeyDataFormatPem, nil, nil, nil)
         raise "Failed loading key" if key.null?
         raise "Failed adding key to mgr" if XMLSecurity.xmlSecOpenSSLAppDefaultKeysMngrAdoptKey(kmgr, key) < 0
 

data/ruby-saml-mod.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name = %q{ruby-saml-mod}
-  s.version = "0.1.20"
+  s.version = "0.1.21"
 
   s.authors = ["OneLogin LLC", "Bracken", "Zach", "Cody", "Jeremy", "Paul"]
-  s.date = %q{2013-02-15}
+  s.date = %q{2013-03-07}
   s.extra_rdoc_files = [
     "LICENSE"
   ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-saml-mod
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.21
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2013-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
@@ -90,9 +90,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby library for SAML service providers
 test_files: []
-has_rdoc: