nextcloud / server

apps/dav/lib/CalDAV/ResourceBooking/AbstractPrincipalBackend.php

Indentation +342 added lines, -342 removed lines

@@ -32,346 +32,346 @@
 
 abstract class AbstractPrincipalBackend implements BackendInterface {
 
-	/** @var IDBConnection */
-	private $db;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var IGroupManager */
-	private $groupManager;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var string */
-	private $principalPrefix;
-
-	/** @var string */
-	private $dbTableName;
-
-	/** @var string */
-	private $cuType;
-
-	/**
-	 * @param IDBConnection $dbConnection
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 * @param ILogger $logger
-	 * @param string $principalPrefix
-	 * @param string $dbPrefix
-	 * @param string $cuType
-	 */
-	public function __construct(IDBConnection $dbConnection,
-								IUserSession $userSession,
-								IGroupManager $groupManager,
-								ILogger $logger,
-								string $principalPrefix,
-								string $dbPrefix,
-								string $cuType) {
-		$this->db = $dbConnection;
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-		$this->logger = $logger;
-		$this->principalPrefix = $principalPrefix;
-		$this->dbTableName = 'calendar_' . $dbPrefix;
-		$this->cuType = $cuType;
-	}
-
-	/**
-	 * Returns a list of principals based on a prefix.
-	 *
-	 * This prefix will often contain something like 'principals'. You are only
-	 * expected to return principals that are in this base path.
-	 *
-	 * You are expected to return at least a 'uri' for every user, you can
-	 * return any additional properties if you wish so. Common properties are:
-	 *   {DAV:}displayname
-	 *
-	 * @param string $prefixPath
-	 * @return string[]
-	 */
-	public function getPrincipalsByPrefix($prefixPath) {
-		$principals = [];
-
-		if ($prefixPath === $this->principalPrefix) {
-			$query = $this->db->getQueryBuilder();
-			$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
-				->from($this->dbTableName);
-			$stmt = $query->execute();
-
-			while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-				$principals[] = $this->rowToPrincipal($row);
-			}
-
-			$stmt->closeCursor();
-		}
-
-		return $principals;
-	}
-
-	/**
-	 * Returns a specific principal, specified by it's path.
-	 * The returned structure should be the exact same as from
-	 * getPrincipalsByPrefix.
-	 *
-	 * @param string $path
-	 * @return array
-	 */
-	public function getPrincipalByPath($path) {
-		if (strpos($path, $this->principalPrefix) !== 0) {
-			return null;
-		}
-		list(, $name) = \Sabre\Uri\split($path);
-
-		list($backendId, $resourceId) = explode('-',  $name, 2);
-
-		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
-			->from($this->dbTableName)
-			->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)))
-			->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resourceId)));
-		$stmt = $query->execute();
-		$row = $stmt->fetch(\PDO::FETCH_ASSOC);
-
-		if(!$row) {
-			return null;
-		}
-
-		return $this->rowToPrincipal($row);
-	}
-
-	/**
-	 * Returns the list of members for a group-principal
-	 *
-	 * @param string $principal
-	 * @return string[]
-	 */
-	public function getGroupMemberSet($principal) {
-		return [];
-	}
-
-	/**
-	 * Returns the list of groups a principal is a member of
-	 *
-	 * @param string $principal
-	 * @return array
-	 */
-	public function getGroupMembership($principal) {
-		return [];
-	}
-
-	/**
-	 * Updates the list of group members for a group principal.
-	 *
-	 * The principals should be passed as a list of uri's.
-	 *
-	 * @param string $principal
-	 * @param string[] $members
-	 * @throws Exception
-	 */
-	public function setGroupMemberSet($principal, array $members) {
-		throw new Exception('Setting members of the group is not supported yet');
-	}
-
-	/**
-	 * @param string $path
-	 * @param PropPatch $propPatch
-	 * @return int
-	 */
-	function updatePrincipal($path, PropPatch $propPatch) {
-		return 0;
-	}
-
-	/**
-	 * @param string $prefixPath
-	 * @param array $searchProperties
-	 * @param string $test
-	 * @return array
-	 */
-	function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof') {
-		$results = [];
-		if (\count($searchProperties) === 0) {
-			return [];
-		}
-		if ($prefixPath !== $this->principalPrefix) {
-			return [];
-		}
-
-		$user = $this->userSession->getUser();
-		if (!$user) {
-			return [];
-		}
-		$usersGroups = $this->groupManager->getUserGroupIds($user);
-
-		foreach ($searchProperties as $prop => $value) {
-			switch ($prop) {
-				case '{http://sabredav.org/ns}email-address':
-					$query = $this->db->getQueryBuilder();
-					$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
-						->from($this->dbTableName)
-						->where($query->expr()->iLike('email', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
-
-					$stmt = $query->execute();
-					$principals = [];
-					while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-						if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
-							continue;
-						}
-						$principals[] = $this->rowToPrincipal($row)['uri'];
-					}
-					$results[] = $principals;
-
-					$stmt->closeCursor();
-					break;
-
-				case '{DAV:}displayname':
-					$query = $this->db->getQueryBuilder();
-					$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
-						->from($this->dbTableName)
-						->where($query->expr()->iLike('displayname', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
-
-					$stmt = $query->execute();
-					$principals = [];
-					while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-						if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
-							continue;
-						}
-						$principals[] = $this->rowToPrincipal($row)['uri'];
-					}
-					$results[] = $principals;
-
-					$stmt->closeCursor();
-					break;
-
-				case '{urn:ietf:params:xml:ns:caldav}calendar-user-address-set':
-					// If you add support for more search properties that qualify as a user-address,
-					// please also add them to the array below
-					$results[] = $this->searchPrincipals($this->principalPrefix, [
-						'{http://sabredav.org/ns}email-address' => $value,
-					], 'anyof');
-					break;
-
-				default:
-					$results[] = [];
-					break;
-			}
-		}
-
-		// results is an array of arrays, so this is not the first search result
-		// but the results of the first searchProperty
-		if (count($results) === 1) {
-			return $results[0];
-		}
-
-		switch ($test) {
-			case 'anyof':
-				return array_values(array_unique(array_merge(...$results)));
-
-			case 'allof':
-			default:
-				return array_values(array_intersect(...$results));
-		}
-	}
-
-	/**
-	 * @param string $uri
-	 * @param string $principalPrefix
-	 * @return null|string
-	 */
-	function findByUri($uri, $principalPrefix) {
-		$user = $this->userSession->getUser();
-		if (!$user) {
-			return null;
-		}
-		$usersGroups = $this->groupManager->getUserGroupIds($user);
-
-		if (strpos($uri, 'mailto:') === 0) {
-			$email = substr($uri, 7);
-			$query = $this->db->getQueryBuilder();
-			$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
-				->from($this->dbTableName)
-				->where($query->expr()->eq('email', $query->createNamedParameter($email)));
-
-			$stmt = $query->execute();
-			$row = $stmt->fetch(\PDO::FETCH_ASSOC);
-
-			if(!$row) {
-				return null;
-			}
-			if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
-				return null;
-			}
-
-			return $this->rowToPrincipal($row)['uri'];
-		}
-
-		if (strpos($uri, 'principal:') === 0) {
-			$path = substr($uri, 10);
-			if (strpos($path, $this->principalPrefix) !== 0) {
-				return null;
-			}
-
-			list(, $name) = \Sabre\Uri\split($path);
-			list($backendId, $resourceId) = explode('-',  $name, 2);
-
-			$query = $this->db->getQueryBuilder();
-			$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
-				->from($this->dbTableName)
-				->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)))
-				->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resourceId)));
-			$stmt = $query->execute();
-			$row = $stmt->fetch(\PDO::FETCH_ASSOC);
-
-			if(!$row) {
-				return null;
-			}
-			if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
-				return null;
-			}
-
-			return $this->rowToPrincipal($row)['uri'];
-		}
-
-		return null;
-	}
-
-	/**
-	 * convert database row to principal
-	 */
-	private function rowToPrincipal($row) {
-		return [
-			'uri' => $this->principalPrefix . '/' . $row['backend_id'] . '-' . $row['resource_id'],
-			'{DAV:}displayname' => $row['displayname'],
-			'{http://sabredav.org/ns}email-address' => $row['email'],
-			'{urn:ietf:params:xml:ns:caldav}calendar-user-type' => $this->cuType,
-		];
-	}
-
-	/**
-	 * @param $row
-	 * @param $userGroups
-	 * @return bool
-	 */
-	private function isAllowedToAccessResource($row, $userGroups) {
-		if (!isset($row['group_restrictions']) ||
-			$row['group_restrictions'] === null ||
-			$row['group_restrictions'] === '') {
-			return true;
-		}
-
-		// group restrictions contains something, but not parsable, deny access and log warning
-		$json = json_decode($row['group_restrictions']);
-		if (!\is_array($json)) {
-			$this->logger->info('group_restrictions field could not be parsed for ' . $this->dbTableName . '::' . $row['id'] . ', denying access to resource');
-			return false;
-		}
-
-		// empty array => no group restrictions
-		if (empty($json)) {
-			return true;
-		}
-
-		return !empty(array_intersect($json, $userGroups));
-	}
+    /** @var IDBConnection */
+    private $db;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    /** @var IGroupManager */
+    private $groupManager;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var string */
+    private $principalPrefix;
+
+    /** @var string */
+    private $dbTableName;
+
+    /** @var string */
+    private $cuType;
+
+    /**
+     * @param IDBConnection $dbConnection
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     * @param ILogger $logger
+     * @param string $principalPrefix
+     * @param string $dbPrefix
+     * @param string $cuType
+     */
+    public function __construct(IDBConnection $dbConnection,
+                                IUserSession $userSession,
+                                IGroupManager $groupManager,
+                                ILogger $logger,
+                                string $principalPrefix,
+                                string $dbPrefix,
+                                string $cuType) {
+        $this->db = $dbConnection;
+        $this->userSession = $userSession;
+        $this->groupManager = $groupManager;
+        $this->logger = $logger;
+        $this->principalPrefix = $principalPrefix;
+        $this->dbTableName = 'calendar_' . $dbPrefix;
+        $this->cuType = $cuType;
+    }
+
+    /**
+     * Returns a list of principals based on a prefix.
+     *
+     * This prefix will often contain something like 'principals'. You are only
+     * expected to return principals that are in this base path.
+     *
+     * You are expected to return at least a 'uri' for every user, you can
+     * return any additional properties if you wish so. Common properties are:
+     *   {DAV:}displayname
+     *
+     * @param string $prefixPath
+     * @return string[]
+     */
+    public function getPrincipalsByPrefix($prefixPath) {
+        $principals = [];
+
+        if ($prefixPath === $this->principalPrefix) {
+            $query = $this->db->getQueryBuilder();
+            $query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
+                ->from($this->dbTableName);
+            $stmt = $query->execute();
+
+            while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+                $principals[] = $this->rowToPrincipal($row);
+            }
+
+            $stmt->closeCursor();
+        }
+
+        return $principals;
+    }
+
+    /**
+     * Returns a specific principal, specified by it's path.
+     * The returned structure should be the exact same as from
+     * getPrincipalsByPrefix.
+     *
+     * @param string $path
+     * @return array
+     */
+    public function getPrincipalByPath($path) {
+        if (strpos($path, $this->principalPrefix) !== 0) {
+            return null;
+        }
+        list(, $name) = \Sabre\Uri\split($path);
+
+        list($backendId, $resourceId) = explode('-',  $name, 2);
+
+        $query = $this->db->getQueryBuilder();
+        $query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
+            ->from($this->dbTableName)
+            ->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)))
+            ->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resourceId)));
+        $stmt = $query->execute();
+        $row = $stmt->fetch(\PDO::FETCH_ASSOC);
+
+        if(!$row) {
+            return null;
+        }
+
+        return $this->rowToPrincipal($row);
+    }
+
+    /**
+     * Returns the list of members for a group-principal
+     *
+     * @param string $principal
+     * @return string[]
+     */
+    public function getGroupMemberSet($principal) {
+        return [];
+    }
+
+    /**
+     * Returns the list of groups a principal is a member of
+     *
+     * @param string $principal
+     * @return array
+     */
+    public function getGroupMembership($principal) {
+        return [];
+    }
+
+    /**
+     * Updates the list of group members for a group principal.
+     *
+     * The principals should be passed as a list of uri's.
+     *
+     * @param string $principal
+     * @param string[] $members
+     * @throws Exception
+     */
+    public function setGroupMemberSet($principal, array $members) {
+        throw new Exception('Setting members of the group is not supported yet');
+    }
+
+    /**
+     * @param string $path
+     * @param PropPatch $propPatch
+     * @return int
+     */
+    function updatePrincipal($path, PropPatch $propPatch) {
+        return 0;
+    }
+
+    /**
+     * @param string $prefixPath
+     * @param array $searchProperties
+     * @param string $test
+     * @return array
+     */
+    function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof') {
+        $results = [];
+        if (\count($searchProperties) === 0) {
+            return [];
+        }
+        if ($prefixPath !== $this->principalPrefix) {
+            return [];
+        }
+
+        $user = $this->userSession->getUser();
+        if (!$user) {
+            return [];
+        }
+        $usersGroups = $this->groupManager->getUserGroupIds($user);
+
+        foreach ($searchProperties as $prop => $value) {
+            switch ($prop) {
+                case '{http://sabredav.org/ns}email-address':
+                    $query = $this->db->getQueryBuilder();
+                    $query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
+                        ->from($this->dbTableName)
+                        ->where($query->expr()->iLike('email', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
+
+                    $stmt = $query->execute();
+                    $principals = [];
+                    while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+                        if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
+                            continue;
+                        }
+                        $principals[] = $this->rowToPrincipal($row)['uri'];
+                    }
+                    $results[] = $principals;
+
+                    $stmt->closeCursor();
+                    break;
+
+                case '{DAV:}displayname':
+                    $query = $this->db->getQueryBuilder();
+                    $query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
+                        ->from($this->dbTableName)
+                        ->where($query->expr()->iLike('displayname', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
+
+                    $stmt = $query->execute();
+                    $principals = [];
+                    while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+                        if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
+                            continue;
+                        }
+                        $principals[] = $this->rowToPrincipal($row)['uri'];
+                    }
+                    $results[] = $principals;
+
+                    $stmt->closeCursor();
+                    break;
+
+                case '{urn:ietf:params:xml:ns:caldav}calendar-user-address-set':
+                    // If you add support for more search properties that qualify as a user-address,
+                    // please also add them to the array below
+                    $results[] = $this->searchPrincipals($this->principalPrefix, [
+                        '{http://sabredav.org/ns}email-address' => $value,
+                    ], 'anyof');
+                    break;
+
+                default:
+                    $results[] = [];
+                    break;
+            }
+        }
+
+        // results is an array of arrays, so this is not the first search result
+        // but the results of the first searchProperty
+        if (count($results) === 1) {
+            return $results[0];
+        }
+
+        switch ($test) {
+            case 'anyof':
+                return array_values(array_unique(array_merge(...$results)));
+
+            case 'allof':
+            default:
+                return array_values(array_intersect(...$results));
+        }
+    }
+
+    /**
+     * @param string $uri
+     * @param string $principalPrefix
+     * @return null|string
+     */
+    function findByUri($uri, $principalPrefix) {
+        $user = $this->userSession->getUser();
+        if (!$user) {
+            return null;
+        }
+        $usersGroups = $this->groupManager->getUserGroupIds($user);
+
+        if (strpos($uri, 'mailto:') === 0) {
+            $email = substr($uri, 7);
+            $query = $this->db->getQueryBuilder();
+            $query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
+                ->from($this->dbTableName)
+                ->where($query->expr()->eq('email', $query->createNamedParameter($email)));
+
+            $stmt = $query->execute();
+            $row = $stmt->fetch(\PDO::FETCH_ASSOC);
+
+            if(!$row) {
+                return null;
+            }
+            if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
+                return null;
+            }
+
+            return $this->rowToPrincipal($row)['uri'];
+        }
+
+        if (strpos($uri, 'principal:') === 0) {
+            $path = substr($uri, 10);
+            if (strpos($path, $this->principalPrefix) !== 0) {
+                return null;
+            }
+
+            list(, $name) = \Sabre\Uri\split($path);
+            list($backendId, $resourceId) = explode('-',  $name, 2);
+
+            $query = $this->db->getQueryBuilder();
+            $query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
+                ->from($this->dbTableName)
+                ->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)))
+                ->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resourceId)));
+            $stmt = $query->execute();
+            $row = $stmt->fetch(\PDO::FETCH_ASSOC);
+
+            if(!$row) {
+                return null;
+            }
+            if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
+                return null;
+            }
+
+            return $this->rowToPrincipal($row)['uri'];
+        }
+
+        return null;
+    }
+
+    /**
+     * convert database row to principal
+     */
+    private function rowToPrincipal($row) {
+        return [
+            'uri' => $this->principalPrefix . '/' . $row['backend_id'] . '-' . $row['resource_id'],
+            '{DAV:}displayname' => $row['displayname'],
+            '{http://sabredav.org/ns}email-address' => $row['email'],
+            '{urn:ietf:params:xml:ns:caldav}calendar-user-type' => $this->cuType,
+        ];
+    }
+
+    /**
+     * @param $row
+     * @param $userGroups
+     * @return bool
+     */
+    private function isAllowedToAccessResource($row, $userGroups) {
+        if (!isset($row['group_restrictions']) ||
+            $row['group_restrictions'] === null ||
+            $row['group_restrictions'] === '') {
+            return true;
+        }
+
+        // group restrictions contains something, but not parsable, deny access and log warning
+        $json = json_decode($row['group_restrictions']);
+        if (!\is_array($json)) {
+            $this->logger->info('group_restrictions field could not be parsed for ' . $this->dbTableName . '::' . $row['id'] . ', denying access to resource');
+            return false;
+        }
+
+        // empty array => no group restrictions
+        if (empty($json)) {
+            return true;
+        }
+
+        return !empty(array_intersect($json, $userGroups));
+    }
 }

