Fixes onelogin#112 by extracting all Attribute values into single array

Author: borgand

lib/onelogin/ruby-saml/response.rb

@@ -49,7 +49,8 @@ def sessionindex
         end
       end
 
-      # A hash of alle the attributes with the response. Assuming there is only one value for each key
+      # A hash of all the attributes with the response.
+      # Multiple values will be returned in the AttributeValue#values array
       def attributes
         @attr_statements ||= begin
           result = {}
@@ -63,6 +64,11 @@ def attributes
 
             # Set up a string-like wrapper for the values array
             attr_value = AttributeValue.new(values.first, values)
+            # Merge values if the Attribute has already been seen
+            if result[name]
+              attr_value.values += result[name].values
+            end
+
             result[name] = attr_value
           end
 

test/response_test.rb

@@ -239,6 +239,16 @@ class RubySamlTest < Test::Unit::TestCase
           response = OneLogin::RubySaml::Response.new(fixture(:response_with_multiple_attribute_values))
           assert_equal ['value1', 'value2'], response.attributes[:another_value].values
         end
+
+        should "return last of multiple values when multiple Attribute tags in XML" do
+          response = OneLogin::RubySaml::Response.new(fixture(:response_with_multiple_attribute_values))
+          assert_equal 'role2', response.attributes[:role]
+        end
+
+        should "return all of multiple values in reverse order when multiple Attribute tags in XML" do
+          response = OneLogin::RubySaml::Response.new(fixture(:response_with_multiple_attribute_values))
+          assert_equal ['role2', 'role1'], response.attributes[:role].values
+        end
       end
     end
 

test/responses/response_with_multiple_attribute_values.xml

@@ -46,6 +46,12 @@
         <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">value1</saml:AttributeValue>
         <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">value2</saml:AttributeValue>
       </saml:Attribute>
+      <saml:Attribute Name="role">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">role1</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute Name="role">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">role2</saml:AttributeValue>
+      </saml:Attribute>
     </saml:AttributeStatement>
   </saml:Assertion>
 </samlp:Response>