fix: 🐛 Fix fetching capabilities with no facility provided

Caused exceptions when no facility has been found. Added additional checks to prevent such errors.
CESNET · Jul 18, 2022 · 0469f41 · 0469f41
1 parent 34e1087
commit 0469f41
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/lib/AdapterLdap.php b/lib/AdapterLdap.php
@@ -330,6 +330,9 @@ public function getFacilitiesByEntityId($spEntityId)
 
     public function getFacilityByEntityId($spEntityId, $entityIdAttr = 'perunFacilityAttr_entityID')
     {
+        if (empty($spEntityId)) {
+            return null;
+        }
         $attrName = AttributeUtils::getLdapAttrName($entityIdAttr);
         if (empty($attrName)) {
             $attrName = 'entityID';
@@ -359,6 +362,9 @@ public function getFacilityByEntityId($spEntityId, $entityIdAttr = 'perunFacilit
 
     public function getFacilityByClientId($clientId, $clientIdAttr = 'perunFacilityAttr_OIDCClientID')
     {
+        if (empty($spEntityId)) {
+            return null;
+        }
         $attrName = AttributeUtils::getLdapAttrName($clientIdAttr);
         if (empty($attrName)) {
             $attrName = 'OIDCClientID';
@@ -605,6 +611,9 @@ public function getResourceCapabilities($entityId, $userGroups, $entityIdAttr =
 
     public function getFacilityCapabilities($entityId, $entityIdAttr = 'perunFacilityAttr_entityID')
     {
+        if (empty($entityId)) {
+            return [];
+        }
         $attrName = AttributeUtils::getLdapAttrName($entityIdAttr);
 
         $facilityCapabilities = $this->connector->searchForEntity(