Merge pull request #70 from pajavyskocil/ldap_changes

Ldap changes

Author: vyskocilpavel

CHANGELOG.md

@@ -20,6 +20,7 @@ All notable changes to this project will be documented in this file.
 #### Changed
 - RpcConnector now stores cookie into file
 - Set CONNECTTIMEOUT and TIMEOUT in RpcConnector
+- Use new object perunFacility in LDAP to search information about facility
 
 ## [v3.2.1]
 #### Fixed

lib/AdapterLdap.php

@@ -29,9 +29,6 @@ class AdapterLdap extends Adapter
     const LDAP_PASSWORD = 'ldap.password';
     const LDAP_BASE = 'ldap.base';
 
-    private $ldapHostname;
-    private $ldapUser;
-    private $ldapPassword;
     private $ldapBase;
 
     protected $connector;
@@ -44,13 +41,12 @@ public function __construct($configFileName = null)
 
         $conf = Configuration::getConfig($configFileName);
 
-        $this->ldapHostname = $conf->getString(self::LDAP_HOSTNAME);
-        $this->ldapUser = $conf->getString(self::LDAP_USER, null);
-        $this->ldapPassword = $conf->getString(self::LDAP_PASSWORD, null);
+        $ldapHostname = $conf->getString(self::LDAP_HOSTNAME);
+        $ldapUser = $conf->getString(self::LDAP_USER, null);
+        $ldapPassword = $conf->getString(self::LDAP_PASSWORD, null);
         $this->ldapBase = $conf->getString(self::LDAP_BASE);
 
-
-        $this->connector = new LdapConnector($this->ldapHostname, $this->ldapUser, $this->ldapPassword);
+        $this->connector = new LdapConnector($ldapHostname, $ldapUser, $ldapPassword);
     }
 
     public function getPerunUser($idpEntityId, $uids)
@@ -122,9 +118,16 @@ public function getMemberGroups($user, $vo)
 
     public function getSpGroups($spEntityId)
     {
+        $facility = $this->connector->searchForEntity(
+            $this->ldapBase,
+            "(&(objectClass=perunFacility)(entityID=$spEntityId))",
+            ['perunFacilityId']
+        );
+
+        $id = $facility['perunFacilityId'][0];
         $resources = $this->connector->searchForEntities(
             $this->ldapBase,
-            "(&(objectClass=perunResource)(entityID=$spEntityId))",
+            "(&(objectClass=perunResource)(perunFacilityDn=perunFacilityId=$id,$this->ldapBase))",
             ["perunResourceId", "assignedGroupId", "perunVoId"]
         );
 
@@ -274,9 +277,16 @@ public function setUserExtSourceAttributes($userExtSourceId, $attributes)
 
     public function getUsersGroupsOnFacility($spEntityId, $userId)
     {
+        $facility = $this->connector->searchForEntity(
+            $this->ldapBase,
+            "(&(objectClass=perunFacility)(entityID=$spEntityId))",
+            ['perunFacilityId']
+        );
+
+        $id = $facility['perunFacilityId'][0];
         $resources = $this->connector->searchForEntities(
             $this->ldapBase,
-            "(&(objectClass=perunResource)(entityID=$spEntityId))",
+            "(&(objectClass=perunResource)(perunFacilityDn=perunFacilityId=$id,$this->ldapBase))",
             ["perunResourceId"]
         );
         Logger::debug("Resources - " . var_export($resources, true));