saml-kit 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b98601350af83c7090bc7fead240f7fabb4736f642a262502a96c48e533f3203
-  data.tar.gz: a51e398301b1115654dbe0a8a31bf61b029456c12302bb42512b7dac716d38e8
+  metadata.gz: 11da72a9a04500f85a856e8bdb82e5d32f930383bacbc4c1b2eacb5908336581
+  data.tar.gz: cb5c231e608a6fc199052c1c3e4922837c51534ec99a3416b1d45aa73efd07db
 SHA512:
-  metadata.gz: 1d032fb605d2c62e45e491ddde0e90274f3ae0ddab82c7e4daa72cfcc7c992483abcd5151399c67d7205bcb0de2ebe1fb1e1953fe416c9efac333e1dba86ab56
-  data.tar.gz: d330dc2cc0a7dfd9d7fb29e9ec9da4b9549739160f77bc6de73f1d6bd9ca15851faa595a3ccf7a75064479751b81123beaf4fb0dd6b31f5f193fbc4fd0ce182e
+  metadata.gz: 3283b83d0c28a95e3bc1bbf3999bd5eee369dc82dcaa1eb4330dbb89e82ee57be3df06ad1548c416adc6a79f249642fda08d56e11323d88c7ffbd553b0431473
+  data.tar.gz: 49aa1074365a8c48f287e3939d3f9f3deb0d0f45168982a4197b091cf34257b60324eb177311581069a0ba47468bce0354a0d0d133668fc36180d38106add5e2

data/lib/saml/kit.rb

@@ -35,6 +35,7 @@ require "saml/kit/configuration"
 require "saml/kit/crypto"
 require "saml/kit/default_registry"
 require "saml/kit/fingerprint"
+require "saml/kit/key_pair"
 require "saml/kit/logout_response"
 require "saml/kit/logout_request"
 require "saml/kit/metadata"

data/lib/saml/kit/assertion.rb

@@ -63,12 +63,12 @@ module Saml
         []
       end
 
-      private
-
       def encrypted?
         @xml_hash.fetch('Response', {}).fetch('EncryptedAssertion', nil).present?
       end
 
+      private
+
       def assertion
         if encrypted?
           decrypted = XmlDecryption.new(configuration: @configuration).decrypt(@xml_hash['Response']['EncryptedAssertion'])

data/lib/saml/kit/bindings/http_post.rb

@@ -18,9 +18,9 @@ module Saml
           [location, saml_params]
         end
 
-        def deserialize(params)
+        def deserialize(params, configuration: Saml::Kit.configuration)
           xml = decode(saml_param_from(params))
-          Saml::Kit::Document.to_saml_document(xml)
+          Saml::Kit::Document.to_saml_document(xml, configuration: configuration)
         end
       end
     end

data/lib/saml/kit/bindings/http_redirect.rb

@@ -15,8 +15,8 @@ module Saml
           [UrlBuilder.new(configuration: builder.configuration).build(document, relay_state: relay_state), {}]
         end
 
-        def deserialize(params)
-          document = deserialize_document_from!(params)
+        def deserialize(params, configuration: Saml::Kit.configuration)
+          document = deserialize_document_from!(params, configuration)
           ensure_valid_signature!(params, document)
           document.signature_verified!
           document
@@ -24,10 +24,10 @@ module Saml
 
         private
 
-        def deserialize_document_from!(params)
+        def deserialize_document_from!(params, configuration)
           xml = inflate(decode(unescape(saml_param_from(params))))
           Saml::Kit.logger.debug(xml)
-          Saml::Kit::Document.to_saml_document(xml)
+          Saml::Kit::Document.to_saml_document(xml, configuration: configuration)
         end
 
         def ensure_valid_signature!(params, document)

data/lib/saml/kit/builders/templates/assertion.builder

@@ -1,7 +1,7 @@
 encryption_for(xml: xml) do |xml|
   xml.Assertion(assertion_options) do
     xml.Issuer issuer
-    signature_for(reference_id: reference_id, xml: xml) unless encrypt
+    signature_for(reference_id: reference_id, xml: xml)
     xml.Subject do
       xml.NameID name_id, Format: name_id_format
       xml.SubjectConfirmation Method: Saml::Kit::Namespaces::BEARER do

data/lib/saml/kit/configuration.rb

@@ -12,14 +12,12 @@ module Saml
         @registry = DefaultRegistry.new
         @session_timeout = 3.hours
         @logger = Logger.new(STDOUT)
+        @key_pairs = []
         yield self if block_given?
       end
 
       def add_key_pair(certificate, private_key, password:, use: :signing)
-        key_pairs.push({
-          certificate: Saml::Kit::Certificate.new(certificate, use: use),
-          private_key: OpenSSL::PKey::RSA.new(private_key, password)
-        })
+        @key_pairs.push(KeyPair.new(certificate, private_key, password, use))
       end
 
       def generate_key_pair_for(use:, password: SecureRandom.uuid)
