Merge pull request #38 from pajavyskocil/groupProperty

Added properties to Group model

Author: tauceti2

CHANGELOG.md

@@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file.
 [Changed]
 - Connectors methods are not static for now.
 - Added constructors to Adapters, which allows specified config file for each connections.
+- New properties voId and uniqueName in Group model
 
  ## [v1.0.0]
 

lib/AdapterLdap.php

@@ -93,7 +93,7 @@ public function getMemberGroups($user, $vo)
 				"(objectClass=perunGroup)",
 				array("perunGroupId", "cn", "perunUniqueGroupName", "perunVoId", "description")
 			);
-			array_push($groups, new sspmod_perun_model_Group($group['perunGroupId'][0], $group['perunUniqueGroupName'][0], $group['description'][0]));
+			array_push($groups, new sspmod_perun_model_Group($group['perunGroupId'][0], $group['perunVoId'][0], $group['cn'][0], $group['perunUniqueGroupName'][0], $group['description'][0]));
 		}
 
 		return $groups;
@@ -114,7 +114,7 @@ public function getSpGroups($spEntityId, $vo)
 					"(objectClass=perunGroup)",
 					array("perunGroupId", "cn", "perunUniqueGroupName", "perunVoId", "description")
 				);
-				array_push($groups, new sspmod_perun_model_Group($group['perunGroupId'][0], $group['perunUniqueGroupName'][0], $group['description'][0]));
+				array_push($groups, new sspmod_perun_model_Group($group['perunGroupId'][0], $group['perunVoId'][0], $group['cn'], $group['perunUniqueGroupName'][0], $group['description'][0]));
 			}
 		}
 
@@ -134,8 +134,7 @@ public function getGroupByName($vo, $name)
 		if (is_null($group)) {
 			throw new SimpleSAML_Error_Exception("Group with name: $name in VO: ".$vo->getName()." does not exists in Perun LDAP.");
 		}
-		$groupName = substr($group['perunUniqueGroupName'][0], strlen($vo->getShortName().':'));
-		return new sspmod_perun_model_Group($group['perunGroupId'][0], $groupName, $group['description'][0]);
+		return new sspmod_perun_model_Group($group['perunGroupId'][0], $group['perunVoId'][0], $group['cn'][0], $group['perunUniqueGroupName'][0], $group['description'][0]);
 	}
 
 
@@ -223,8 +222,7 @@ public function getUsersGroupsOnFacility($spEntityId, $userId)
 		);
 
 		foreach ($groups as $group) {
-			array_push($resultGroups, new sspmod_perun_model_Group($group['perunGroupId'][0], $group['perunUniqueGroupName'][0], $group['description'][0]));
-
+			array_push($resultGroups, new sspmod_perun_model_Group($group['perunGroupId'][0], $group['perunVoId'][0], $group['cn'][0], $group['perunUniqueGroupName'][0], $group['description'][0]));
 		}
 		$resultGroups = $this->removeDuplicateEntities($resultGroups);
 		SimpleSAML\Logger::debug("Groups - ".var_export($resultGroups, true));

lib/AdapterRpc.php

@@ -88,7 +88,16 @@ public function getMemberGroups($user, $vo)
 
 		$convertedGroups = array();
 		foreach ($memberGroups as $group) {
-			array_push($convertedGroups, new sspmod_perun_model_Group($group['id'], $group['name'], $group['description']));
+			try {
+				$attr = $this->connector->get('attributesManager', 'getAttribute', array(
+					'group' => $group['id'],
+					'attributeName' => 'urn:perun:group:attribute-def:virt:voShortName'
+				));
+				$uniqueName = $attr['value'] . ":" . $group['name'];
+				array_push($convertedGroups, new sspmod_perun_model_Group($group['id'], $group['voId'], $group['name'], $uniqueName, $group['description']));
+			} catch (sspmod_perun_Exception $e) {
+				continue;
+			}
 		}
 
 		return $convertedGroups;
