Merge pull request #6 from pajavyskocil/ldap_base

Added configuration option for ldap base.

Author: tauceti2

config-templates/module_perun.php

@@ -25,6 +25,8 @@
 	 */
 	'ldap.hostname' => 'ldaps://perun.inside.cz',
 
+	'ldap.base' => 'dc=perun,dc=inside,dc=cz',
+
 	/**
 	 * ldap credentials if ldap search is protected. If it is null or not set at all. No user is used for bind.
 	 */

lib/AdapterLdap.php

@@ -8,7 +8,16 @@
 class sspmod_perun_AdapterLdap extends sspmod_perun_Adapter
 {
 
+	private $ldapBase;
 
+	const CONFIG_FILE_NAME = 'module_perun.php';
+	const LDAP_BASE  = 'ldap.base';
+
+	public function __construct ()
+	{
+		$conf = SimpleSAML_Configuration::getConfig(self::CONFIG_FILE_NAME);
+		$this->ldapBase = $conf->getString(self::LDAP_BASE);
+	}
 	public function getPerunUser($idpEntityId, $uids)
 	{
 		# Build a LDAP query, we are searching for the user who has at least one of the uid
@@ -21,11 +30,10 @@ public function getPerunUser($idpEntityId, $uids)
 			return null;
 		}
 
-		$user = sspmod_perun_LdapConnector::searchForEntity("ou=People,dc=perun,dc=cesnet,dc=cz",
+		$user = sspmod_perun_LdapConnector::searchForEntity("ou=People," . $this->ldapBase,
 			"(|$query)",
 			array("perunUserId", "displayName", "cn", "givenName", "sn", "preferredMail", "mail")
 		);
-
 		if (is_null($user)) {
 			return $user;
 		}
@@ -44,7 +52,7 @@ public function getPerunUser($idpEntityId, $uids)
 	public function getMemberGroups($user, $vo)
 	{
 		$userId = $user->getId();
-		$userWithMembership = sspmod_perun_LdapConnector::searchForEntity("perunUserId=$userId,ou=People,dc=perun,dc=cesnet,dc=cz",
+		$userWithMembership = sspmod_perun_LdapConnector::searchForEntity("perunUserId=$userId,ou=People," . $this->ldapBase,
 			"(objectClass=perunUser)",
 			array("perunUserId", "memberOf")
 		);
@@ -69,15 +77,15 @@ public function getMemberGroups($user, $vo)
 
 	public function getSpGroups($spEntityId, $vo)
 	{
-		$resources = sspmod_perun_LdapConnector::searchForEntities("dc=perun,dc=cesnet,dc=cz",
+		$resources = sspmod_perun_LdapConnector::searchForEntities($this->ldapBase,
 			"(&(objectClass=perunResource)(entityID=$spEntityId))",
 			array("perunResourceId", "assignedGroupId", "perunVoId")
 		);
 
 		$groups = array();
 		foreach ($resources as $resource) {
 			foreach ($resource['assignedGroupId'] as $groupId) {
-				$group = sspmod_perun_LdapConnector::searchForEntity("perunGroupId=$groupId,perunVoId=" . $resource['perunVoId'][0] . ",dc=perun,dc=cesnet,dc=cz",
+				$group = sspmod_perun_LdapConnector::searchForEntity("perunGroupId=$groupId,perunVoId=" . $resource['perunVoId'][0] . "," . $this->ldapBase,
 					"(objectClass=perunGroup)",
 					array("perunGroupId", "cn", "perunUniqueGroupName", "perunVoId", "description")
 				);
@@ -94,7 +102,7 @@ public function getSpGroups($spEntityId, $vo)
 	public function getGroupByName($vo, $name)
 	{
 		$voId = $vo->getId();
-		$group = sspmod_perun_LdapConnector::searchForEntity("perunVoId=$voId,dc=perun,dc=cesnet,dc=cz",
+		$group = sspmod_perun_LdapConnector::searchForEntity("perunVoId=$voId," . $this->ldapBase,
 			"(&(objectClass=perunGroup)(perunUniqueGroupName=$name))",
 			array("perunGroupId", "cn", "perunUniqueGroupName", "perunVoId", "description")
 		);
@@ -108,7 +116,7 @@ public function getGroupByName($vo, $name)
 
 	public function getVoByShortName($voShortName)
 	{
-		$vo = sspmod_perun_LdapConnector::searchForEntity("dc=perun,dc=cesnet,dc=cz",
+		$vo = sspmod_perun_LdapConnector::searchForEntity($this->ldapBase,
 			"(&(objectClass=perunVo)(o=$voShortName))",
 			array("perunVoId", "o", "description")
 		);
@@ -123,7 +131,7 @@ public function getVoByShortName($voShortName)
 	public function getUserAttributes($user, $attrNames)
 	{
 		$userId = $user->getId();
-		$attributes = sspmod_perun_LdapConnector::searchForEntity("perunUserId=$userId,ou=People,dc=perun,dc=cesnet,dc=cz",
+		$attributes = sspmod_perun_LdapConnector::searchForEntity("perunUserId=$userId,ou=People," . $this->ldapBase,
 			"(objectClass=perunUser)",
 			$attrNames
 		);
@@ -134,7 +142,7 @@ public function getUserAttributes($user, $attrNames)
 
 	public function isUserOnFacility($spEntityId, $userId)
 	{
-		$resources = sspmod_perun_LdapConnector::searchForEntities("dc=perun,dc=cesnet,dc=cz",
+		$resources = sspmod_perun_LdapConnector::searchForEntities($this->ldapBase,
 			"(&(objectClass=perunResource)(entityID=$spEntityId))",
 			array("perunResourceId")
 		);
@@ -150,8 +158,8 @@ public function isUserOnFacility($spEntityId, $userId)
 		$resourcesString .= ")";
 
 		$resultGroups = array();
-		$groups = sspmod_perun_LdapConnector::searchForEntities("dc=perun,dc=cesnet,dc=cz",
-			"(&(uniqueMember=perunUserId=".$userId.",ou=People,dc=perun,dc=cesnet,dc=cz)".$resourcesString.")",
+		$groups = sspmod_perun_LdapConnector::searchForEntities($this->ldapBase,
+			"(&(uniqueMember=perunUserId=".$userId.", ou=People," . $this->ldapBase. ")".$resourcesString.")",
 			array("perunGroupId", "cn", "perunUniqueGroupName", "perunVoId", "description")
 		);