@@ -27,13 +25,16 @@ module Saml
         add_key_pair(certificate, private_key, password: password, use: use)
       end
 
+      def key_pairs(use: nil)
+        use.present? ? @key_pairs.find_all { |x| x.for?(use) } : @key_pairs
+      end
+
       def certificates(use: nil)
-        certificates = key_pairs.map { |x| x[:certificate] }
-        use.present? ? certificates.find_all { |x| x.for?(use) } : certificates
+        key_pairs(use: use).flat_map(&:certificate)
       end
 
       def private_keys(use: :signing)
-        key_pairs.find_all { |x| x[:certificate].for?(use) }.map { |x| x[:private_key] }
+        key_pairs(use: use).flat_map(&:private_key)
       end
 
       def encryption_certificate
@@ -54,12 +55,6 @@ module Saml
       def sign?
         certificates(use: :signing).any?
       end
-
-      private
-
-      def key_pairs
-        @key_pairs ||= []
-      end
     end
   end
 end

data/lib/saml/kit/document.rb

@@ -64,16 +64,16 @@ module Saml
       end
 
       class << self
-        def to_saml_document(xml)
+        def to_saml_document(xml, configuration: Saml::Kit.configuration)
           hash = Hash.from_xml(xml)
           if hash['Response'].present?
-            Response.new(xml)
+            Response.new(xml, configuration: configuration)
           elsif hash['LogoutResponse'].present?
-            LogoutResponse.new(xml)
+            LogoutResponse.new(xml, configuration: configuration)
           elsif hash['AuthnRequest'].present?
-            AuthenticationRequest.new(xml)
+            AuthenticationRequest.new(xml, configuration: configuration)
           elsif hash['LogoutRequest'].present?
-            LogoutRequest.new(xml)
+            LogoutRequest.new(xml, configuration: configuration)
           end
         rescue => error
           Saml::Kit.logger.error(error)

data/lib/saml/kit/key_pair.rb

@@ -0,0 +1,17 @@
+module Saml
+  module Kit
+    class KeyPair
+      attr_reader :certificate, :private_key
+
+      def initialize(certificate, private_key, password, use)
+        @use = use
+        @certificate = Saml::Kit::Certificate.new(certificate, use: use)
+        @private_key = OpenSSL::PKey::RSA.new(private_key, password)
+      end
+
+      def for?(use)
+        @use == use
+      end
+    end
+  end
+end

data/lib/saml/kit/locales/en.yml

@@ -4,6 +4,7 @@ en:
     errors:
       Assertion:
         expired: "must not be expired."
+        must_match_issuer: "must match entityId."
       AuthnRequest:
         invalid: "must contain AuthnRequest."
         invalid_fingerprint: "does not match."
@@ -23,7 +24,6 @@ en:
         invalid_fingerprint: "does not match."
         invalid_response_to: "must match request id."
         invalid_version: "must be 2.0."
-        must_match_issuer: "must match entityId."
         unregistered: "must originate from registered identity provider."
       SPSSODescriptor:
         invalid: "must contain SPSSODescriptor."

data/lib/saml/kit/logout_response.rb

@@ -3,9 +3,9 @@ module Saml
     class LogoutResponse < Document
       include Respondable
 
-      def initialize(xml, request_id: nil)
+      def initialize(xml, request_id: nil, configuration: Saml::Kit.configuration)
         @request_id = request_id
-        super(xml, name: "LogoutResponse")
+        super(xml, name: "LogoutResponse", configuration: configuration)
       end
 
       Builder = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('Saml::Kit::LogoutResponse::Builder', 'Saml::Kit::Builders::LogoutResponse')

data/lib/saml/kit/templatable.rb

@@ -24,7 +24,8 @@ module Saml
         if encrypt?
           temp = ::Builder::XmlMarkup.new
           yield temp
-          xml_encryption = Saml::Kit::Builders::XmlEncryption.new(temp.target!, encryption_certificate.public_key)
+          signed_xml = signatures.complete(temp.target!)
+          xml_encryption = Saml::Kit::Builders::XmlEncryption.new(signed_xml, encryption_certificate.public_key)
           render(xml_encryption, xml: xml)
         else
           yield xml

data/lib/saml/kit/version.rb

@@ -1,5 +1,5 @@
 module Saml
   module Kit
-    VERSION = "0.2.5"
+    VERSION = "0.2.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saml-kit
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - mo khan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-15 00:00:00.000000000 Z
+date: 2017-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -231,6 +231,7 @@ files:
 - lib/saml/kit/id.rb
 - lib/saml/kit/identity_provider_metadata.rb
 - lib/saml/kit/invalid_document.rb
+- lib/saml/kit/key_pair.rb
 - lib/saml/kit/locales/en.yml
 - lib/saml/kit/logout_request.rb
 - lib/saml/kit/logout_response.rb