libsaml 2.10.2 → 2.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03512188984760c2d152d49ccbf066ef8de5ac8a
-  data.tar.gz: 265bb2991e70cee6600bf42fa26eaa3de07a24b4
+  metadata.gz: 65bb00a48d385b846b61fbdbeaea20fd3860ffa7
+  data.tar.gz: fa24ab968d99462d2c656c61ebcc1c0210513e30
 SHA512:
-  metadata.gz: 0450d8e90d2db274513a33592effa7353437941fad270cb2f9b4990c8076d9268a600fc712c9e708dde8676e19a5e12ce73f3b345bfb8a76822358c6681b383e
-  data.tar.gz: 21c187b09d819a08c11639d2917c1b5b5be7408b648f96c1987fbf27d5091a7d86d8b00ca80f15d4d4ac67db49da3c9f1a5894f6faef948e92ec660a8c78c5f2
+  metadata.gz: a8cfee537c6f2926b89b5a37fb697e4b22def49e97fda16d5aea9789da40b4117542e13f4b8779ef79a3d66ab6916be441a97eab2a6ce73c6c7bd287e704b5b1
+  data.tar.gz: daaf7976e0b493f9f95eae9d763034451575d752d77d66f2812f2ba53cc3cf2d04acc3485e7782bdddf28634f5710d845682b0751d51690aed6108ff368c20b2

data/lib/saml.rb

@@ -100,6 +100,7 @@ module Saml
     require 'saml/complex_types/subject_query_abstract_type'
     require 'saml/complex_types/attribute_query_type'
     require 'saml/complex_types/evidence_type'
+    require 'saml/complex_types/advice_type'
   end
 
   module Elements
@@ -140,6 +141,7 @@ module Saml
     require 'saml/elements/organization_url'
     require 'saml/elements/organization'
     require 'saml/elements/contact_person'
+    require 'saml/elements/advice'
     require 'saml/elements/idp_sso_descriptor'
     require 'saml/elements/sp_sso_descriptor'
     require 'saml/elements/attribute_authority_descriptor'

data/lib/saml/assertion.rb

@@ -18,6 +18,7 @@ module Saml
     has_one   :signature, Saml::Elements::Signature
     has_one   :subject, Saml::Elements::Subject
     has_one   :conditions, Saml::Elements::Conditions
+    has_one   :advice, Saml::Elements::Advice
     has_many  :statements, Saml::ComplexTypes::StatementAbstractType
     has_many  :authn_statement, Saml::Elements::AuthnStatement
     has_one   :attribute_statement, Saml::Elements::AttributeStatement

data/lib/saml/complex_types/advice_type.rb

@@ -0,0 +1,14 @@
+module Saml
+  module ComplexTypes
+    module AdviceType
+      extend ActiveSupport::Concern
+      include Saml::Base
+
+      included do
+        require 'saml/assertion'
+
+        has_many :assertions, ::Saml::Assertion
+      end
+    end
+  end
+end

data/lib/saml/elements/advice.rb

@@ -0,0 +1,10 @@
+module Saml
+  module Elements
+    class Advice
+      include ComplexTypes::AdviceType
+
+      tag 'Advice'
+      namespace 'saml'
+    end
+  end
+end

data/lib/saml/elements/subject.rb

@@ -7,11 +7,14 @@ module Saml
       register_namespace 'saml', Saml::SAML_NAMESPACE
       namespace 'saml'
 
-      element :_name_id, NameId, :tag => "NameID"
+      has_one :_name_id, Saml::Elements::NameId
+      has_one :encrypted_id, Saml::Elements::EncryptedID
 
       has_many :subject_confirmation, Saml::Elements::SubjectConfirmation
 
-      validates :name_id, :subject_confirmation, :presence => true
+      validates :subject_confirmation, presence: true
+
+      validate :check_identifier
 
       def initialize(*args)
         options               = args.extract_options!
@@ -33,6 +36,18 @@ module Saml
       def name_id_format
         @_name_id.format
       end
+
+      private
+
+      def check_identifier
+        errors.add(:identifiers, :one_identifier_mandatory) if identifiers.blank?
+        errors.add(:identifiers, :one_identifier_allowed)   if identifiers.size > 1
+      end
+
+      def identifiers
+        [_name_id, encrypted_id].compact
+      end
+
     end
   end
 end

data/lib/saml/version.rb

@@ -1,3 +1,3 @@
 module Saml
-  VERSION = "2.10.2"
+  VERSION = "2.10.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libsaml
 version: !ruby/object:Gem::Version
-  version: 2.10.2
+  version: 2.10.3
 platform: ruby
 authors:
 - Benoist Claassen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-29 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -133,6 +133,7 @@ files:
 - lib/saml/bindings/http_post.rb
 - lib/saml/bindings/http_redirect.rb
 - lib/saml/bindings/soap.rb
+- lib/saml/complex_types/advice_type.rb
 - lib/saml/complex_types/attribute_query_type.rb
 - lib/saml/complex_types/attribute_type.rb
 - lib/saml/complex_types/endpoint_type.rb
@@ -146,6 +147,7 @@ files:
 - lib/saml/complex_types/status_response_type.rb
 - lib/saml/complex_types/subject_query_abstract_type.rb
 - lib/saml/config.rb
+- lib/saml/elements/advice.rb
 - lib/saml/elements/attribute.rb
 - lib/saml/elements/attribute_authority_descriptor.rb
 - lib/saml/elements/attribute_consuming_service.rb