Add a getAttributesWithFriendlyName method

Author: brjpeters

lib/Saml2/Response.php

@@ -728,12 +728,6 @@ public function getAttributes()
         /** @var $entry DOMNode */
         foreach ($entries as $entry) {
             $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(
@@ -742,6 +736,54 @@ public function getAttributes()
                 );
             }
 
+            $attributeValues = array();
+            foreach ($entry->childNodes as $childNode) {
+                $tagName = ($childNode->prefix ? $childNode->prefix.':' : '') . 'AttributeValue';
+                if ($childNode->nodeType == XML_ELEMENT_NODE && $childNode->tagName === $tagName) {
+                    $attributeValues[] = $childNode->nodeValue;
+                }
+            }
+
+            $attributes[$attributeName] = $attributeValues;
+        }
+        return $attributes;
+    }
+
+    /**
+     * Gets the Attributes from the AttributeStatement element using their FriendlyName.
+     *
+     * @return array The attributes of the SAML Assertion
+     */
+    public function getAttributesWithFriendlyName()
+    {
+        $attributes = array();
+
+        /* EncryptedAttributes not supported
+
+        $encriptedAttributes = $this->_queryAssertion('/saml:AttributeStatement/saml:EncryptedAttribute');
+
+        if ($encriptedAttributes->length > 0) {
+            foreach ($encriptedAttributes as $encriptedAttribute) {
+                $key = $this->_settings->getSPkey();
+                $seckey = new XMLSecurityKey(XMLSecurityKey::RSA_1_5, array('type'=>'private'));
+                $seckey->loadKey($key);
+                $attribute = OneLogin_Saml2_Utils::decryptElement($encriptedAttribute->firstChild(), $seckey);
+            }
+        }
+        */
+
+        $entries = $this->_queryAssertion('/saml:AttributeStatement/saml:Attribute');
+
+        /** @var $entry DOMNode */
+        foreach ($entries as $entry) {
+            $attributeFriendlyNameNode = $entry->attributes->getNamedItem('FriendlyName');
+
+            if ($attributeFriendlyNameNode === null) {
+                continue;
+            }
+
+            $attributeFriendlyName = $attributeFriendlyNameNode->nodeValue;
+
             if (!empty($attributeFriendlyName) && in_array($attributeFriendlyName, array_keys($attributes))) {
                 throw new OneLogin_Saml2_ValidationError(
                     "Found an Attribute element with duplicated FriendlyName",
@@ -757,11 +799,7 @@ public function getAttributes()
                 }
             }
 
-            $attributes[$attributeName] = $attributeValues;
-
-            if (!empty($attributeFriendlyName)) {
-                $attributes[$attributeFriendlyName] = $attributeValues;
-            }
+            $attributes[$attributeFriendlyName] = $attributeValues;
         }
         return $attributes;
     }