Principal search: Take sharing settings into account

Author: georgehrke

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

@@ -34,6 +34,7 @@
 use OCP\IGroupManager;
 use OCP\IUser;
 use OCP\IUserManager;
+use OCP\Share\IManager as IShareManager;
 use Sabre\DAV\Exception;
 use \Sabre\DAV\PropPatch;
 use Sabre\DAVACL\PrincipalBackend\BackendInterface;
@@ -47,6 +48,9 @@ class Principal implements BackendInterface {
 	/** @var IGroupManager */
 	private $groupManager;
 
+	/** @var IShareManager */
+	private $shareManager;
+
 	/** @var string */
 	private $principalPrefix;
 
@@ -56,13 +60,16 @@ class Principal implements BackendInterface {
 	/**
 	 * @param IUserManager $userManager
 	 * @param IGroupManager $groupManager
+	 * @param IShareManager $shareManager
 	 * @param string $principalPrefix
 	 */
 	public function __construct(IUserManager $userManager,
 								IGroupManager $groupManager,
+								IShareManager $shareManager,
 								$principalPrefix = 'principals/users/') {
 		$this->userManager = $userManager;
 		$this->groupManager = $groupManager;
+		$this->shareManager = $shareManager;
 		$this->principalPrefix = trim($principalPrefix, '/');
 		$this->hasGroups = ($principalPrefix === 'principals/users/');
 	}
@@ -192,7 +199,17 @@ function updatePrincipal($path, PropPatch $propPatch) {
 	function searchUserPrincipals(array $searchProperties, $test = 'allof') {
 		$results = [];
 
-		//TODO: If more properties should be supported, hook this up to a db query
+		// If sharing is disabled, return the empty array
+		if (!$this->shareManager->shareApiEnabled()) {
+			return $results;
+		}
+
+		// If sharing is restricted to group members only,
+		// return only members that have groups in common
+		if ($this->shareManager->shareWithGroupMembersOnly()) {
+			// TODO - who is performing the search?
+		}
+
 		foreach ($searchProperties as $prop => $value) {
 			switch ($prop) {
 				case '{http://sabredav.org/ns}email-address':
@@ -207,19 +224,20 @@ function searchUserPrincipals(array $searchProperties, $test = 'allof') {
 			}
 		}
 
-		if (count($results) == 1) {
+		// 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 'allof':
-
-				return array_intersect(...$results);
 			case 'anyof':
 				return array_unique(array_merge(...$results));
-		}
 
-		return [];
+			case 'allof':
+			default:
+				return array_intersect(...$results);
+		}
 	}
 
 	/**
@@ -247,8 +265,8 @@ function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof')
 	 * @return string
 	 */
 	function findByUri($uri, $principalPrefix) {
-		if (substr($uri, 0, 7) === 'mailto:') {
-			if ($principalPrefix === principals/users) {
+		if (strpos($uri, 'mailto:') === 0) {
+			if ($principalPrefix === 'principals/users') {
 				$email = substr($uri, 7);
 				$users = $this->userManager->getByEmail($email);
 				if (count($users) === 1) {

apps/dav/lib/RootCollection.php

@@ -43,11 +43,13 @@ public function __construct() {
 		$logger = \OC::$server->getLogger();
 		$userManager = \OC::$server->getUserManager();
 		$groupManager = \OC::$server->getGroupManager();
+		$shareManager = \OC::$server->getShareManager();
 		$db = \OC::$server->getDatabaseConnection();
 		$dispatcher = \OC::$server->getEventDispatcher();
 		$userPrincipalBackend = new Principal(
 			$userManager,
-			$groupManager
+			$groupManager,
+			$shareManager
 		);
 		$groupPrincipalBackend = new GroupPrincipalBackend($groupManager);
 		// as soon as debug mode is enabled we allow listing of principals