apps/dav/lib/Connector/Sabre/Principal.php

Indentation +432 added lines, -432 removed lines

@@ -50,437 +50,437 @@
 
 class Principal implements BackendInterface {
 
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var IGroupManager */
-	private $groupManager;
-
-	/** @var IShareManager */
-	private $shareManager;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IAppManager */
-	private $appManager;
-
-	/** @var string */
-	private $principalPrefix;
-
-	/** @var bool */
-	private $hasGroups;
-
-	/** @var bool */
-	private $hasCircles;
-
-	/**
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 * @param IShareManager $shareManager
-	 * @param IUserSession $userSession
-	 * @param IConfig $config
-	 * @param string $principalPrefix
-	 */
-	public function __construct(IUserManager $userManager,
-								IGroupManager $groupManager,
-								IShareManager $shareManager,
-								IUserSession $userSession,
-								IConfig $config,
-								IAppManager $appManager,
-								$principalPrefix = 'principals/users/') {
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->shareManager = $shareManager;
-		$this->userSession = $userSession;
-		$this->config = $config;
-		$this->appManager = $appManager;
-		$this->principalPrefix = trim($principalPrefix, '/');
-		$this->hasGroups = $this->hasCircles = ($principalPrefix === 'principals/users/');
-	}
-
-	/**
-	 * Returns a list of principals based on a prefix.
-	 *
-	 * This prefix will often contain something like 'principals'. You are only
-	 * expected to return principals that are in this base path.
-	 *
-	 * You are expected to return at least a 'uri' for every user, you can
-	 * return any additional properties if you wish so. Common properties are:
-	 *   {DAV:}displayname
-	 *
-	 * @param string $prefixPath
-	 * @return string[]
-	 */
-	public function getPrincipalsByPrefix($prefixPath) {
-		$principals = [];
-
-		if ($prefixPath === $this->principalPrefix) {
-			foreach($this->userManager->search('') as $user) {
-				$principals[] = $this->userToPrincipal($user);
-			}
-		}
-
-		return $principals;
-	}
-
-	/**
-	 * Returns a specific principal, specified by it's path.
-	 * The returned structure should be the exact same as from
-	 * getPrincipalsByPrefix.
-	 *
-	 * @param string $path
-	 * @return array
-	 */
-	public function getPrincipalByPath($path) {
-		list($prefix, $name) = \Sabre\Uri\split($path);
-
-		if ($prefix === $this->principalPrefix) {
-			$user = $this->userManager->get($name);
-
-			if ($user !== null) {
-				return $this->userToPrincipal($user);
-			}
-		} else if ($prefix === 'principals/circles') {
-			try {
-				return $this->circleToPrincipal($name);
-			} catch (QueryException $e) {
-				return null;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the list of members for a group-principal
-	 *
-	 * @param string $principal
-	 * @return string[]
-	 * @throws Exception
-	 */
-	public function getGroupMemberSet($principal) {
-		// TODO: for now the group principal has only one member, the user itself
-		$principal = $this->getPrincipalByPath($principal);
-		if (!$principal) {
-			throw new Exception('Principal not found');
-		}
-
-		return [$principal['uri']];
-	}
-
-	/**
-	 * Returns the list of groups a principal is a member of
-	 *
-	 * @param string $principal
-	 * @param bool $needGroups
-	 * @return array
-	 * @throws Exception
-	 */
-	public function getGroupMembership($principal, $needGroups = false) {
-		list($prefix, $name) = \Sabre\Uri\split($principal);
-
-		if ($prefix === $this->principalPrefix) {
-			$user = $this->userManager->get($name);
-			if (!$user) {
-				throw new Exception('Principal not found');
-			}
-
-			if ($this->hasGroups || $needGroups) {
-				$groups = $this->groupManager->getUserGroups($user);
-				$groups = array_map(function($group) {
-					/** @var IGroup $group */
-					return 'principals/groups/' . urlencode($group->getGID());
-				}, $groups);
-
-				return $groups;
-			}
-		}
-		return [];
-	}
-
-	/**
-	 * Updates the list of group members for a group principal.
-	 *
-	 * The principals should be passed as a list of uri's.
-	 *
-	 * @param string $principal
-	 * @param string[] $members
-	 * @throws Exception
-	 */
-	public function setGroupMemberSet($principal, array $members) {
-		throw new Exception('Setting members of the group is not supported yet');
-	}
-
-	/**
-	 * @param string $path
-	 * @param PropPatch $propPatch
-	 * @return int
-	 */
-	function updatePrincipal($path, PropPatch $propPatch) {
-		return 0;
-	}
-
-	/**
-	 * Search user principals
-	 *
-	 * @param array $searchProperties
-	 * @param string $test
-	 * @return array
-	 */
-	protected function searchUserPrincipals(array $searchProperties, $test = 'allof') {
-		$results = [];
-
-		// If sharing is disabled, return the empty array
-		$shareAPIEnabled = $this->shareManager->shareApiEnabled();
-		if (!$shareAPIEnabled) {
-			return [];
-		}
-
-		// If sharing is restricted to group members only,
-		// return only members that have groups in common
-		$restrictGroups = false;
-		if ($this->shareManager->shareWithGroupMembersOnly()) {
-			$user = $this->userSession->getUser();
-			if (!$user) {
-				return [];
-			}
-
-			$restrictGroups = $this->groupManager->getUserGroupIds($user);
-		}
-
-		foreach ($searchProperties as $prop => $value) {
-			switch ($prop) {
-				case '{http://sabredav.org/ns}email-address':
-					$users = $this->userManager->getByEmail($value);
-
-					$results[] = array_reduce($users, function(array $carry, IUser $user) use ($restrictGroups) {
-						// is sharing restricted to groups only?
-						if ($restrictGroups !== false) {
-							$userGroups = $this->groupManager->getUserGroupIds($user);
-							if (count(array_intersect($userGroups, $restrictGroups)) === 0) {
-								return $carry;
-							}
-						}
-
-						$carry[] = $this->principalPrefix . '/' . $user->getUID();
-						return $carry;
-					}, []);
-					break;
-
-				case '{DAV:}displayname':
-					$users = $this->userManager->searchDisplayName($value);
-
-					$results[] = array_reduce($users, function(array $carry, IUser $user) use ($restrictGroups) {
-						// is sharing restricted to groups only?
-						if ($restrictGroups !== false) {
-							$userGroups = $this->groupManager->getUserGroupIds($user);
-							if (count(array_intersect($userGroups, $restrictGroups)) === 0) {
-								return $carry;
-							}
-						}
-
-						$carry[] = $this->principalPrefix . '/' . $user->getUID();
-						return $carry;
-					}, []);
-					break;
-
-				case '{urn:ietf:params:xml:ns:caldav}calendar-user-address-set':
-					// If you add support for more search properties that qualify as a user-address,
-					// please also add them to the array below
-					$results[] = $this->searchUserPrincipals([
-						// In theory this should also search for principal:principals/users/...
-						// but that's used internally only anyway and i don't know of any client querying that
-						'{http://sabredav.org/ns}email-address' => $value,
-					], 'anyof');
-					break;
-
-				default:
-					$results[] = [];
-					break;
-			}
-		}
-
-		// results is an array of arrays, so this is not the first search result
-		// but the results of the first searchProperty
-		if (count($results) === 1) {
-			return $results[0];
-		}
-
-		switch ($test) {
-			case 'anyof':
-				return array_values(array_unique(array_merge(...$results)));
-
-			case 'allof':
-			default:
-				return array_values(array_intersect(...$results));
-		}
-	}
-
-	/**
-	 * @param string $prefixPath
-	 * @param array $searchProperties
-	 * @param string $test
-	 * @return array
-	 */
-	function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof') {
-		if (count($searchProperties) === 0) {
-			return [];
-		}
-
-		switch ($prefixPath) {
-			case 'principals/users':
-				return $this->searchUserPrincipals($searchProperties, $test);
-
-			default:
-				return [];
-		}
-	}
-
-	/**
-	 * @param string $uri
-	 * @param string $principalPrefix
-	 * @return string
-	 */
-	function findByUri($uri, $principalPrefix) {
-		// If sharing is disabled, return the empty array
-		$shareAPIEnabled = $this->shareManager->shareApiEnabled();
-		if (!$shareAPIEnabled) {
-			return null;
-		}
-
-		// If sharing is restricted to group members only,
-		// return only members that have groups in common
-		$restrictGroups = false;
-		if ($this->shareManager->shareWithGroupMembersOnly()) {
-			$user = $this->userSession->getUser();
-			if (!$user) {
-				return null;
-			}
-
-			$restrictGroups = $this->groupManager->getUserGroupIds($user);
-		}
-
-		if (strpos($uri, 'mailto:') === 0) {
-			if ($principalPrefix === 'principals/users') {
-				$users = $this->userManager->getByEmail(substr($uri, 7));
-				if (count($users) !== 1) {
-					return null;
-				}
-				$user = $users[0];
-
-				if ($restrictGroups !== false) {
-					$userGroups = $this->groupManager->getUserGroupIds($user);
-					if (count(array_intersect($userGroups, $restrictGroups)) === 0) {
-						return null;
-					}
-				}
-
-				return $this->principalPrefix . '/' . $user->getUID();
-			}
-		}
-		if (substr($uri, 0, 10) === 'principal:') {
-			$principal = substr($uri, 10);
-			$principal = $this->getPrincipalByPath($principal);
-			if ($principal !== null) {
-				return $principal['uri'];
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return array
-	 */
-	protected function userToPrincipal($user) {
-		$userId = $user->getUID();
-		$displayName = $user->getDisplayName();
-		$principal = [
-				'uri' => $this->principalPrefix . '/' . $userId,
-				'{DAV:}displayname' => is_null($displayName) ? $userId : $displayName,
-				'{urn:ietf:params:xml:ns:caldav}calendar-user-type' => 'INDIVIDUAL',
-		];
-
-		$email = $user->getEMailAddress();
-		if (!empty($email)) {
-			$principal['{http://sabredav.org/ns}email-address'] = $email;
-		}
-
-		return $principal;
-	}
-
-	public function getPrincipalPrefix() {
-		return $this->principalPrefix;
-	}
-
-	/**
-	 * @param string $circleUniqueId
-	 * @return array|null
-	 * @throws \OCP\AppFramework\QueryException
-	 * @suppress PhanUndeclaredClassMethod
-	 * @suppress PhanUndeclaredClassCatch
-	 */
-	protected function circleToPrincipal($circleUniqueId) {
-		if (!$this->appManager->isEnabledForUser('circles') || !class_exists('\OCA\Circles\Api\v1\Circles')) {
-			return null;
-		}
-
-		try {
-			$circle = \OCA\Circles\Api\v1\Circles::detailsCircle($circleUniqueId, true);
-		} catch(QueryException $ex) {
-			return null;
-		} catch(CircleDoesNotExistException $ex) {
-			return null;
-		}
-
-		if (!$circle) {
-			return null;
-		}
-
-		$principal = [
-			'uri' => 'principals/circles/' . $circleUniqueId,
-			'{DAV:}displayname' => $circle->getName(),
-		];
-
-		return $principal;
-	}
-
-	/**
-	 * Returns the list of circles a principal is a member of
-	 *
-	 * @param string $principal
-	 * @return array
-	 * @throws Exception
-	 * @throws \OCP\AppFramework\QueryException
-	 * @suppress PhanUndeclaredClassMethod
-	 */
-	public function getCircleMembership($principal):array {
-		if (!$this->appManager->isEnabledForUser('circles') || !class_exists('\OCA\Circles\Api\v1\Circles')) {
-			return [];
-		}
-
-		list($prefix, $name) = \Sabre\Uri\split($principal);
-		if ($this->hasCircles && $prefix === $this->principalPrefix) {
-			$user = $this->userManager->get($name);
-			if (!$user) {
-				throw new Exception('Principal not found');
-			}
-
-			$circles = \OCA\Circles\Api\v1\Circles::joinedCircles($name, true);
-
-			$circles = array_map(function($circle) {
-				/** @var \OCA\Circles\Model\Circle $circle */
-				return 'principals/circles/' . urlencode($circle->getUniqueId());
-			}, $circles);
-
-			return $circles;
-		}
-
-		return [];
-	}
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var IGroupManager */
+    private $groupManager;
+
+    /** @var IShareManager */
+    private $shareManager;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var IAppManager */
+    private $appManager;
+
+    /** @var string */
+    private $principalPrefix;
+
+    /** @var bool */
+    private $hasGroups;
+
+    /** @var bool */
+    private $hasCircles;
+
+    /**
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     * @param IShareManager $shareManager
+     * @param IUserSession $userSession
+     * @param IConfig $config
+     * @param string $principalPrefix
+     */
+    public function __construct(IUserManager $userManager,
+                                IGroupManager $groupManager,
+                                IShareManager $shareManager,
+                                IUserSession $userSession,
+                                IConfig $config,
+                                IAppManager $appManager,
+                                $principalPrefix = 'principals/users/') {
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        $this->shareManager = $shareManager;
+        $this->userSession = $userSession;
+        $this->config = $config;
+        $this->appManager = $appManager;
+        $this->principalPrefix = trim($principalPrefix, '/');
+        $this->hasGroups = $this->hasCircles = ($principalPrefix === 'principals/users/');
+    }
+
+    /**
+     * Returns a list of principals based on a prefix.
+     *
+     * This prefix will often contain something like 'principals'. You are only
+     * expected to return principals that are in this base path.
+     *
+     * You are expected to return at least a 'uri' for every user, you can
+     * return any additional properties if you wish so. Common properties are:
+     *   {DAV:}displayname
+     *
+     * @param string $prefixPath
+     * @return string[]
+     */
+    public function getPrincipalsByPrefix($prefixPath) {
+        $principals = [];
+
+        if ($prefixPath === $this->principalPrefix) {
+            foreach($this->userManager->search('') as $user) {
+                $principals[] = $this->userToPrincipal($user);
+            }
+        }
+
+        return $principals;
+    }
+
+    /**
+     * Returns a specific principal, specified by it's path.
+     * The returned structure should be the exact same as from
+     * getPrincipalsByPrefix.
+     *
+     * @param string $path
+     * @return array
+     */
+    public function getPrincipalByPath($path) {
+        list($prefix, $name) = \Sabre\Uri\split($path);
+
+        if ($prefix === $this->principalPrefix) {
+            $user = $this->userManager->get($name);
+
+            if ($user !== null) {
+                return $this->userToPrincipal($user);
+            }
+        } else if ($prefix === 'principals/circles') {
+            try {
+                return $this->circleToPrincipal($name);
+            } catch (QueryException $e) {
+                return null;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Returns the list of members for a group-principal
+     *
+     * @param string $principal
+     * @return string[]
+     * @throws Exception
+     */
+    public function getGroupMemberSet($principal) {
+        // TODO: for now the group principal has only one member, the user itself
+        $principal = $this->getPrincipalByPath($principal);
+        if (!$principal) {
+            throw new Exception('Principal not found');
+        }
+
+        return [$principal['uri']];
+    }
+
+    /**
+     * Returns the list of groups a principal is a member of
+     *
+     * @param string $principal
+     * @param bool $needGroups
+     * @return array
+     * @throws Exception
+     */
+    public function getGroupMembership($principal, $needGroups = false) {
+        list($prefix, $name) = \Sabre\Uri\split($principal);
+
+        if ($prefix === $this->principalPrefix) {
+            $user = $this->userManager->get($name);
+            if (!$user) {
+                throw new Exception('Principal not found');
+            }
+
+            if ($this->hasGroups || $needGroups) {
+                $groups = $this->groupManager->getUserGroups($user);
+                $groups = array_map(function($group) {
+                    /** @var IGroup $group */
+                    return 'principals/groups/' . urlencode($group->getGID());
+                }, $groups);
+
+                return $groups;
+            }
+        }
+        return [];
+    }
+
+    /**
+     * Updates the list of group members for a group principal.
+     *
+     * The principals should be passed as a list of uri's.
+     *
+     * @param string $principal
+     * @param string[] $members
+     * @throws Exception
+     */
+    public function setGroupMemberSet($principal, array $members) {
+        throw new Exception('Setting members of the group is not supported yet');
+    }
+
+    /**
+     * @param string $path
+     * @param PropPatch $propPatch
+     * @return int
+     */
+    function updatePrincipal($path, PropPatch $propPatch) {
+        return 0;
+    }
+
+    /**
+     * Search user principals
+     *
+     * @param array $searchProperties
+     * @param string $test
+     * @return array
+     */
+    protected function searchUserPrincipals(array $searchProperties, $test = 'allof') {
+        $results = [];
+
+        // If sharing is disabled, return the empty array
+        $shareAPIEnabled = $this->shareManager->shareApiEnabled();
+        if (!$shareAPIEnabled) {
+            return [];
+        }
+
+        // If sharing is restricted to group members only,
+        // return only members that have groups in common
+        $restrictGroups = false;
+        if ($this->shareManager->shareWithGroupMembersOnly()) {
+            $user = $this->userSession->getUser();
+            if (!$user) {
+                return [];
+            }
+
+            $restrictGroups = $this->groupManager->getUserGroupIds($user);
+        }
+
+        foreach ($searchProperties as $prop => $value) {
+            switch ($prop) {
+                case '{http://sabredav.org/ns}email-address':
+                    $users = $this->userManager->getByEmail($value);
+
+                    $results[] = array_reduce($users, function(array $carry, IUser $user) use ($restrictGroups) {
+                        // is sharing restricted to groups only?
+                        if ($restrictGroups !== false) {
+                            $userGroups = $this->groupManager->getUserGroupIds($user);
+                            if (count(array_intersect($userGroups, $restrictGroups)) === 0) {
+                                return $carry;
+                            }
+                        }
+
+                        $carry[] = $this->principalPrefix . '/' . $user->getUID();
+                        return $carry;
+                    }, []);
+                    break;
+
+                case '{DAV:}displayname':
+                    $users = $this->userManager->searchDisplayName($value);
+
+                    $results[] = array_reduce($users, function(array $carry, IUser $user) use ($restrictGroups) {
+                        // is sharing restricted to groups only?
+                        if ($restrictGroups !== false) {
+                            $userGroups = $this->groupManager->getUserGroupIds($user);
+                            if (count(array_intersect($userGroups, $restrictGroups)) === 0) {
+                                return $carry;
+                            }
+                        }
+
+                        $carry[] = $this->principalPrefix . '/' . $user->getUID();
+                        return $carry;
+                    }, []);
+                    break;
+
+                case '{urn:ietf:params:xml:ns:caldav}calendar-user-address-set':
+                    // If you add support for more search properties that qualify as a user-address,
+                    // please also add them to the array below
+                    $results[] = $this->searchUserPrincipals([
+                        // In theory this should also search for principal:principals/users/...
+                        // but that's used internally only anyway and i don't know of any client querying that
+                        '{http://sabredav.org/ns}email-address' => $value,
+                    ], 'anyof');
+                    break;
+
+                default:
+                    $results[] = [];
+                    break;
+            }
+        }
+
+        // results is an array of arrays, so this is not the first search result
+        // but the results of the first searchProperty
+        if (count($results) === 1) {
+            return $results[0];
+        }
+
+        switch ($test) {
+            case 'anyof':
+                return array_values(array_unique(array_merge(...$results)));
+
+            case 'allof':
+            default:
+                return array_values(array_intersect(...$results));
+        }
+    }
+
+    /**
+     * @param string $prefixPath
+     * @param array $searchProperties
+     * @param string $test
+     * @return array
+     */
+    function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof') {
+        if (count($searchProperties) === 0) {
+            return [];
+        }
+
+        switch ($prefixPath) {
+            case 'principals/users':
+                return $this->searchUserPrincipals($searchProperties, $test);
+
+            default:
+                return [];
+        }
+    }
+
+    /**
+     * @param string $uri
+     * @param string $principalPrefix
+     * @return string
+     */
+    function findByUri($uri, $principalPrefix) {
+        // If sharing is disabled, return the empty array
+        $shareAPIEnabled = $this->shareManager->shareApiEnabled();
+        if (!$shareAPIEnabled) {
+            return null;
+        }
+
+        // If sharing is restricted to group members only,
+        // return only members that have groups in common
+        $restrictGroups = false;
+        if ($this->shareManager->shareWithGroupMembersOnly()) {
+            $user = $this->userSession->getUser();
+            if (!$user) {
+                return null;
+            }
+
+            $restrictGroups = $this->groupManager->getUserGroupIds($user);
+        }
+
+        if (strpos($uri, 'mailto:') === 0) {
+            if ($principalPrefix === 'principals/users') {
+                $users = $this->userManager->getByEmail(substr($uri, 7));
+                if (count($users) !== 1) {
+                    return null;
+                }
+                $user = $users[0];
+
+                if ($restrictGroups !== false) {
+                    $userGroups = $this->groupManager->getUserGroupIds($user);
+                    if (count(array_intersect($userGroups, $restrictGroups)) === 0) {
+                        return null;
+                    }
+                }
+
+                return $this->principalPrefix . '/' . $user->getUID();
+            }
+        }
+        if (substr($uri, 0, 10) === 'principal:') {
+            $principal = substr($uri, 10);
+            $principal = $this->getPrincipalByPath($principal);
+            if ($principal !== null) {
+                return $principal['uri'];
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * @param IUser $user
+     * @return array
+     */
+    protected function userToPrincipal($user) {
+        $userId = $user->getUID();
+        $displayName = $user->getDisplayName();
+        $principal = [
+                'uri' => $this->principalPrefix . '/' . $userId,
+                '{DAV:}displayname' => is_null($displayName) ? $userId : $displayName,
+                '{urn:ietf:params:xml:ns:caldav}calendar-user-type' => 'INDIVIDUAL',
+        ];
+
+        $email = $user->getEMailAddress();
+        if (!empty($email)) {
+            $principal['{http://sabredav.org/ns}email-address'] = $email;
+        }
+
+        return $principal;
+    }
+
+    public function getPrincipalPrefix() {
+        return $this->principalPrefix;
+    }
+
+    /**
+     * @param string $circleUniqueId
+     * @return array|null
+     * @throws \OCP\AppFramework\QueryException
+     * @suppress PhanUndeclaredClassMethod
+     * @suppress PhanUndeclaredClassCatch
+     */
+    protected function circleToPrincipal($circleUniqueId) {
+        if (!$this->appManager->isEnabledForUser('circles') || !class_exists('\OCA\Circles\Api\v1\Circles')) {
+            return null;
+        }
+
+        try {
+            $circle = \OCA\Circles\Api\v1\Circles::detailsCircle($circleUniqueId, true);
+        } catch(QueryException $ex) {
+            return null;
+        } catch(CircleDoesNotExistException $ex) {
+            return null;
+        }
+
+        if (!$circle) {
+            return null;
+        }
+
+        $principal = [
+            'uri' => 'principals/circles/' . $circleUniqueId,
+            '{DAV:}displayname' => $circle->getName(),
+        ];
+
+        return $principal;
+    }
+
+    /**
+     * Returns the list of circles a principal is a member of
+     *
+     * @param string $principal
+     * @return array
+     * @throws Exception
+     * @throws \OCP\AppFramework\QueryException
+     * @suppress PhanUndeclaredClassMethod
+     */
+    public function getCircleMembership($principal):array {
+        if (!$this->appManager->isEnabledForUser('circles') || !class_exists('\OCA\Circles\Api\v1\Circles')) {
+            return [];
+        }
+
+        list($prefix, $name) = \Sabre\Uri\split($principal);
+        if ($this->hasCircles && $prefix === $this->principalPrefix) {
+            $user = $this->userManager->get($name);
+            if (!$user) {
+                throw new Exception('Principal not found');
+            }
+
+            $circles = \OCA\Circles\Api\v1\Circles::joinedCircles($name, true);
+
+            $circles = array_map(function($circle) {
+                /** @var \OCA\Circles\Model\Circle $circle */
+                return 'principals/circles/' . urlencode($circle->getUniqueId());
+            }, $circles);
+
+            return $circles;
+        }
+
+        return [];
+    }
 
 }

apps/dav/lib/DAV/GroupPrincipalBackend.php

Indentation +290 added lines, -290 removed lines

@@ -35,294 +35,294 @@
 
 class GroupPrincipalBackend implements BackendInterface {
 
-	const PRINCIPAL_PREFIX = 'principals/groups';
-
-	/** @var IGroupManager */
-	private $groupManager;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var IShareManager */
-	private $shareManager;
-
-	/**
-	 * @param IGroupManager $IGroupManager
-	 * @param IUserSession $userSession
-	 * @param IShareManager $shareManager
-	 */
-	public function __construct(IGroupManager $IGroupManager,
-								IUserSession $userSession,
-								IShareManager $shareManager) {
-		$this->groupManager = $IGroupManager;
-		$this->userSession = $userSession;
-		$this->shareManager = $shareManager;
-	}
-
-	/**
-	 * Returns a list of principals based on a prefix.
-	 *
-	 * This prefix will often contain something like 'principals'. You are only
-	 * expected to return principals that are in this base path.
-	 *
-	 * You are expected to return at least a 'uri' for every user, you can
-	 * return any additional properties if you wish so. Common properties are:
-	 *   {DAV:}displayname
-	 *
-	 * @param string $prefixPath
-	 * @return string[]
-	 */
-	public function getPrincipalsByPrefix($prefixPath) {
-		$principals = [];
-
-		if ($prefixPath === self::PRINCIPAL_PREFIX) {
-			foreach($this->groupManager->search('') as $user) {
-				$principals[] = $this->groupToPrincipal($user);
-			}
-		}
-
-		return $principals;
-	}
-
-	/**
-	 * Returns a specific principal, specified by it's path.
-	 * The returned structure should be the exact same as from
-	 * getPrincipalsByPrefix.
-	 *
-	 * @param string $path
-	 * @return array
-	 */
-	public function getPrincipalByPath($path) {
-		$elements = explode('/', $path,  3);
-		if ($elements[0] !== 'principals') {
-			return null;
-		}
-		if ($elements[1] !== 'groups') {
-			return null;
-		}
-		$name = urldecode($elements[2]);
-		$group = $this->groupManager->get($name);
-
-		if (!is_null($group)) {
-			return $this->groupToPrincipal($group);
-		}
-
-		return null;
-	}
-
-	/**
-	 * Returns the list of members for a group-principal
-	 *
-	 * @param string $principal
-	 * @return string[]
-	 * @throws Exception
-	 */
-	public function getGroupMemberSet($principal) {
-		$elements = explode('/', $principal);
-		if ($elements[0] !== 'principals') {
-			return [];
-		}
-		if ($elements[1] !== 'groups') {
-			return [];
-		}
-		$name = $elements[2];
-		$group = $this->groupManager->get($name);
-
-		if (is_null($group)) {
-			return [];
-		}
-
-		return array_map(function($user) {
-			return $this->userToPrincipal($user);
-		}, $group->getUsers());
-	}
-
-	/**
-	 * Returns the list of groups a principal is a member of
-	 *
-	 * @param string $principal
-	 * @return array
-	 * @throws Exception
-	 */
-	public function getGroupMembership($principal) {
-		return [];
-	}
-
-	/**
-	 * Updates the list of group members for a group principal.
-	 *
-	 * The principals should be passed as a list of uri's.
-	 *
-	 * @param string $principal
-	 * @param string[] $members
-	 * @throws Exception
-	 */
-	public function setGroupMemberSet($principal, array $members) {
-		throw new Exception('Setting members of the group is not supported yet');
-	}
-
-	/**
-	 * @param string $path
-	 * @param PropPatch $propPatch
-	 * @return int
-	 */
-	function updatePrincipal($path, PropPatch $propPatch) {
-		return 0;
-	}
-
-	/**
-	 * @param string $prefixPath
-	 * @param array $searchProperties
-	 * @param string $test
-	 * @return array
-	 */
-	function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof') {
-		$results = [];
-
-		if (\count($searchProperties) === 0) {
-			return [];
-		}
-		if ($prefixPath !== self::PRINCIPAL_PREFIX) {
-			return [];
-		}
-		// If sharing is disabled, return the empty array
-		$shareAPIEnabled = $this->shareManager->shareApiEnabled();
-		if (!$shareAPIEnabled) {
-			return [];
-		}
-
-		// If sharing is restricted to group members only,
-		// return only members that have groups in common
-		$restrictGroups = false;
-		if ($this->shareManager->shareWithGroupMembersOnly()) {
-			$user = $this->userSession->getUser();
-			if (!$user) {
-				return [];
-			}
-
-			$restrictGroups = $this->groupManager->getUserGroupIds($user);
-		}
-
-		foreach ($searchProperties as $prop => $value) {
-			switch ($prop) {
-				case '{DAV:}displayname':
-					$groups = $this->groupManager->search($value);
-
-					$results[] = array_reduce($groups, function(array $carry, IGroup $group) use ($restrictGroups) {
-						$gid = $group->getGID();
-						// is sharing restricted to groups only?
-						if ($restrictGroups !== false) {
-							if (!\in_array($gid, $restrictGroups, true)) {
-								return $carry;
-							}
-						}
-
-						$carry[] = self::PRINCIPAL_PREFIX . '/' . $gid;
-						return $carry;
-					}, []);
-					break;
-
-				case '{urn:ietf:params:xml:ns:caldav}calendar-user-address-set':
-					// If you add support for more search properties that qualify as a user-address,
-					// please also add them to the array below
-					$results[] = $this->searchPrincipals(self::PRINCIPAL_PREFIX, [
-					], 'anyof');
-					break;
-
-				default:
-					$results[] = [];
-					break;
-			}
-		}
-
-		// results is an array of arrays, so this is not the first search result
-		// but the results of the first searchProperty
-		if (count($results) === 1) {
-			return $results[0];
-		}
-
-		switch ($test) {
-			case 'anyof':
-				return array_values(array_unique(array_merge(...$results)));
-
-			case 'allof':
-			default:
-				return array_values(array_intersect(...$results));
-		}
-	}
-
-	/**
-	 * @param string $uri
-	 * @param string $principalPrefix
-	 * @return string
-	 */
-	function findByUri($uri, $principalPrefix) {
-		// If sharing is disabled, return the empty array
-		$shareAPIEnabled = $this->shareManager->shareApiEnabled();
-		if (!$shareAPIEnabled) {
-			return null;
-		}
-
-		// If sharing is restricted to group members only,
-		// return only members that have groups in common
-		$restrictGroups = false;
-		if ($this->shareManager->shareWithGroupMembersOnly()) {
-			$user = $this->userSession->getUser();
-			if (!$user) {
-				return null;
-			}
-
-			$restrictGroups = $this->groupManager->getUserGroupIds($user);
-		}
-
-		if (strpos($uri, 'principal:principals/groups/') === 0) {
-			$name = urlencode(substr($uri, 28));
-			if ($restrictGroups !== false && !\in_array($name, $restrictGroups, true)) {
-				return null;
-			}
-
-			return substr($uri, 10);
-		}
-
-		return null;
-	}
-
-	/**
-	 * @param IGroup $group
-	 * @return array
-	 */
-	protected function groupToPrincipal($group) {
-		$groupId = $group->getGID();
-		// getDisplayName returns UID if none
-		$displayName = $group->getDisplayName();
-
-		return [
-			'uri' => 'principals/groups/' . urlencode($groupId),
-			'{DAV:}displayname' => $displayName,
-			'{urn:ietf:params:xml:ns:caldav}calendar-user-type' => 'GROUP',
-		];
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return array
-	 */
-	protected function userToPrincipal($user) {
-		$userId = $user->getUID();
-		// getDisplayName returns UID if none
-		$displayName = $user->getDisplayName();
-
-		$principal = [
-			'uri' => 'principals/users/' . $userId,
-			'{DAV:}displayname' => $displayName,
-			'{urn:ietf:params:xml:ns:caldav}calendar-user-type' => 'INDIVIDUAL',
-		];
-
-		$email = $user->getEMailAddress();
-		if (!empty($email)) {
-			$principal['{http://sabredav.org/ns}email-address'] = $email;
-		}
-
-		return $principal;
-	}
+    const PRINCIPAL_PREFIX = 'principals/groups';
+
+    /** @var IGroupManager */
+    private $groupManager;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    /** @var IShareManager */
+    private $shareManager;
+
+    /**
+     * @param IGroupManager $IGroupManager
+     * @param IUserSession $userSession
+     * @param IShareManager $shareManager
+     */
+    public function __construct(IGroupManager $IGroupManager,
+                                IUserSession $userSession,
+                                IShareManager $shareManager) {
+        $this->groupManager = $IGroupManager;
+        $this->userSession = $userSession;
+        $this->shareManager = $shareManager;
+    }
+
+    /**
+     * Returns a list of principals based on a prefix.
+     *
+     * This prefix will often contain something like 'principals'. You are only
+     * expected to return principals that are in this base path.
+     *
+     * You are expected to return at least a 'uri' for every user, you can
+     * return any additional properties if you wish so. Common properties are:
+     *   {DAV:}displayname
+     *
+     * @param string $prefixPath
+     * @return string[]
+     */
+    public function getPrincipalsByPrefix($prefixPath) {
+        $principals = [];
+
+        if ($prefixPath === self::PRINCIPAL_PREFIX) {
+            foreach($this->groupManager->search('') as $user) {
+                $principals[] = $this->groupToPrincipal($user);
+            }
+        }
+
+        return $principals;
+    }
+
+    /**
+     * Returns a specific principal, specified by it's path.
+     * The returned structure should be the exact same as from
+     * getPrincipalsByPrefix.
+     *
+     * @param string $path
+     * @return array
+     */
+    public function getPrincipalByPath($path) {
+        $elements = explode('/', $path,  3);
+        if ($elements[0] !== 'principals') {
+            return null;
+        }
+        if ($elements[1] !== 'groups') {
+            return null;
+        }
+        $name = urldecode($elements[2]);
+        $group = $this->groupManager->get($name);
+
+        if (!is_null($group)) {
+            return $this->groupToPrincipal($group);
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns the list of members for a group-principal
+     *
+     * @param string $principal
+     * @return string[]
+     * @throws Exception
+     */
+    public function getGroupMemberSet($principal) {
+        $elements = explode('/', $principal);
+        if ($elements[0] !== 'principals') {
+            return [];
+        }
+        if ($elements[1] !== 'groups') {
+            return [];
+        }
+        $name = $elements[2];
+        $group = $this->groupManager->get($name);
+
+        if (is_null($group)) {
+            return [];
+        }
+
+        return array_map(function($user) {
+            return $this->userToPrincipal($user);
+        }, $group->getUsers());
+    }
+
+    /**
+     * Returns the list of groups a principal is a member of
+     *
+     * @param string $principal
+     * @return array
+     * @throws Exception
+     */
+    public function getGroupMembership($principal) {
+        return [];
+    }
+
+    /**
+     * Updates the list of group members for a group principal.
+     *
+     * The principals should be passed as a list of uri's.
+     *
+     * @param string $principal
+     * @param string[] $members
+     * @throws Exception
+     */
+    public function setGroupMemberSet($principal, array $members) {
+        throw new Exception('Setting members of the group is not supported yet');
+    }
+
+    /**
+     * @param string $path
+     * @param PropPatch $propPatch
+     * @return int
+     */
+    function updatePrincipal($path, PropPatch $propPatch) {
+        return 0;
+    }
+
+    /**
+     * @param string $prefixPath
+     * @param array $searchProperties
+     * @param string $test
+     * @return array
+     */
+    function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof') {
+        $results = [];
+
+        if (\count($searchProperties) === 0) {
+            return [];
+        }
+        if ($prefixPath !== self::PRINCIPAL_PREFIX) {
+            return [];
+        }
+        // If sharing is disabled, return the empty array
+        $shareAPIEnabled = $this->shareManager->shareApiEnabled();
+        if (!$shareAPIEnabled) {
+            return [];
+        }
+
+        // If sharing is restricted to group members only,
+        // return only members that have groups in common
+        $restrictGroups = false;
+        if ($this->shareManager->shareWithGroupMembersOnly()) {
+            $user = $this->userSession->getUser();
+            if (!$user) {
+                return [];
+            }
+
+            $restrictGroups = $this->groupManager->getUserGroupIds($user);
+        }
+
+        foreach ($searchProperties as $prop => $value) {
+            switch ($prop) {
+                case '{DAV:}displayname':
+                    $groups = $this->groupManager->search($value);
+
+                    $results[] = array_reduce($groups, function(array $carry, IGroup $group) use ($restrictGroups) {
+                        $gid = $group->getGID();
+                        // is sharing restricted to groups only?
+                        if ($restrictGroups !== false) {
+                            if (!\in_array($gid, $restrictGroups, true)) {
+                                return $carry;
+                            }
+                        }
+
+                        $carry[] = self::PRINCIPAL_PREFIX . '/' . $gid;
+                        return $carry;
+                    }, []);
+                    break;
+
+                case '{urn:ietf:params:xml:ns:caldav}calendar-user-address-set':
+                    // If you add support for more search properties that qualify as a user-address,
+                    // please also add them to the array below
+                    $results[] = $this->searchPrincipals(self::PRINCIPAL_PREFIX, [
+                    ], 'anyof');
+                    break;
+
+                default:
+                    $results[] = [];
+                    break;
+            }
+        }
+
+        // results is an array of arrays, so this is not the first search result
+        // but the results of the first searchProperty
+        if (count($results) === 1) {
+            return $results[0];
+        }
+
+        switch ($test) {
+            case 'anyof':
+                return array_values(array_unique(array_merge(...$results)));
+
+            case 'allof':
+            default:
+                return array_values(array_intersect(...$results));
+        }
+    }
+
+    /**
+     * @param string $uri
+     * @param string $principalPrefix
+     * @return string
+     */
+    function findByUri($uri, $principalPrefix) {
+        // If sharing is disabled, return the empty array
+        $shareAPIEnabled = $this->shareManager->shareApiEnabled();
+        if (!$shareAPIEnabled) {
+            return null;
+        }
+
+        // If sharing is restricted to group members only,
+        // return only members that have groups in common
+        $restrictGroups = false;
+        if ($this->shareManager->shareWithGroupMembersOnly()) {
+            $user = $this->userSession->getUser();
+            if (!$user) {
+                return null;
+            }
+
+            $restrictGroups = $this->groupManager->getUserGroupIds($user);
+        }
+
+        if (strpos($uri, 'principal:principals/groups/') === 0) {
+            $name = urlencode(substr($uri, 28));
+            if ($restrictGroups !== false && !\in_array($name, $restrictGroups, true)) {
+                return null;
+            }
+
+            return substr($uri, 10);
+        }
+
+        return null;
+    }
+
+    /**
+     * @param IGroup $group
+     * @return array
+     */
+    protected function groupToPrincipal($group) {
+        $groupId = $group->getGID();
+        // getDisplayName returns UID if none
+        $displayName = $group->getDisplayName();
+
+        return [
+            'uri' => 'principals/groups/' . urlencode($groupId),
+            '{DAV:}displayname' => $displayName,
+            '{urn:ietf:params:xml:ns:caldav}calendar-user-type' => 'GROUP',
+        ];
+    }
+
+    /**
+     * @param IUser $user
+     * @return array
+     */
+    protected function userToPrincipal($user) {
+        $userId = $user->getUID();
+        // getDisplayName returns UID if none
+        $displayName = $user->getDisplayName();
+
+        $principal = [
+            'uri' => 'principals/users/' . $userId,
+            '{DAV:}displayname' => $displayName,
+            '{urn:ietf:params:xml:ns:caldav}calendar-user-type' => 'INDIVIDUAL',
+        ];
+
+        $email = $user->getEMailAddress();
+        if (!empty($email)) {
+            $principal['{http://sabredav.org/ns}email-address'] = $email;
+        }
+
+        return $principal;
+    }
 }