Fixed bug in PerunAttributes.php (#141)

* Fixed bug in PerunAttributes.php for PARTIAL mode when mapping one Perun attribute to more internal attributes caused getting attributes from Perun every time.

Author: vyskocilpavel

CHANGELOG.md

@@ -11,6 +11,10 @@ All notable changes to this project will be documented in this file.
 #### Added
 - Added extended PerunEntitlements
 
+#### Fixed
+- Fixed bug in PerunAttributes.php for PARTIAL mode when mapping one Perun attribute to more internal attributes 
+  caused getting attributes from Perun every time.
+
 ## [v4.1.1]
 #### Fixed
 - Fixed bad log message in PerunIdentity in mode USERONLY

lib/Auth/Process/PerunAttributes.php

@@ -2,10 +2,11 @@
 
 namespace SimpleSAML\Module\perun\Auth\Process;
 
+use SimpleSAML\Auth\ProcessingFilter;
 use SimpleSAML\Module\perun\Adapter;
-use SimpleSAML\Module\perun\AttributeUtils;
 use SimpleSAML\Error\Exception;
 use SimpleSAML\Logger;
+use SimpleSAML\Module\perun\model\User;
 
 /**
  * Class PerunAttributes
@@ -19,7 +20,7 @@
  *
  * @author Ondrej Velisek <[email protected]>
  */
-class PerunAttributes extends \SimpleSAML\Auth\ProcessingFilter
+class PerunAttributes extends ProcessingFilter
 {
     private $attrMap;
     private $interface;
@@ -63,8 +64,6 @@ public function __construct($config, $reserved)
 
     public function process(&$request)
     {
-        assert(is_array($request));
-
         if (isset($request['perun']['user'])) {
             $user = $request['perun']['user'];
         } else {
@@ -81,17 +80,42 @@ public function process(&$request)
         } elseif ($this->mode === self::MODE_PARTIAL) {
             // Check if attribute has some value
             foreach ($this->attrMap as $attrName => $attrValue) {
-                if (isset($request['Attributes'][$attrValue])) {
-                    $attr = $request['Attributes'][$attrValue];
-                    if (empty($attr)) {
+                if (!is_array($attrValue)) {
+                    $attrValue = [$attrValue];
+                }
+                foreach ($attrValue as $value) {
+                    if (empty($request['Attributes'][$value])) {
                         array_push($attributes, $attrName);
+                        break;
                     }
-                } else {
-                    array_push($attributes, $attrName);
                 }
             }
         }
 
+        if (empty($attributes)) {
+            return;
+        }
+
+        $this->processAttributes($user, $attributes);
+    }
+
+    private function hasStringKeys($array): bool
+    {
+        if (!is_array($array)) {
+            return false;
+        }
+        return count(array_filter(array_keys($array), 'is_string')) > 0;
+    }
+
+    /**
+     * Method process attributes from Perun system and store them to request
+     * @param User $user
+     * @param array $attributes List of attributes which will be loaded from Perun system
+     * @throws Exception
+     */
+    private function processAttributes(User $user, array $attributes): void
+    {
+
         $attrs = $this->adapter->getUserAttributesValues($user, $attributes);
 
         foreach ($attrs as $attrName => $attrValue) {
@@ -137,12 +161,4 @@ public function process(&$request)
             }
         }
     }
-
-    private function hasStringKeys($array)
-    {
-        if (!is_array($array)) {
-            return false;
-        }
-        return count(array_filter(array_keys($array), 'is_string')) > 0;
-    }
 }