Add attributes to attribute array using FriendlyName in getAttributes method

Author: brjpeters

lib/Saml2/Response.php

@@ -727,7 +727,13 @@ public function getAttributes()
 
         /** @var $entry DOMNode */
         foreach ($entries as $entry) {
-            $attributeName = $entry->attributes->getNamedItem('Name')->nodeValue;
+            $attributeName         = $entry->attributes->getNamedItem('Name')->nodeValue;
+            $attributeFriendlyName = null;
+
+            $attributeFriendlyNameNode = $entry->attributes->getNamedItem('FriendlyName');
+            if ($attributeFriendlyNameNode !== null) {
+                $attributeFriendlyName = $attributeFriendlyNameNode->nodeValue;
+            }
 
             if (in_array($attributeName, array_keys($attributes))) {
                 throw new OneLogin_Saml2_ValidationError(
@@ -736,6 +742,13 @@ public function getAttributes()
                 );
             }
 
+            if (!empty($attributeFriendlyName) && in_array($attributeFriendlyName, array_keys($attributes))) {
+                throw new OneLogin_Saml2_ValidationError(
+                    "Found an Attribute element with duplicated FriendlyName",
+                    OneLogin_Saml2_ValidationError::DUPLICATED_ATTRIBUTE_NAME_FOUND
+                );
+            }
+
             $attributeValues = array();
             foreach ($entry->childNodes as $childNode) {
                 $tagName = ($childNode->prefix ? $childNode->prefix.':' : '') . 'AttributeValue';
@@ -745,6 +758,10 @@ public function getAttributes()
             }
 
             $attributes[$attributeName] = $attributeValues;
+
+            if (!empty($attributeFriendlyName)) {
+                $attributes[$attributeFriendlyName] = $attributeValues;
+            }
         }
         return $attributes;
     }