samlr 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7378eb46f0f0b532f4f2cfc95dc40ac6459080c
-  data.tar.gz: f465d9ec773cb4b65157d0fd01b99a1692759a92
+  metadata.gz: 574871d6c97431297604a86ffd9a5d6e1adb7008
+  data.tar.gz: d8c7efd947792092d911ce6a12b5b21917852198
 SHA512:
-  metadata.gz: eed88391d3b9fdddefc7b88203d237c458a252a3c2bdda8eb9b46471d933d4ca64578682d481d84a980e50034e726629f9c026817ad8c73a495577ae1e0afffb
-  data.tar.gz: 1c53f2ee25f0111a45b8eaba9acfb845b56dcc4f21be67fba23d860642ddda0af65453c117ce27cffb4e83bfa066d78244ed3e97f420328690422e5fd2ddf3bf
+  metadata.gz: 25f838972bc1b93d970da4dace7cd6a2cd94dfcccd5fbfb823c1fb931239233012779cf96abe3f56e1c5a0a8d13a3c62e67839f38868041191aaf5ec17c7f9b3
+  data.tar.gz: cffb65ac150882ac090629f691c4ae0e0196130e08a6d020236e7136a21caebdcad6d9b62238fb464634b3ea6e4e8e4e5f436fd9fad8aa3a226aef367405d3f1

data/lib/samlr/condition.rb

@@ -34,8 +34,10 @@ module Samlr
     end
 
     def audience_satisfied?
-      audience.nil? || options[:audience].nil? ||
-        options[:audience] === audience
+      options[:audience].nil? ||
+      audience.nil?           ||
+      audience.empty?         ||
+      audience.any? { |a| options[:audience] === a }
     end
 
     private
@@ -43,11 +45,13 @@ module Samlr
     def extract_audience(condition)
       return unless condition
 
-      audience_node = condition.at("./saml:AudienceRestriction/saml:Audience", NS_MAP)
+      audience_restriction_node = condition.at('./saml:AudienceRestriction', NS_MAP)
+      return unless audience_restriction_node
 
-      return unless audience_node
+      audience_nodes = audience_restriction_node.search('./saml:Audience', NS_MAP)
+      return unless audience_nodes.any?
 
-      audience_node.text
+      audience_nodes.map(&:text)
     end
   end
 end

data/lib/samlr/tools/response_builder.rb

@@ -64,8 +64,12 @@ module Samlr
 
                 unless skip_conditions
                   xml["saml"].Conditions("NotBefore" => not_before, "NotOnOrAfter" => not_on_or_after) do
-                    xml["saml"].AudienceRestriction do
-                      xml["saml"].Audience(audience)
+                    Array(audience).each do |audience_nodes|
+                      xml["saml"].AudienceRestriction do
+                        Array(audience_nodes).each do |audience_value|
+                          xml["saml"].Audience(audience_value)
+                        end
+                      end
                     end
                   end
                 end

data/lib/samlr/version.rb

@@ -1,3 +1,3 @@
 module Samlr
-  VERSION = "2.3.0"
+  VERSION = "2.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: samlr
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Morten Primdahl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2016-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -153,8 +153,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby tools for SAML
 test_files: []
+has_rdoc: