saml-kit 1.0.23 → 1.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 273e2fe5e94073ea27a76acf05009fc75e1173633d25104ab9f0f6aad48a7d07
-  data.tar.gz: 3e06454c07bc08feb7cbfad2213817ee7a5c68855b61ce8a3252832b16f53ce8
+  metadata.gz: 3ff0dd35ecb05542b7f21d3ead4c22f232a337eaa41c9ddfa56b6d82b8f8873b
+  data.tar.gz: 4d189291119912edfc23847cffa213fb5c53eca8f95a27810d40f8c111ff533e
 SHA512:
-  metadata.gz: e911dad21549d77b51d1101c559af5b9862ee5b1c8b0b6a645eeae64a52cd065e43d30ea7326f74e57bd14af1b6edddbe670fef51dc4278beb7b7522230d29ed
-  data.tar.gz: 0de8d41c9d8755a86db9b074fae06a54ab75c77410cad63a42ef0c9bcfa2a3c87e510e7fb7c8602e32ff9aaf8fcee323314e51113a4cb9fbcfaca55f485ee230
+  metadata.gz: 8354776fdbb5c0ae66ed2e4a18baa38c3073e2e99f49117638419e01d111c012b0cdbe862654798bf285d9e0d5bbe78fab3f0d66e7ce79ee5c6a8ca95c58e676
+  data.tar.gz: da11bf9e0f5d4f9fec869b7908f0249d63454ba2edefe40e3b0080037d02615d1129ad6b9cd9c72ed1794d64da25eb789e1412ad4db35070d1a28f5e00829f76

data/lib/saml/kit/assertion.rb

@@ -5,10 +5,7 @@ module Saml
     # This class validates the Assertion
     # element nested in a Response element
     # of a SAML document.