@@ -127,7 +136,12 @@ public function getSpGroups($spEntityId, $vo)
 			));
 			$convertedGroups = array();
 			foreach ($groups as $group) {
-				array_push($convertedGroups, new sspmod_perun_model_Group($group['id'], $group['name'], $group['description']));
+				$attr = $this->connector->get('attributesManager', 'getAttribute', array(
+					'group' => $group['id'],
+					'attributeName' => 'urn:perun:group:attribute-def:virt:voShortName'
+				));
+				$uniqueName = $attr['value'] . ":" . $group['name'];
+				array_push($convertedGroups, new sspmod_perun_model_Group($group['id'], $group['voId'], $group['name'], $uniqueName, $group['description']));
 			}
 			$spGroups = array_merge($spGroups, $convertedGroups);
 		}
@@ -144,8 +158,12 @@ public function getGroupByName($vo, $name)
 			'vo' => $vo->getId(),
 			'name' => $name,
 		));
-
-		return new sspmod_perun_model_Group($group['id'], $group['name'], $group['description']);
+		$attr = $this->connector->get('attributesManager', 'getAttribute', array(
+			'group' => $group['id'],
+			'attributeName' => 'urn:perun:group:attribute-def:virt:voShortName'
+		));
+		$uniqueName = $attr['value'] . ":" . $group['name'];
+		return new sspmod_perun_model_Group($group['id'], $group['voId'], $group['name'], $uniqueName, $group['description']);
 	}
 
 
@@ -255,7 +273,12 @@ public function getUsersGroupsOnFacility($spEntityId, $userId)
 					'member' => $member['id'],
 				));
 				foreach ($groups as $group) {
-					array_push($allGroups, new sspmod_perun_model_Group($group['id'], $group['name'], $group['description']));
+					$attr = $this->connector->get('attributesManager', 'getAttribute', array(
+						'group' => $group['id'],
+						'attributeName' => 'urn:perun:group:attribute-def:virt:voShortName'
+					));
+					$uniqueName = $attr['value'] . ":" . $group['name'];
+					array_push($allGroups, new sspmod_perun_model_Group($group['id'], $group['voId'],  $group['name'], $uniqueName, $group['description']));
 				}
 			}
 		}

lib/Auth/Process/PerunGroups.php

@@ -77,9 +77,9 @@ public function process(&$request)
 					throw new SimpleSAML_Error_Exception("perun:PerunGroups: missing mandatory configuration options 'groupNameAuthority' or 'groupNamePrefix'.");
 				}
 
-				$groupName = $this->groupNamePrefix . rawurlencode($group->getName()) .  '#' . $this->groupNameAuthority;
+				$groupName = $this->groupNamePrefix . rawurlencode($group->getUniqueName()) .  '#' . $this->groupNameAuthority;
 			} else {
-				$groupName = $this->mapGroupName($request, $group->getName());
+				$groupName = $this->mapGroupName($request, $group->getUniqueName());
 			}
 			array_push($request['Attributes'][$this->attrName], $groupName);
 		}

lib/model/Group.php

@@ -6,27 +6,44 @@
 class sspmod_perun_model_Group implements sspmod_perun_model_HasId
 {
 	private $id;
+	private $voId;
 	private $name;
+	private $uniqueName;
 	private $description;
 
 	/**
 	 * sspmod_perun_model_Group constructor.
 	 * @param $id
+	 * @param $voId
 	 * @param $name
+	 * @param $uniqueName
 	 * @param $description
 	 */
-	public function __construct($id, $name, $description)
+	public function __construct($id, $voId, $name, $uniqueName, $description)
 	{
 		$this->id = $id;
+		$this->voId = $voId;
 		$this->name = $name;
+		$this->uniqueName = $uniqueName;
 		$this->description = $description;
 	}
 
+
 	public function getId()
 	{
 		return $this->id;
 	}
 
+	/**
+	 * @return int
+	 */
+	public function getVoId()
+	{
+		return $this->voId;
+	}
+
+
+
 	/**
 	 * @return string
 	 */
@@ -35,6 +52,16 @@ public function getName()
 		return $this->name;
 	}
 
+	/**
+	 * @return string
+	 */
+	public function getUniqueName()
+	{
+		return $this->uniqueName;
+	}
+
+
+
 	/**
 	 * @return string
 	 */