Fixed getting attributes in class ForceAup

Author: vyskocilpavel

CHANGELOG.md

@@ -2,6 +2,8 @@
 All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
+#### Fixed
+- Fixed getting attributes in class ForceAup
 
 ## [v4.0.0]
 #### Added

lib/AdapterRpc.php

@@ -265,9 +265,8 @@ public function getUserAttributesValues($user, $attributes)
     public function getEntitylessAttribute($attrName)
     {
         $attributes = [];
-
         $perunAttrValues = $this->connector->get('attributesManager', 'getEntitylessAttributes', [
-            'attrName' => $attrName,
+            'attrName' => AttributeUtils::getAttrName($attrName, self::RPC),
         ]);
 
         if (!isset($perunAttrValues[0]['id'])) {

lib/Auth/Process/ForceAup.php

@@ -2,9 +2,9 @@
 
 namespace SimpleSAML\Module\perun\Auth\Process;
 
+use SimpleSAML\Auth\ProcessingFilter;
 use SimpleSAML\Error\Exception;
 use SimpleSAML\Module\perun\Adapter;
-use SimpleSAML\Module\perun\AttributeUtils;
 use SimpleSAML\Module\perun\model;
 use SimpleSAML\Logger;
 use SimpleSAML\Auth\State;
@@ -27,24 +27,23 @@
  *
  * It relies on PerunIdentity filter. Configure it before this filter properly.
  */
-class ForceAup extends \SimpleSAML\Auth\ProcessingFilter
+class ForceAup extends ProcessingFilter
 {
 
     const UID_ATTR = 'uidAttr';
     const INTERFACE_PROPNAME = 'interface';
     const PERUN_AUPS_ATTR = 'perunAupsAttr';
     const PERUN_USER_AUP_ATTR = 'perunUserAupAttr';
     const PERUN_VO_AUP_ATTR = 'perunVoAupAttr';
-    const PERUN_FACILITY_REQ_AUPS_ATTR = 'facilityReqAupsAttr';
-    const PERUN_FACILITY_VO_SHORT_NAMES_ATTR = 'facilityVoShortNamesAttr';
+    const PERUN_FACILITY_REQ_AUPS_ATTR = 'perunFacilityReqAupsAttr';
+    const PERUN_FACILITY_VO_SHORT_NAMES_ATTR = 'perunFacilityVoShortNamesAttr';
 
     private $uidAttr;
     private $perunAupsAttr;
     private $perunUserAupAttr;
     private $perunVoAupAttr;
     private $perunFacilityReqAupsAttr;
     private $perunFacilityVoShortNames;
-    private $interface;
 
     /**
      * @var Adapter
@@ -83,18 +82,11 @@ public function __construct($config, $reserved)
         $this->perunAupsAttr = (string)$config[self::PERUN_AUPS_ATTR];
         $this->perunUserAupAttr = (string)$config[self::PERUN_USER_AUP_ATTR];
         $this->perunVoAupAttr = (string)$config[self::PERUN_VO_AUP_ATTR];
-        $this->interface = (string)$config[self::INTERFACE_PROPNAME];
-        $this->adapter = Adapter::getInstance($this->interface);
-
-        $this->perunFacilityReqAupsAttr = AttributeUtils::getAttrName(
-            self::PERUN_FACILITY_REQ_AUPS_ATTR,
-            $this->interface
-        );
-
-        $this->perunFacilityVoShortNames = AttributeUtils::getAttrName(
-            self::PERUN_FACILITY_VO_SHORT_NAMES_ATTR,
-            $this->interface
-        );
+        $interface = (string)$config[self::INTERFACE_PROPNAME];
+        $this->adapter = Adapter::getInstance($interface);
+
+        $this->perunFacilityReqAupsAttr = (string)$config[self::PERUN_FACILITY_REQ_AUPS_ATTR];
+        $this->perunFacilityVoShortNames = (string)$config[self::PERUN_FACILITY_VO_SHORT_NAMES_ATTR];
     }
 
     /**
@@ -129,19 +121,19 @@ public function process(&$request)
 
             $facilityAttrValues = $this->adapter->getFacilityAttributesValues(
                 $facility,
-                [self::PERUN_FACILITY_REQ_AUPS_ATTR, self::PERUN_FACILITY_VO_SHORT_NAMES_ATTR]
+                [$this->perunFacilityReqAupsAttr, $this->perunFacilityVoShortNames]
             );
 
             if (isset($this->perunFacilityReqAupsAttr, $facilityAttrValues) &&
                 is_array($facilityAttrValues[$this->perunFacilityReqAupsAttr])) {
-                foreach ($facilityAttrValues[$this->perunFacilityReqAupsAttr] as $facilityAup) {
+                foreach (array_values($facilityAttrValues[$this->perunFacilityReqAupsAttr]) as $facilityAup) {
                     array_push($requiredAups, $facilityAup);
                 }
             }
 
             if (isset($this->perunFacilityVoShortNames, $facilityAttrValues) &&
                 is_array($facilityAttrValues[$this->perunFacilityVoShortNames])) {
-                foreach ($facilityAttrValues[$this->perunFacilityVoShortNames] as $facilityVoShortName) {
+                foreach (array_values($facilityAttrValues[$this->perunFacilityVoShortNames]) as $facilityVoShortName) {
                     array_push($voShortNames, $facilityVoShortName);
                 }
             }