-    class Assertion
-      include ActiveModel::Validations
-      include Translatable
-      include XmlParseable
+    class Assertion < Document
       extend Forwardable
       XPATH = [
         '/samlp:Response/saml:Assertion',
@@ -21,26 +18,35 @@ module Saml
       validate :must_match_issuer, if: :decryptable?
       validate :must_be_active_session, if: :decryptable?
       validate :must_have_valid_signature, if: :decryptable?
-      attr_reader :name
+      attr_reader :name, :configuration
       attr_accessor :occurred_at
 
       def initialize(
         node, configuration: Saml::Kit.configuration, private_keys: []
       )
         @name = 'Assertion'
-        @to_nokogiri = node
+        @to_nokogiri = node.is_a?(String) ? Nokogiri::XML(node).root : node
         @configuration = configuration
         @occurred_at = Time.current
         @cannot_decrypt = false
         @encrypted = false
         keys = configuration.private_keys(use: :encryption) + private_keys
         decrypt(::Xml::Kit::Decryption.new(private_keys: keys.uniq))
+        super(to_s, name: 'Assertion', configuration: configuration)
+      end
+
+      def id
+        at_xpath('./@ID').try(:value)
       end
 
       def issuer
         at_xpath('./saml:Issuer').try(:text)
       end
 
+      def version
+        at_xpath('./@Version').try(:value)
+      end
+
       def name_id
         at_xpath('./saml:Subject/saml:NameID').try(:text)
       end
@@ -66,9 +72,12 @@ module Saml
         now > drifted_started_at && !expired?(now)
       end
 
-      def attribute_statement
-        @attribute_statement ||=
-          AttributeStatement.new(search('./saml:AttributeStatement'))
+      def expected_type?
+        at_xpath('../saml:Assertion|../saml:EncryptedAssertion').present?
+      end
+
+      def attribute_statement(xpath = './saml:AttributeStatement')
+        @attribute_statement ||= AttributeStatement.new(search(xpath))
       end
 
       def conditions
@@ -90,8 +99,6 @@ module Saml
 
       private
 
-      attr_reader :configuration
-
       def decrypt(decryptor)
         encrypted_assertion = at_xpath('./xmlenc:EncryptedData')
         @encrypted = encrypted_assertion.present?

data/lib/saml/kit/builders/assertion.rb

@@ -7,17 +7,21 @@ module Saml
       # {include:file:lib/saml/kit/builders/templates/assertion.builder}
       class Assertion
         include XmlTemplatable
-        extend Forwardable
-
-        def_delegators :@response_builder,
-          :request, :issuer, :reference_id, :now, :configuration, :user,
-          :version, :destination
 
+        attr_reader :user, :request, :configuration
+        attr_accessor :reference_id
+        attr_accessor :now, :destination
+        attr_accessor :issuer, :version
         attr_accessor :default_name_id_format
 
-        def initialize(response_builder, embed_signature)
-          @response_builder = response_builder
-          self.embed_signature = embed_signature
+        def initialize(user, request, configuration: Saml::Kit.configuration)
+          @user = user
+          @request = request
+          @configuration = configuration
+          @issuer = configuration.entity_id
+          @reference_id = ::Xml::Kit::Id.generate
+          @version = '2.0'
+          @now = Time.now.utc
           self.default_name_id_format = Saml::Kit::Namespaces::UNSPECIFIED_NAMEID
         end
 
@@ -34,8 +38,8 @@ module Saml
           user.assertion_attributes_for(request)
         end
 
-        def signing_key_pair
-          super || @response_builder.signing_key_pair
+        def build
+          Saml::Kit::Assertion.new(to_xml, configuration: configuration)
         end
 
         private

data/lib/saml/kit/builders/response.rb

@@ -8,7 +8,7 @@ module Saml
       class Response
         include XmlTemplatable
         attr_reader :user, :request
-        attr_accessor :id, :reference_id, :now
+        attr_accessor :id, :now
         attr_accessor :version, :status_code, :status_message
         attr_accessor :issuer, :destination
         attr_reader :configuration
@@ -19,7 +19,6 @@ module Saml
           @user = user
           @request = request
           @id = ::Xml::Kit::Id.generate
-          @reference_id = ::Xml::Kit::Id.generate
           @now = Time.now.utc
           @version = '2.0'
           @status_code = Namespaces::SUCCESS
@@ -46,14 +45,13 @@ module Saml
         def assertion
           @assertion ||=
             begin
-              assertion = Saml::Kit::Builders::Assertion.new(
-                self, embed_signature
-              )
-              if encrypt
-                Saml::Kit::Builders::EncryptedAssertion.new(self, assertion)
-              else
-                assertion
-              end
+              assertion = Assertion.new(user, request, configuration: configuration)
+              assertion.sign_with(@signing_key_pair) if @signing_key_pair
+              assertion.embed_signature = embed_signature unless embed_signature.nil?
+              assertion.now = now
+              assertion.destination = destination
+              assertion.issuer = issuer
+              encrypt ? EncryptedAssertion.new(self, assertion) : assertion
             end
         end
 

data/lib/saml/kit/concerns/xsd_validatable.rb

@@ -19,7 +19,7 @@ module Saml
 
         Dir.chdir(File.dirname(xsd)) do
           xsd = Nokogiri::XML::Schema(IO.read(xsd))
-          xsd.validate(to_nokogiri).each do |error|
+          xsd.validate(to_nokogiri.document).each do |error|
             errors[:base] << error.message
           end
         end

data/lib/saml/kit/document.rb

@@ -83,10 +83,11 @@ module Saml
         # @!visibility private
         def builder_class # :nodoc:
           {
-            Response.to_s => Saml::Kit::Builders::Response,
-            LogoutResponse.to_s => Saml::Kit::Builders::LogoutResponse,
+            Assertion.to_s => Saml::Kit::Builders::Assertion,
             AuthenticationRequest.to_s => Saml::Kit::Builders::AuthenticationRequest,
             LogoutRequest.to_s => Saml::Kit::Builders::LogoutRequest,
+            LogoutResponse.to_s => Saml::Kit::Builders::LogoutResponse,
+            Response.to_s => Saml::Kit::Builders::Response,
           }[name] || (raise ArgumentError, "Unknown SAML Document #{name}")
         end
       end

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

@@ -5,8 +5,12 @@ en:
       Assertion:
         cannot_decrypt: "cannot be decrypted."
         expired: "must not be expired."
-        must_match_issuer: "must match entityId."
+        invalid: "must contain Assertion."
+        invalid_fingerprint: "is not registered."
+        invalid_version: "must be 2.0."
         must_contain_single_assertion: "must contain single Assertion."
+        must_match_issuer: "must match entityId."
+        unregistered: "is unregistered."
       AuthnRequest:
         invalid: "must contain AuthnRequest."
         invalid_fingerprint: "is not registered."

data/lib/saml/kit/version.rb

@@ -2,6 +2,6 @@
 
 module Saml
   module Kit
-    VERSION = '1.0.23'.freeze
+    VERSION = '1.0.24'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saml-kit
 version: !ruby/object:Gem::Version
-  version: 1.0.23
+  version: 1.0.24
 platform: ruby
 authors:
 - mo khan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-23 00:00:00.000000000 Z
+date: 2018-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel