nextcloud / server

apps/dav/lib/Avatars/AvatarNode.php

Indentation +59 added lines, -59 removed lines

@@ -26,71 +26,71 @@
 use Sabre\DAV\File;
 
 class AvatarNode extends File {
-	private $ext;
-	private $size;
-	private $avatar;
+    private $ext;
+    private $size;
+    private $avatar;
 
-	/**
-	 * AvatarNode constructor.
-	 *
-	 * @param integer $size
-	 * @param string $ext
-	 * @param IAvatar $avatar
-	 */
-	public function __construct($size, $ext, $avatar) {
-		$this->size = $size;
-		$this->ext = $ext;
-		$this->avatar = $avatar;
-	}
+    /**
+     * AvatarNode constructor.
+     *
+     * @param integer $size
+     * @param string $ext
+     * @param IAvatar $avatar
+     */
+    public function __construct($size, $ext, $avatar) {
+        $this->size = $size;
+        $this->ext = $ext;
+        $this->avatar = $avatar;
+    }
 
-	/**
-	 * Returns the name of the node.
-	 *
-	 * This is used to generate the url.
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return "$this->size.$this->ext";
-	}
+    /**
+     * Returns the name of the node.
+     *
+     * This is used to generate the url.
+     *
+     * @return string
+     */
+    public function getName() {
+        return "$this->size.$this->ext";
+    }
 
-	public function get() {
-		$image = $this->avatar->get($this->size);
-		$res = $image->resource();
+    public function get() {
+        $image = $this->avatar->get($this->size);
+        $res = $image->resource();
 
-		ob_start();
-		if ($this->ext === 'png') {
-			imagepng($res);
-		} else {
-			imagejpeg($res);
-		}
+        ob_start();
+        if ($this->ext === 'png') {
+            imagepng($res);
+        } else {
+            imagejpeg($res);
+        }
 
-		return ob_get_clean();
-	}
+        return ob_get_clean();
+    }
 
-	/**
-	 * Returns the mime-type for a file
-	 *
-	 * If null is returned, we'll assume application/octet-stream
-	 *
-	 * @return string|null
-	 */
-	public function getContentType() {
-		if ($this->ext === 'png') {
-			return 'image/png';
-		}
-		return 'image/jpeg';
-	}
+    /**
+     * Returns the mime-type for a file
+     *
+     * If null is returned, we'll assume application/octet-stream
+     *
+     * @return string|null
+     */
+    public function getContentType() {
+        if ($this->ext === 'png') {
+            return 'image/png';
+        }
+        return 'image/jpeg';
+    }
 
-	public function getETag() {
-		return $this->avatar->getFile($this->size)->getEtag();
-	}
+    public function getETag() {
+        return $this->avatar->getFile($this->size)->getEtag();
+    }
 
-	public function getLastModified() {
-		$timestamp = $this->avatar->getFile($this->size)->getMTime();
-		if (!empty($timestamp)) {
-			return (int)$timestamp;
-		}
-		return $timestamp;
-	}
+    public function getLastModified() {
+        $timestamp = $this->avatar->getFile($this->size)->getMTime();
+        if (!empty($timestamp)) {
+            return (int)$timestamp;
+        }
+        return $timestamp;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
 	public function getLastModified() {
 		$timestamp = $this->avatar->getFile($this->size)->getMTime();
 		if (!empty($timestamp)) {
-			return (int)$timestamp;
+			return (int) $timestamp;
 		}
 		return $timestamp;
 	}

apps/dav/lib/CardDAV/Xml/Groups.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 
 	public function xmlSerialize(Writer $writer) {
 		foreach ($this->groups as $group) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}group', $group);
+			$writer->writeElement('{'.self::NS_OWNCLOUD.'}group', $group);
 		}
 	}
 }

Indentation +14 added lines, -14 removed lines

@@ -27,21 +27,21 @@
 use Sabre\Xml\XmlSerializable;
 
 class Groups implements XmlSerializable {
-	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    public const NS_OWNCLOUD = 'http://owncloud.org/ns';
 
-	/** @var string[] of TYPE:CHECKSUM */
-	private $groups;
+    /** @var string[] of TYPE:CHECKSUM */
+    private $groups;
 
-	/**
-	 * @param string $groups
-	 */
-	public function __construct($groups) {
-		$this->groups = $groups;
-	}
+    /**
+     * @param string $groups
+     */
+    public function __construct($groups) {
+        $this->groups = $groups;
+    }
 
-	public function xmlSerialize(Writer $writer) {
-		foreach ($this->groups as $group) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}group', $group);
-		}
-	}
+    public function xmlSerialize(Writer $writer) {
+        foreach ($this->groups as $group) {
+            $writer->writeElement('{' . self::NS_OWNCLOUD . '}group', $group);
+        }
+    }
 }

apps/dav/lib/CardDAV/SyncService.php

Spacing +4 added lines, -4 removed lines

@@ -96,7 +96,7 @@ 
 			if ($ex->getCode() === Http::STATUS_UNAUTHORIZED) {
 				// remote server revoked access to the address book, remove it
 				$this->backend->deleteAddressBook($addressBookId);
-				$this->logger->info('Authorization failed, remove address book: ' . $url, ['app' => 'dav']);
+				$this->logger->info('Authorization failed, remove address book: '.$url, ['app' => 'dav']);
 				throw $ex;
 			}
 		}
@@ -169,7 +169,7 @@ 
 	 */
 	protected function getClient($url, $userName, $sharedSecret) {
 		$settings = [
-			'baseUri' => $url . '/',
+			'baseUri' => $url.'/',
 			'userName' => $userName,
 			'password' => $sharedSecret,
 		];
@@ -306,7 +306,7 @@ 
 		if (is_null($this->localSystemAddressBook)) {
 			$systemPrincipal = "principals/system/system";
 			$this->localSystemAddressBook = $this->ensureSystemAddressBookExists($systemPrincipal, 'system', [
-				'{' . Plugin::NS_CARDDAV . '}addressbook-description' => 'System addressbook which holds all users of this instance'
+				'{'.Plugin::NS_CARDDAV.'}addressbook-description' => 'System addressbook which holds all users of this instance'
 			]);
 		}
 
@@ -315,7 +315,7 @@ 
 
 	public function syncInstance(\Closure $progressCallback = null) {
 		$systemAddressBook = $this->getLocalSystemAddressBook();
-		$this->userManager->callForAllUsers(function ($user) use ($systemAddressBook, $progressCallback) {
+		$this->userManager->callForAllUsers(function($user) use ($systemAddressBook, $progressCallback) {
 			$this->updateUser($user);
 			if (!is_null($progressCallback)) {
 				$progressCallback();

Indentation +295 added lines, -295 removed lines

@@ -42,299 +42,299 @@
 
 class SyncService {
 
-	/** @var CardDavBackend */
-	private $backend;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var array */
-	private $localSystemAddressBook;
-
-	/** @var Converter */
-	private $converter;
-
-	/** @var string */
-	protected $certPath;
-
-	/**
-	 * SyncService constructor.
-	 *
-	 * @param CardDavBackend $backend
-	 * @param IUserManager $userManager
-	 * @param ILogger $logger
-	 * @param AccountManager $accountManager
-	 */
-	public function __construct(CardDavBackend $backend, IUserManager $userManager, ILogger $logger, Converter $converter) {
-		$this->backend = $backend;
-		$this->userManager = $userManager;
-		$this->logger = $logger;
-		$this->converter = $converter;
-		$this->certPath = '';
-	}
-
-	/**
-	 * @param string $url
-	 * @param string $userName
-	 * @param string $addressBookUrl
-	 * @param string $sharedSecret
-	 * @param string $syncToken
-	 * @param int $targetBookId
-	 * @param string $targetPrincipal
-	 * @param array $targetProperties
-	 * @return string
-	 * @throws \Exception
-	 */
-	public function syncRemoteAddressBook($url, $userName, $addressBookUrl, $sharedSecret, $syncToken, $targetBookId, $targetPrincipal, $targetProperties) {
-		// 1. create addressbook
-		$book = $this->ensureSystemAddressBookExists($targetPrincipal, $targetBookId, $targetProperties);
-		$addressBookId = $book['id'];
-
-		// 2. query changes
-		try {
-			$response = $this->requestSyncReport($url, $userName, $addressBookUrl, $sharedSecret, $syncToken);
-		} catch (ClientHttpException $ex) {
-			if ($ex->getCode() === Http::STATUS_UNAUTHORIZED) {
-				// remote server revoked access to the address book, remove it
-				$this->backend->deleteAddressBook($addressBookId);
-				$this->logger->info('Authorization failed, remove address book: ' . $url, ['app' => 'dav']);
-				throw $ex;
-			}
-		}
-
-		// 3. apply changes
-		// TODO: use multi-get for download
-		foreach ($response['response'] as $resource => $status) {
-			$cardUri = basename($resource);
-			if (isset($status[200])) {
-				$vCard = $this->download($url, $userName, $sharedSecret, $resource);
-				$existingCard = $this->backend->getCard($addressBookId, $cardUri);
-				if ($existingCard === false) {
-					$this->backend->createCard($addressBookId, $cardUri, $vCard['body']);
-				} else {
-					$this->backend->updateCard($addressBookId, $cardUri, $vCard['body']);
-				}
-			} else {
-				$this->backend->deleteCard($addressBookId, $cardUri);
-			}
-		}
-
-		return $response['token'];
-	}
-
-	/**
-	 * @param string $principal
-	 * @param string $id
-	 * @param array $properties
-	 * @return array|null
-	 * @throws \Sabre\DAV\Exception\BadRequest
-	 */
-	public function ensureSystemAddressBookExists($principal, $id, $properties) {
-		$book = $this->backend->getAddressBooksByUri($principal, $id);
-		if (!is_null($book)) {
-			return $book;
-		}
-		$this->backend->createAddressBook($principal, $id, $properties);
-
-		return $this->backend->getAddressBooksByUri($principal, $id);
-	}
-
-	/**
-	 * Check if there is a valid certPath we should use
-	 *
-	 * @return string
-	 */
-	protected function getCertPath() {
-
-		// we already have a valid certPath
-		if ($this->certPath !== '') {
-			return $this->certPath;
-		}
-
-		$certManager = \OC::$server->getCertificateManager();
-		$certPath = $certManager->getAbsoluteBundlePath();
-		if (file_exists($certPath)) {
-			$this->certPath = $certPath;
-		}
-
-		return $this->certPath;
-	}
-
-	/**
-	 * @param string $url
-	 * @param string $userName
-	 * @param string $addressBookUrl
-	 * @param string $sharedSecret
-	 * @return Client
-	 */
-	protected function getClient($url, $userName, $sharedSecret) {
-		$settings = [
-			'baseUri' => $url . '/',
-			'userName' => $userName,
-			'password' => $sharedSecret,
-		];
-		$client = new Client($settings);
-		$certPath = $this->getCertPath();
-		$client->setThrowExceptions(true);
-
-		if ($certPath !== '' && strpos($url, 'http://') !== 0) {
-			$client->addCurlSetting(CURLOPT_CAINFO, $this->certPath);
-		}
-
-		return $client;
-	}
-
-	/**
-	 * @param string $url
-	 * @param string $userName
-	 * @param string $addressBookUrl
-	 * @param string $sharedSecret
-	 * @param string $syncToken
-	 * @return array
-	 */
-	protected function requestSyncReport($url, $userName, $addressBookUrl, $sharedSecret, $syncToken) {
-		$client = $this->getClient($url, $userName, $sharedSecret);
-
-		$body = $this->buildSyncCollectionRequestBody($syncToken);
-
-		$response = $client->request('REPORT', $addressBookUrl, $body, [
-			'Content-Type' => 'application/xml'
-		]);
-
-		return $this->parseMultiStatus($response['body']);
-	}
-
-	/**
-	 * @param string $url
-	 * @param string $userName
-	 * @param string $sharedSecret
-	 * @param string $resourcePath
-	 * @return array
-	 */
-	protected function download($url, $userName, $sharedSecret, $resourcePath) {
-		$client = $this->getClient($url, $userName, $sharedSecret);
-		return $client->request('GET', $resourcePath);
-	}
-
-	/**
-	 * @param string|null $syncToken
-	 * @return string
-	 */
-	private function buildSyncCollectionRequestBody($syncToken) {
-		$dom = new \DOMDocument('1.0', 'UTF-8');
-		$dom->formatOutput = true;
-		$root = $dom->createElementNS('DAV:', 'd:sync-collection');
-		$sync = $dom->createElement('d:sync-token', $syncToken);
-		$prop = $dom->createElement('d:prop');
-		$cont = $dom->createElement('d:getcontenttype');
-		$etag = $dom->createElement('d:getetag');
-
-		$prop->appendChild($cont);
-		$prop->appendChild($etag);
-		$root->appendChild($sync);
-		$root->appendChild($prop);
-		$dom->appendChild($root);
-		return $dom->saveXML();
-	}
-
-	/**
-	 * @param string $body
-	 * @return array
-	 * @throws \Sabre\Xml\ParseException
-	 */
-	private function parseMultiStatus($body) {
-		$xml = new Service();
-
-		/** @var MultiStatus $multiStatus */
-		$multiStatus = $xml->expect('{DAV:}multistatus', $body);
-
-		$result = [];
-		foreach ($multiStatus->getResponses() as $response) {
-			$result[$response->getHref()] = $response->getResponseProperties();
-		}
-
-		return ['response' => $result, 'token' => $multiStatus->getSyncToken()];
-	}
-
-	/**
-	 * @param IUser $user
-	 */
-	public function updateUser(IUser $user) {
-		$systemAddressBook = $this->getLocalSystemAddressBook();
-		$addressBookId = $systemAddressBook['id'];
-		$name = $user->getBackendClassName();
-		$userId = $user->getUID();
-
-		$cardId = "$name:$userId.vcf";
-		$card = $this->backend->getCard($addressBookId, $cardId);
-		if ($user->isEnabled()) {
-			if ($card === false) {
-				$vCard = $this->converter->createCardFromUser($user);
-				if ($vCard !== null) {
-					$this->backend->createCard($addressBookId, $cardId, $vCard->serialize());
-				}
-			} else {
-				$vCard = $this->converter->createCardFromUser($user);
-				if (is_null($vCard)) {
-					$this->backend->deleteCard($addressBookId, $cardId);
-				} else {
-					$this->backend->updateCard($addressBookId, $cardId, $vCard->serialize());
-				}
-			}
-		} else {
-			$this->backend->deleteCard($addressBookId, $cardId);
-		}
-	}
-
-	/**
-	 * @param IUser|string $userOrCardId
-	 */
-	public function deleteUser($userOrCardId) {
-		$systemAddressBook = $this->getLocalSystemAddressBook();
-		if ($userOrCardId instanceof IUser) {
-			$name = $userOrCardId->getBackendClassName();
-			$userId = $userOrCardId->getUID();
-
-			$userOrCardId = "$name:$userId.vcf";
-		}
-		$this->backend->deleteCard($systemAddressBook['id'], $userOrCardId);
-	}
-
-	/**
-	 * @return array|null
-	 */
-	public function getLocalSystemAddressBook() {
-		if (is_null($this->localSystemAddressBook)) {
-			$systemPrincipal = "principals/system/system";
-			$this->localSystemAddressBook = $this->ensureSystemAddressBookExists($systemPrincipal, 'system', [
-				'{' . Plugin::NS_CARDDAV . '}addressbook-description' => 'System addressbook which holds all users of this instance'
-			]);
-		}
-
-		return $this->localSystemAddressBook;
-	}
-
-	public function syncInstance(\Closure $progressCallback = null) {
-		$systemAddressBook = $this->getLocalSystemAddressBook();
-		$this->userManager->callForAllUsers(function ($user) use ($systemAddressBook, $progressCallback) {
-			$this->updateUser($user);
-			if (!is_null($progressCallback)) {
-				$progressCallback();
-			}
-		});
-
-		// remove no longer existing
-		$allCards = $this->backend->getCards($systemAddressBook['id']);
-		foreach ($allCards as $card) {
-			$vCard = Reader::read($card['carddata']);
-			$uid = $vCard->UID->getValue();
-			// load backend and see if user exists
-			if (!$this->userManager->userExists($uid)) {
-				$this->deleteUser($card['uri']);
-			}
-		}
-	}
+    /** @var CardDavBackend */
+    private $backend;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var array */
+    private $localSystemAddressBook;
+
+    /** @var Converter */
+    private $converter;
+
+    /** @var string */
+    protected $certPath;
+
+    /**
+     * SyncService constructor.
+     *
+     * @param CardDavBackend $backend
+     * @param IUserManager $userManager
+     * @param ILogger $logger
+     * @param AccountManager $accountManager
+     */
+    public function __construct(CardDavBackend $backend, IUserManager $userManager, ILogger $logger, Converter $converter) {
+        $this->backend = $backend;
+        $this->userManager = $userManager;
+        $this->logger = $logger;
+        $this->converter = $converter;
+        $this->certPath = '';
+    }
+
+    /**
+     * @param string $url
+     * @param string $userName
+     * @param string $addressBookUrl
+     * @param string $sharedSecret
+     * @param string $syncToken
+     * @param int $targetBookId
+     * @param string $targetPrincipal
+     * @param array $targetProperties
+     * @return string
+     * @throws \Exception
+     */
+    public function syncRemoteAddressBook($url, $userName, $addressBookUrl, $sharedSecret, $syncToken, $targetBookId, $targetPrincipal, $targetProperties) {
+        // 1. create addressbook
+        $book = $this->ensureSystemAddressBookExists($targetPrincipal, $targetBookId, $targetProperties);
+        $addressBookId = $book['id'];
+
+        // 2. query changes
+        try {
+            $response = $this->requestSyncReport($url, $userName, $addressBookUrl, $sharedSecret, $syncToken);
+        } catch (ClientHttpException $ex) {
+            if ($ex->getCode() === Http::STATUS_UNAUTHORIZED) {
+                // remote server revoked access to the address book, remove it
+                $this->backend->deleteAddressBook($addressBookId);
+                $this->logger->info('Authorization failed, remove address book: ' . $url, ['app' => 'dav']);
+                throw $ex;
+            }
+        }
+
+        // 3. apply changes
+        // TODO: use multi-get for download
+        foreach ($response['response'] as $resource => $status) {
+            $cardUri = basename($resource);
+            if (isset($status[200])) {
+                $vCard = $this->download($url, $userName, $sharedSecret, $resource);
+                $existingCard = $this->backend->getCard($addressBookId, $cardUri);
+                if ($existingCard === false) {
+                    $this->backend->createCard($addressBookId, $cardUri, $vCard['body']);
+                } else {
+                    $this->backend->updateCard($addressBookId, $cardUri, $vCard['body']);
+                }
+            } else {
+                $this->backend->deleteCard($addressBookId, $cardUri);
+            }
+        }
+
+        return $response['token'];
+    }
+
+    /**
+     * @param string $principal
+     * @param string $id
+     * @param array $properties
+     * @return array|null
+     * @throws \Sabre\DAV\Exception\BadRequest
+     */
+    public function ensureSystemAddressBookExists($principal, $id, $properties) {
+        $book = $this->backend->getAddressBooksByUri($principal, $id);
+        if (!is_null($book)) {
+            return $book;
+        }
+        $this->backend->createAddressBook($principal, $id, $properties);
+
+        return $this->backend->getAddressBooksByUri($principal, $id);
+    }
+
+    /**
+     * Check if there is a valid certPath we should use
+     *
+     * @return string
+     */
+    protected function getCertPath() {
+
+        // we already have a valid certPath
+        if ($this->certPath !== '') {
+            return $this->certPath;
+        }
+
+        $certManager = \OC::$server->getCertificateManager();
+        $certPath = $certManager->getAbsoluteBundlePath();
+        if (file_exists($certPath)) {
+            $this->certPath = $certPath;
+        }
+
+        return $this->certPath;
+    }
+
+    /**
+     * @param string $url
+     * @param string $userName
+     * @param string $addressBookUrl
+     * @param string $sharedSecret
+     * @return Client
+     */
+    protected function getClient($url, $userName, $sharedSecret) {
+        $settings = [
+            'baseUri' => $url . '/',
+            'userName' => $userName,
+            'password' => $sharedSecret,
+        ];
+        $client = new Client($settings);
+        $certPath = $this->getCertPath();
+        $client->setThrowExceptions(true);
+
+        if ($certPath !== '' && strpos($url, 'http://') !== 0) {
+            $client->addCurlSetting(CURLOPT_CAINFO, $this->certPath);
+        }
+
+        return $client;
+    }
+
+    /**
+     * @param string $url
+     * @param string $userName
+     * @param string $addressBookUrl
+     * @param string $sharedSecret
+     * @param string $syncToken
+     * @return array
+     */
+    protected function requestSyncReport($url, $userName, $addressBookUrl, $sharedSecret, $syncToken) {
+        $client = $this->getClient($url, $userName, $sharedSecret);
+
+        $body = $this->buildSyncCollectionRequestBody($syncToken);
+
+        $response = $client->request('REPORT', $addressBookUrl, $body, [
+            'Content-Type' => 'application/xml'
+        ]);
+
+        return $this->parseMultiStatus($response['body']);
+    }
+
+    /**
+     * @param string $url
+     * @param string $userName
+     * @param string $sharedSecret
+     * @param string $resourcePath
+     * @return array
+     */
+    protected function download($url, $userName, $sharedSecret, $resourcePath) {
+        $client = $this->getClient($url, $userName, $sharedSecret);
+        return $client->request('GET', $resourcePath);
+    }
+
+    /**
+     * @param string|null $syncToken
+     * @return string
+     */
+    private function buildSyncCollectionRequestBody($syncToken) {
+        $dom = new \DOMDocument('1.0', 'UTF-8');
+        $dom->formatOutput = true;
+        $root = $dom->createElementNS('DAV:', 'd:sync-collection');
+        $sync = $dom->createElement('d:sync-token', $syncToken);
+        $prop = $dom->createElement('d:prop');
+        $cont = $dom->createElement('d:getcontenttype');
+        $etag = $dom->createElement('d:getetag');
+
+        $prop->appendChild($cont);
+        $prop->appendChild($etag);
+        $root->appendChild($sync);
+        $root->appendChild($prop);
+        $dom->appendChild($root);
+        return $dom->saveXML();
+    }
+
+    /**
+     * @param string $body
+     * @return array
+     * @throws \Sabre\Xml\ParseException
+     */
+    private function parseMultiStatus($body) {
+        $xml = new Service();
+
+        /** @var MultiStatus $multiStatus */
+        $multiStatus = $xml->expect('{DAV:}multistatus', $body);
+
+        $result = [];
+        foreach ($multiStatus->getResponses() as $response) {
+            $result[$response->getHref()] = $response->getResponseProperties();
+        }
+
+        return ['response' => $result, 'token' => $multiStatus->getSyncToken()];
+    }
+
+    /**
+     * @param IUser $user
+     */
+    public function updateUser(IUser $user) {
+        $systemAddressBook = $this->getLocalSystemAddressBook();
+        $addressBookId = $systemAddressBook['id'];
+        $name = $user->getBackendClassName();
+        $userId = $user->getUID();
+
+        $cardId = "$name:$userId.vcf";
+        $card = $this->backend->getCard($addressBookId, $cardId);
+        if ($user->isEnabled()) {
+            if ($card === false) {
+                $vCard = $this->converter->createCardFromUser($user);
+                if ($vCard !== null) {
+                    $this->backend->createCard($addressBookId, $cardId, $vCard->serialize());
+                }
+            } else {
+                $vCard = $this->converter->createCardFromUser($user);
+                if (is_null($vCard)) {
+                    $this->backend->deleteCard($addressBookId, $cardId);
+                } else {
+                    $this->backend->updateCard($addressBookId, $cardId, $vCard->serialize());
+                }
+            }
+        } else {
+            $this->backend->deleteCard($addressBookId, $cardId);
+        }
+    }
+
+    /**
+     * @param IUser|string $userOrCardId
+     */
+    public function deleteUser($userOrCardId) {
+        $systemAddressBook = $this->getLocalSystemAddressBook();
+        if ($userOrCardId instanceof IUser) {
+            $name = $userOrCardId->getBackendClassName();
+            $userId = $userOrCardId->getUID();
+
+            $userOrCardId = "$name:$userId.vcf";
+        }
+        $this->backend->deleteCard($systemAddressBook['id'], $userOrCardId);
+    }
+
+    /**
+     * @return array|null
+     */
+    public function getLocalSystemAddressBook() {
+        if (is_null($this->localSystemAddressBook)) {
+            $systemPrincipal = "principals/system/system";
+            $this->localSystemAddressBook = $this->ensureSystemAddressBookExists($systemPrincipal, 'system', [
+                '{' . Plugin::NS_CARDDAV . '}addressbook-description' => 'System addressbook which holds all users of this instance'
+            ]);
+        }
+
+        return $this->localSystemAddressBook;
+    }
+
+    public function syncInstance(\Closure $progressCallback = null) {
+        $systemAddressBook = $this->getLocalSystemAddressBook();
+        $this->userManager->callForAllUsers(function ($user) use ($systemAddressBook, $progressCallback) {
+            $this->updateUser($user);
+            if (!is_null($progressCallback)) {
+                $progressCallback();
+            }
+        });
+
+        // remove no longer existing
+        $allCards = $this->backend->getCards($systemAddressBook['id']);
+        foreach ($allCards as $card) {
+            $vCard = Reader::read($card['carddata']);
+            $uid = $vCard->UID->getValue();
+            // load backend and see if user exists
+            if (!$this->userManager->userExists($uid)) {
+                $this->deleteUser($card['uri']);
+            }
+        }
+    }
 }

apps/dav/lib/DAV/Sharing/IShareable.php

Indentation +40 added lines, -40 removed lines

@@ -29,47 +29,47 @@
  */
 interface IShareable extends INode {
 
-	/**
-	 * Updates the list of shares.
-	 *
-	 * The first array is a list of people that are to be added to the
-	 * resource.
-	 *
-	 * Every element in the add array has the following properties:
-	 *   * href - A url. Usually a mailto: address
-	 *   * commonName - Usually a first and last name, or false
-	 *   * summary - A description of the share, can also be false
-	 *   * readOnly - A boolean value
-	 *
-	 * Every element in the remove array is just the address string.
-	 *
-	 * @param array $add
-	 * @param array $remove
-	 * @return void
-	 */
-	public function updateShares(array $add, array $remove);
+    /**
+     * Updates the list of shares.
+     *
+     * The first array is a list of people that are to be added to the
+     * resource.
+     *
+     * Every element in the add array has the following properties:
+     *   * href - A url. Usually a mailto: address
+     *   * commonName - Usually a first and last name, or false
+     *   * summary - A description of the share, can also be false
+     *   * readOnly - A boolean value
+     *
+     * Every element in the remove array is just the address string.
+     *
+     * @param array $add
+     * @param array $remove
+     * @return void
+     */
+    public function updateShares(array $add, array $remove);
 
-	/**
-	 * Returns the list of people whom this resource is shared with.
-	 *
-	 * Every element in this array should have the following properties:
-	 *   * href - Often a mailto: address
-	 *   * commonName - Optional, for example a first + last name
-	 *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
-	 *   * readOnly - boolean
-	 *   * summary - Optional, a description for the share
-	 *
-	 * @return array
-	 */
-	public function getShares();
+    /**
+     * Returns the list of people whom this resource is shared with.
+     *
+     * Every element in this array should have the following properties:
+     *   * href - Often a mailto: address
+     *   * commonName - Optional, for example a first + last name
+     *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
+     *   * readOnly - boolean
+     *   * summary - Optional, a description for the share
+     *
+     * @return array
+     */
+    public function getShares();
 
-	/**
-	 * @return int
-	 */
-	public function getResourceId();
+    /**
+     * @return int
+     */
+    public function getResourceId();
 
-	/**
-	 * @return string
-	 */
-	public function getOwner();
+    /**
+     * @return string
+     */
+    public function getOwner();
 }

apps/dav/lib/DAV/Sharing/Xml/Invite.php

Indentation +106 added lines, -106 removed lines

@@ -41,120 +41,120 @@
  */
 class Invite implements XmlSerializable {
 
-	/**
-	 * The list of users a calendar has been shared to.
-	 *
-	 * @var array
-	 */
-	protected $users;
+    /**
+     * The list of users a calendar has been shared to.
+     *
+     * @var array
+     */
+    protected $users;
 
-	/**
-	 * The organizer contains information about the person who shared the
-	 * object.
-	 *
-	 * @var array|null
-	 */
-	protected $organizer;
+    /**
+     * The organizer contains information about the person who shared the
+     * object.
+     *
+     * @var array|null
+     */
+    protected $organizer;
 
-	/**
-	 * Creates the property.
-	 *
-	 * Users is an array. Each element of the array has the following
-	 * properties:
-	 *
-	 *   * href - Often a mailto: address
-	 *   * commonName - Optional, for example a first and lastname for a user.
-	 *   * status - One of the SharingPlugin::STATUS_* constants.
-	 *   * readOnly - true or false
-	 *   * summary - Optional, description of the share
-	 *
-	 * The organizer key is optional to specify. It's only useful when a
-	 * 'sharee' requests the sharing information.
-	 *
-	 * The organizer may have the following properties:
-	 *   * href - Often a mailto: address.
-	 *   * commonName - Optional human-readable name.
-	 *   * firstName - Optional first name.
-	 *   * lastName - Optional last name.
-	 *
-	 * If you wonder why these two structures are so different, I guess a
-	 * valid answer is that the current spec is still a draft.
-	 *
-	 * @param array $users
-	 */
-	public function __construct(array $users, array $organizer = null) {
-		$this->users = $users;
-		$this->organizer = $organizer;
-	}
+    /**
+     * Creates the property.
+     *
+     * Users is an array. Each element of the array has the following
+     * properties:
+     *
+     *   * href - Often a mailto: address
+     *   * commonName - Optional, for example a first and lastname for a user.
+     *   * status - One of the SharingPlugin::STATUS_* constants.
+     *   * readOnly - true or false
+     *   * summary - Optional, description of the share
+     *
+     * The organizer key is optional to specify. It's only useful when a
+     * 'sharee' requests the sharing information.
+     *
+     * The organizer may have the following properties:
+     *   * href - Often a mailto: address.
+     *   * commonName - Optional human-readable name.
+     *   * firstName - Optional first name.
+     *   * lastName - Optional last name.
+     *
+     * If you wonder why these two structures are so different, I guess a
+     * valid answer is that the current spec is still a draft.
+     *
+     * @param array $users
+     */
+    public function __construct(array $users, array $organizer = null) {
+        $this->users = $users;
+        $this->organizer = $organizer;
+    }
 
-	/**
-	 * Returns the list of users, as it was passed to the constructor.
-	 *
-	 * @return array
-	 */
-	public function getValue() {
-		return $this->users;
-	}
+    /**
+     * Returns the list of users, as it was passed to the constructor.
+     *
+     * @return array
+     */
+    public function getValue() {
+        return $this->users;
+    }
 
-	/**
-	 * The xmlSerialize metod is called during xml writing.
-	 *
-	 * Use the $writer argument to write its own xml serialization.
-	 *
-	 * An important note: do _not_ create a parent element. Any element
-	 * implementing XmlSerializble should only ever write what's considered
-	 * its 'inner xml'.
-	 *
-	 * The parent of the current element is responsible for writing a
-	 * containing element.
-	 *
-	 * This allows serializers to be re-used for different element names.
-	 *
-	 * If you are opening new elements, you must also close them again.
-	 *
-	 * @param Writer $writer
-	 * @return void
-	 */
-	public function xmlSerialize(Writer $writer) {
-		$cs = '{' . Plugin::NS_OWNCLOUD . '}';
+    /**
+     * The xmlSerialize metod is called during xml writing.
+     *
+     * Use the $writer argument to write its own xml serialization.
+     *
+     * An important note: do _not_ create a parent element. Any element
+     * implementing XmlSerializble should only ever write what's considered
+     * its 'inner xml'.
+     *
+     * The parent of the current element is responsible for writing a
+     * containing element.
+     *
+     * This allows serializers to be re-used for different element names.
+     *
+     * If you are opening new elements, you must also close them again.
+     *
+     * @param Writer $writer
+     * @return void
+     */
+    public function xmlSerialize(Writer $writer) {
+        $cs = '{' . Plugin::NS_OWNCLOUD . '}';
 
-		if (!is_null($this->organizer)) {
-			$writer->startElement($cs . 'organizer');
-			$writer->writeElement('{DAV:}href', $this->organizer['href']);
+        if (!is_null($this->organizer)) {
+            $writer->startElement($cs . 'organizer');
+            $writer->writeElement('{DAV:}href', $this->organizer['href']);
 
-			if (isset($this->organizer['commonName']) && $this->organizer['commonName']) {
-				$writer->writeElement($cs . 'common-name', $this->organizer['commonName']);
-			}
-			if (isset($this->organizer['firstName']) && $this->organizer['firstName']) {
-				$writer->writeElement($cs . 'first-name', $this->organizer['firstName']);
-			}
-			if (isset($this->organizer['lastName']) && $this->organizer['lastName']) {
-				$writer->writeElement($cs . 'last-name', $this->organizer['lastName']);
-			}
-			$writer->endElement(); // organizer
-		}
+            if (isset($this->organizer['commonName']) && $this->organizer['commonName']) {
+                $writer->writeElement($cs . 'common-name', $this->organizer['commonName']);
+            }
+            if (isset($this->organizer['firstName']) && $this->organizer['firstName']) {
+                $writer->writeElement($cs . 'first-name', $this->organizer['firstName']);
+            }
+            if (isset($this->organizer['lastName']) && $this->organizer['lastName']) {
+                $writer->writeElement($cs . 'last-name', $this->organizer['lastName']);
+            }
+            $writer->endElement(); // organizer
+        }
 
-		foreach ($this->users as $user) {
-			$writer->startElement($cs . 'user');
-			$writer->writeElement('{DAV:}href', $user['href']);
-			if (isset($user['commonName']) && $user['commonName']) {
-				$writer->writeElement($cs . 'common-name', $user['commonName']);
-			}
-			$writer->writeElement($cs . 'invite-accepted');
+        foreach ($this->users as $user) {
+            $writer->startElement($cs . 'user');
+            $writer->writeElement('{DAV:}href', $user['href']);
+            if (isset($user['commonName']) && $user['commonName']) {
+                $writer->writeElement($cs . 'common-name', $user['commonName']);
+            }
+            $writer->writeElement($cs . 'invite-accepted');
 
-			$writer->startElement($cs . 'access');
-			if ($user['readOnly']) {
-				$writer->writeElement($cs . 'read');
-			} else {
-				$writer->writeElement($cs . 'read-write');
-			}
-			$writer->endElement(); // access
+            $writer->startElement($cs . 'access');
+            if ($user['readOnly']) {
+                $writer->writeElement($cs . 'read');
+            } else {
+                $writer->writeElement($cs . 'read-write');
+            }
+            $writer->endElement(); // access
 
-			if (isset($user['summary']) && $user['summary']) {
-				$writer->writeElement($cs . 'summary', $user['summary']);
-			}
+            if (isset($user['summary']) && $user['summary']) {
+                $writer->writeElement($cs . 'summary', $user['summary']);
+            }
 
-			$writer->endElement(); //user
-		}
-	}
+            $writer->endElement(); //user
+        }
+    }
 }

Spacing +12 added lines, -12 removed lines

@@ -116,42 +116,42 @@
 	 * @return void
 	 */
 	public function xmlSerialize(Writer $writer) {
-		$cs = '{' . Plugin::NS_OWNCLOUD . '}';
+		$cs = '{'.Plugin::NS_OWNCLOUD.'}';
 
 		if (!is_null($this->organizer)) {
-			$writer->startElement($cs . 'organizer');
+			$writer->startElement($cs.'organizer');
 			$writer->writeElement('{DAV:}href', $this->organizer['href']);
 
 			if (isset($this->organizer['commonName']) && $this->organizer['commonName']) {
-				$writer->writeElement($cs . 'common-name', $this->organizer['commonName']);
+				$writer->writeElement($cs.'common-name', $this->organizer['commonName']);
 			}
 			if (isset($this->organizer['firstName']) && $this->organizer['firstName']) {
-				$writer->writeElement($cs . 'first-name', $this->organizer['firstName']);
+				$writer->writeElement($cs.'first-name', $this->organizer['firstName']);
 			}
 			if (isset($this->organizer['lastName']) && $this->organizer['lastName']) {
-				$writer->writeElement($cs . 'last-name', $this->organizer['lastName']);
+				$writer->writeElement($cs.'last-name', $this->organizer['lastName']);
 			}
 			$writer->endElement(); // organizer
 		}
 
 		foreach ($this->users as $user) {
-			$writer->startElement($cs . 'user');
+			$writer->startElement($cs.'user');
 			$writer->writeElement('{DAV:}href', $user['href']);
 			if (isset($user['commonName']) && $user['commonName']) {
-				$writer->writeElement($cs . 'common-name', $user['commonName']);
+				$writer->writeElement($cs.'common-name', $user['commonName']);
 			}
-			$writer->writeElement($cs . 'invite-accepted');
+			$writer->writeElement($cs.'invite-accepted');
 
-			$writer->startElement($cs . 'access');
+			$writer->startElement($cs.'access');
 			if ($user['readOnly']) {
-				$writer->writeElement($cs . 'read');
+				$writer->writeElement($cs.'read');
 			} else {
-				$writer->writeElement($cs . 'read-write');
+				$writer->writeElement($cs.'read-write');
 			}
 			$writer->endElement(); // access
 
 			if (isset($user['summary']) && $user['summary']) {
-				$writer->writeElement($cs . 'summary', $user['summary']);
+				$writer->writeElement($cs.'summary', $user['summary']);
 			}
 
 			$writer->endElement(); //user

apps/dav/lib/DAV/Sharing/Xml/ShareRequest.php

Indentation +39 added lines, -39 removed lines

@@ -26,54 +26,54 @@
 use Sabre\Xml\XmlDeserializable;
 
 class ShareRequest implements XmlDeserializable {
-	public $set = [];
+    public $set = [];
 
-	public $remove = [];
+    public $remove = [];
 
-	/**
-	 * Constructor
-	 *
-	 * @param array $set
-	 * @param array $remove
-	 */
-	public function __construct(array $set, array $remove) {
-		$this->set = $set;
-		$this->remove = $remove;
-	}
+    /**
+     * Constructor
+     *
+     * @param array $set
+     * @param array $remove
+     */
+    public function __construct(array $set, array $remove) {
+        $this->set = $set;
+        $this->remove = $remove;
+    }
 
-	public static function xmlDeserialize(Reader $reader) {
-		$elements = $reader->parseInnerTree([
-			'{' . Plugin::NS_OWNCLOUD. '}set' => 'Sabre\\Xml\\Element\\KeyValue',
-			'{' . Plugin::NS_OWNCLOUD . '}remove' => 'Sabre\\Xml\\Element\\KeyValue',
-		]);
+    public static function xmlDeserialize(Reader $reader) {
+        $elements = $reader->parseInnerTree([
+            '{' . Plugin::NS_OWNCLOUD. '}set' => 'Sabre\\Xml\\Element\\KeyValue',
+            '{' . Plugin::NS_OWNCLOUD . '}remove' => 'Sabre\\Xml\\Element\\KeyValue',
+        ]);
 
-		$set = [];
-		$remove = [];
+        $set = [];
+        $remove = [];
 
-		foreach ($elements as $elem) {
-			switch ($elem['name']) {
+        foreach ($elements as $elem) {
+            switch ($elem['name']) {
 
-				case '{' . Plugin::NS_OWNCLOUD . '}set':
-					$sharee = $elem['value'];
+                case '{' . Plugin::NS_OWNCLOUD . '}set':
+                    $sharee = $elem['value'];
 
-					$sumElem = '{' . Plugin::NS_OWNCLOUD . '}summary';
-					$commonName = '{' . Plugin::NS_OWNCLOUD . '}common-name';
+                    $sumElem = '{' . Plugin::NS_OWNCLOUD . '}summary';
+                    $commonName = '{' . Plugin::NS_OWNCLOUD . '}common-name';
 
-					$set[] = [
-						'href' => $sharee['{DAV:}href'],
-						'commonName' => isset($sharee[$commonName]) ? $sharee[$commonName] : null,
-						'summary' => isset($sharee[$sumElem]) ? $sharee[$sumElem] : null,
-						'readOnly' => !array_key_exists('{' . Plugin::NS_OWNCLOUD . '}read-write', $sharee),
-					];
-					break;
+                    $set[] = [
+                        'href' => $sharee['{DAV:}href'],
+                        'commonName' => isset($sharee[$commonName]) ? $sharee[$commonName] : null,
+                        'summary' => isset($sharee[$sumElem]) ? $sharee[$sumElem] : null,
+                        'readOnly' => !array_key_exists('{' . Plugin::NS_OWNCLOUD . '}read-write', $sharee),
+                    ];
+                    break;
 
-				case '{' . Plugin::NS_OWNCLOUD . '}remove':
-					$remove[] = $elem['value']['{DAV:}href'];
-					break;
+                case '{' . Plugin::NS_OWNCLOUD . '}remove':
+                    $remove[] = $elem['value']['{DAV:}href'];
+                    break;
 
-			}
-		}
+            }
+        }
 
-		return new self($set, $remove);
-	}
+        return new self($set, $remove);
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -43,8 +43,8 @@ 
 
 	public static function xmlDeserialize(Reader $reader) {
 		$elements = $reader->parseInnerTree([
-			'{' . Plugin::NS_OWNCLOUD. '}set' => 'Sabre\\Xml\\Element\\KeyValue',
-			'{' . Plugin::NS_OWNCLOUD . '}remove' => 'Sabre\\Xml\\Element\\KeyValue',
+			'{'.Plugin::NS_OWNCLOUD.'}set' => 'Sabre\\Xml\\Element\\KeyValue',
+			'{'.Plugin::NS_OWNCLOUD.'}remove' => 'Sabre\\Xml\\Element\\KeyValue',
 		]);
 
 		$set = [];
@@ -53,21 +53,21 @@ 
 		foreach ($elements as $elem) {
 			switch ($elem['name']) {
 
-				case '{' . Plugin::NS_OWNCLOUD . '}set':
+				case '{'.Plugin::NS_OWNCLOUD.'}set':
 					$sharee = $elem['value'];
 
-					$sumElem = '{' . Plugin::NS_OWNCLOUD . '}summary';
-					$commonName = '{' . Plugin::NS_OWNCLOUD . '}common-name';
+					$sumElem = '{'.Plugin::NS_OWNCLOUD.'}summary';
+					$commonName = '{'.Plugin::NS_OWNCLOUD.'}common-name';
 
 					$set[] = [
 						'href' => $sharee['{DAV:}href'],
 						'commonName' => isset($sharee[$commonName]) ? $sharee[$commonName] : null,
 						'summary' => isset($sharee[$sumElem]) ? $sharee[$sumElem] : null,
-						'readOnly' => !array_key_exists('{' . Plugin::NS_OWNCLOUD . '}read-write', $sharee),
+						'readOnly' => !array_key_exists('{'.Plugin::NS_OWNCLOUD.'}read-write', $sharee),
 					];
 					break;
 
-				case '{' . Plugin::NS_OWNCLOUD . '}remove':
+				case '{'.Plugin::NS_OWNCLOUD.'}remove':
 					$remove[] = $elem['value']['{DAV:}href'];
 					break;
 

apps/dav/lib/DAV/Sharing/Backend.php

Spacing +3 added lines, -3 removed lines

@@ -191,13 +191,13 @@ 
 		foreach ($shares as $share) {
 			$acl[] = [
 				'privilege' => '{DAV:}read',
-				'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'],
+				'principal' => $share['{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}principal'],
 				'protected' => true,
 			];
 			if (!$share['readOnly']) {
 				$acl[] = [
 					'privilege' => '{DAV:}write',
-					'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'],
+					'principal' => $share['{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}principal'],
 					'protected' => true,
 				];
 			} elseif ($this->resourceType === 'calendar') {
@@ -205,7 +205,7 @@ 
 				// so users can change the visibility.
 				$acl[] = [
 					'privilege' => '{DAV:}write-properties',
-					'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'],
+					'principal' => $share['{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}principal'],
 					'protected' => true,
 				];
 			}

Indentation +211 added lines, -211 removed lines

@@ -36,215 +36,215 @@
 
 class Backend {
 
-	/** @var IDBConnection */
-	private $db;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IGroupManager */
-	private $groupManager;
-	/** @var Principal */
-	private $principalBackend;
-	/** @var string */
-	private $resourceType;
-
-	public const ACCESS_OWNER = 1;
-	public const ACCESS_READ_WRITE = 2;
-	public const ACCESS_READ = 3;
-
-	/**
-	 * @param IDBConnection $db
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 * @param Principal $principalBackend
-	 * @param string $resourceType
-	 */
-	public function __construct(IDBConnection $db, IUserManager $userManager, IGroupManager $groupManager, Principal $principalBackend, $resourceType) {
-		$this->db = $db;
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->principalBackend = $principalBackend;
-		$this->resourceType = $resourceType;
-	}
-
-	/**
-	 * @param IShareable $shareable
-	 * @param string[] $add
-	 * @param string[] $remove
-	 */
-	public function updateShares(IShareable $shareable, array $add, array $remove) {
-		foreach ($add as $element) {
-			$principal = $this->principalBackend->findByUri($element['href'], '');
-			if ($principal !== '') {
-				$this->shareWith($shareable, $element);
-			}
-		}
-		foreach ($remove as $element) {
-			$principal = $this->principalBackend->findByUri($element, '');
-			if ($principal !== '') {
-				$this->unshare($shareable, $element);
-			}
-		}
-	}
-
-	/**
-	 * @param IShareable $shareable
-	 * @param string $element
-	 */
-	private function shareWith($shareable, $element) {
-		$user = $element['href'];
-		$parts = explode(':', $user, 2);
-		if ($parts[0] !== 'principal') {
-			return;
-		}
-
-		// don't share with owner
-		if ($shareable->getOwner() === $parts[1]) {
-			return;
-		}
-
-		$principal = explode('/', $parts[1], 3);
-		if (count($principal) !== 3 || $principal[0] !== 'principals' || !in_array($principal[1], ['users', 'groups', 'circles'], true)) {
-			// Invalid principal
-			return;
-		}
-
-		$principal[2] = urldecode($principal[2]);
-		if (($principal[1] === 'users' && !$this->userManager->userExists($principal[2])) ||
-			($principal[1] === 'groups' && !$this->groupManager->groupExists($principal[2]))) {
-			// User or group does not exist
-			return;
-		}
-
-		// remove the share if it already exists
-		$this->unshare($shareable, $element['href']);
-		$access = self::ACCESS_READ;
-		if (isset($element['readOnly'])) {
-			$access = $element['readOnly'] ? self::ACCESS_READ : self::ACCESS_READ_WRITE;
-		}
-
-		$query = $this->db->getQueryBuilder();
-		$query->insert('dav_shares')
-			->values([
-				'principaluri' => $query->createNamedParameter($parts[1]),
-				'type' => $query->createNamedParameter($this->resourceType),
-				'access' => $query->createNamedParameter($access),
-				'resourceid' => $query->createNamedParameter($shareable->getResourceId())
-			]);
-		$query->execute();
-	}
-
-	/**
-	 * @param $resourceId
-	 */
-	public function deleteAllShares($resourceId) {
-		$query = $this->db->getQueryBuilder();
-		$query->delete('dav_shares')
-			->where($query->expr()->eq('resourceid', $query->createNamedParameter($resourceId)))
-			->andWhere($query->expr()->eq('type', $query->createNamedParameter($this->resourceType)))
-			->execute();
-	}
-
-	public function deleteAllSharesByUser($principaluri) {
-		$query = $this->db->getQueryBuilder();
-		$query->delete('dav_shares')
-			->where($query->expr()->eq('principaluri', $query->createNamedParameter($principaluri)))
-			->andWhere($query->expr()->eq('type', $query->createNamedParameter($this->resourceType)))
-			->execute();
-	}
-
-	/**
-	 * @param IShareable $shareable
-	 * @param string $element
-	 */
-	private function unshare($shareable, $element) {
-		$parts = explode(':', $element, 2);
-		if ($parts[0] !== 'principal') {
-			return;
-		}
-
-		// don't share with owner
-		if ($shareable->getOwner() === $parts[1]) {
-			return;
-		}
-
-		$query = $this->db->getQueryBuilder();
-		$query->delete('dav_shares')
-			->where($query->expr()->eq('resourceid', $query->createNamedParameter($shareable->getResourceId())))
-			->andWhere($query->expr()->eq('type', $query->createNamedParameter($this->resourceType)))
-			->andWhere($query->expr()->eq('principaluri', $query->createNamedParameter($parts[1])))
-		;
-		$query->execute();
-	}
-
-	/**
-	 * Returns the list of people whom this resource is shared with.
-	 *
-	 * Every element in this array should have the following properties:
-	 *   * href - Often a mailto: address
-	 *   * commonName - Optional, for example a first + last name
-	 *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
-	 *   * readOnly - boolean
-	 *   * summary - Optional, a description for the share
-	 *
-	 * @param int $resourceId
-	 * @return array
-	 */
-	public function getShares($resourceId) {
-		$query = $this->db->getQueryBuilder();
-		$result = $query->select(['principaluri', 'access'])
-			->from('dav_shares')
-			->where($query->expr()->eq('resourceid', $query->createNamedParameter($resourceId)))
-			->andWhere($query->expr()->eq('type', $query->createNamedParameter($this->resourceType)))
-			->groupBy(['principaluri', 'access'])
-			->execute();
-
-		$shares = [];
-		while ($row = $result->fetch()) {
-			$p = $this->principalBackend->getPrincipalByPath($row['principaluri']);
-			$shares[] = [
-				'href' => "principal:${row['principaluri']}",
-				'commonName' => isset($p['{DAV:}displayname']) ? $p['{DAV:}displayname'] : '',
-				'status' => 1,
-				'readOnly' => (int) $row['access'] === self::ACCESS_READ,
-				'{http://owncloud.org/ns}principal' => $row['principaluri'],
-				'{http://owncloud.org/ns}group-share' => is_null($p)
-			];
-		}
-
-		return $shares;
-	}
-
-	/**
-	 * For shared resources the sharee is set in the ACL of the resource
-	 *
-	 * @param int $resourceId
-	 * @param array $acl
-	 * @return array
-	 */
-	public function applyShareAcl($resourceId, $acl) {
-		$shares = $this->getShares($resourceId);
-		foreach ($shares as $share) {
-			$acl[] = [
-				'privilege' => '{DAV:}read',
-				'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'],
-				'protected' => true,
-			];
-			if (!$share['readOnly']) {
-				$acl[] = [
-					'privilege' => '{DAV:}write',
-					'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'],
-					'protected' => true,
-				];
-			} elseif ($this->resourceType === 'calendar') {
-				// Allow changing the properties of read only calendars,
-				// so users can change the visibility.
-				$acl[] = [
-					'privilege' => '{DAV:}write-properties',
-					'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'],
-					'protected' => true,
-				];
-			}
-		}
-		return $acl;
-	}
+    /** @var IDBConnection */
+    private $db;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var IGroupManager */
+    private $groupManager;
+    /** @var Principal */
+    private $principalBackend;
+    /** @var string */
+    private $resourceType;
+
+    public const ACCESS_OWNER = 1;
+    public const ACCESS_READ_WRITE = 2;
+    public const ACCESS_READ = 3;
+
+    /**
+     * @param IDBConnection $db
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     * @param Principal $principalBackend
+     * @param string $resourceType
+     */
+    public function __construct(IDBConnection $db, IUserManager $userManager, IGroupManager $groupManager, Principal $principalBackend, $resourceType) {
+        $this->db = $db;
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        $this->principalBackend = $principalBackend;
+        $this->resourceType = $resourceType;
+    }
+
+    /**
+     * @param IShareable $shareable
+     * @param string[] $add
+     * @param string[] $remove
+     */
+    public function updateShares(IShareable $shareable, array $add, array $remove) {
+        foreach ($add as $element) {
+            $principal = $this->principalBackend->findByUri($element['href'], '');
+            if ($principal !== '') {
+                $this->shareWith($shareable, $element);
+            }
+        }
+        foreach ($remove as $element) {
+            $principal = $this->principalBackend->findByUri($element, '');
+            if ($principal !== '') {
+                $this->unshare($shareable, $element);
+            }
+        }
+    }
+
+    /**
+     * @param IShareable $shareable
+     * @param string $element
+     */
+    private function shareWith($shareable, $element) {
+        $user = $element['href'];
+        $parts = explode(':', $user, 2);
+        if ($parts[0] !== 'principal') {
+            return;
+        }
+
+        // don't share with owner
+        if ($shareable->getOwner() === $parts[1]) {
+            return;
+        }
+
+        $principal = explode('/', $parts[1], 3);
+        if (count($principal) !== 3 || $principal[0] !== 'principals' || !in_array($principal[1], ['users', 'groups', 'circles'], true)) {
+            // Invalid principal
+            return;
+        }
+
+        $principal[2] = urldecode($principal[2]);
+        if (($principal[1] === 'users' && !$this->userManager->userExists($principal[2])) ||
+            ($principal[1] === 'groups' && !$this->groupManager->groupExists($principal[2]))) {
+            // User or group does not exist
+            return;
+        }
+
+        // remove the share if it already exists
+        $this->unshare($shareable, $element['href']);
+        $access = self::ACCESS_READ;
+        if (isset($element['readOnly'])) {
+            $access = $element['readOnly'] ? self::ACCESS_READ : self::ACCESS_READ_WRITE;
+        }
+
+        $query = $this->db->getQueryBuilder();
+        $query->insert('dav_shares')
+            ->values([
+                'principaluri' => $query->createNamedParameter($parts[1]),
+                'type' => $query->createNamedParameter($this->resourceType),
+                'access' => $query->createNamedParameter($access),
+                'resourceid' => $query->createNamedParameter($shareable->getResourceId())
+            ]);
+        $query->execute();
+    }
+
+    /**
+     * @param $resourceId
+     */
+    public function deleteAllShares($resourceId) {
+        $query = $this->db->getQueryBuilder();
+        $query->delete('dav_shares')
+            ->where($query->expr()->eq('resourceid', $query->createNamedParameter($resourceId)))
+            ->andWhere($query->expr()->eq('type', $query->createNamedParameter($this->resourceType)))
+            ->execute();
+    }
+
+    public function deleteAllSharesByUser($principaluri) {
+        $query = $this->db->getQueryBuilder();
+        $query->delete('dav_shares')
+            ->where($query->expr()->eq('principaluri', $query->createNamedParameter($principaluri)))
+            ->andWhere($query->expr()->eq('type', $query->createNamedParameter($this->resourceType)))
+            ->execute();
+    }
+
+    /**
+     * @param IShareable $shareable
+     * @param string $element
+     */
+    private function unshare($shareable, $element) {
+        $parts = explode(':', $element, 2);
+        if ($parts[0] !== 'principal') {
+            return;
+        }
+
+        // don't share with owner
+        if ($shareable->getOwner() === $parts[1]) {
+            return;
+        }
+
+        $query = $this->db->getQueryBuilder();
+        $query->delete('dav_shares')
+            ->where($query->expr()->eq('resourceid', $query->createNamedParameter($shareable->getResourceId())))
+            ->andWhere($query->expr()->eq('type', $query->createNamedParameter($this->resourceType)))
+            ->andWhere($query->expr()->eq('principaluri', $query->createNamedParameter($parts[1])))
+        ;
+        $query->execute();
+    }
+
+    /**
+     * Returns the list of people whom this resource is shared with.
+     *
+     * Every element in this array should have the following properties:
+     *   * href - Often a mailto: address
+     *   * commonName - Optional, for example a first + last name
+     *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
+     *   * readOnly - boolean
+     *   * summary - Optional, a description for the share
+     *
+     * @param int $resourceId
+     * @return array
+     */
+    public function getShares($resourceId) {
+        $query = $this->db->getQueryBuilder();
+        $result = $query->select(['principaluri', 'access'])
+            ->from('dav_shares')
+            ->where($query->expr()->eq('resourceid', $query->createNamedParameter($resourceId)))
+            ->andWhere($query->expr()->eq('type', $query->createNamedParameter($this->resourceType)))
+            ->groupBy(['principaluri', 'access'])
+            ->execute();
+
+        $shares = [];
+        while ($row = $result->fetch()) {
+            $p = $this->principalBackend->getPrincipalByPath($row['principaluri']);
+            $shares[] = [
+                'href' => "principal:${row['principaluri']}",
+                'commonName' => isset($p['{DAV:}displayname']) ? $p['{DAV:}displayname'] : '',
+                'status' => 1,
+                'readOnly' => (int) $row['access'] === self::ACCESS_READ,
+                '{http://owncloud.org/ns}principal' => $row['principaluri'],
+                '{http://owncloud.org/ns}group-share' => is_null($p)
+            ];
+        }
+
+        return $shares;
+    }
+
+    /**
+     * For shared resources the sharee is set in the ACL of the resource
+     *
+     * @param int $resourceId
+     * @param array $acl
+     * @return array
+     */
+    public function applyShareAcl($resourceId, $acl) {
+        $shares = $this->getShares($resourceId);
+        foreach ($shares as $share) {
+            $acl[] = [
+                'privilege' => '{DAV:}read',
+                'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'],
+                'protected' => true,
+            ];
+            if (!$share['readOnly']) {
+                $acl[] = [
+                    'privilege' => '{DAV:}write',
+                    'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'],
+                    'protected' => true,
+                ];
+            } elseif ($this->resourceType === 'calendar') {
+                // Allow changing the properties of read only calendars,
+                // so users can change the visibility.
+                $acl[] = [
+                    'privilege' => '{DAV:}write-properties',
+                    'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'],
+                    'protected' => true,
+                ];
+            }
+        }
+        return $acl;
+    }
 }

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

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 	private function setupUserFs($userId) {
 		\OC_Util::setupFS($userId);
 		$this->session->close();
-		return $this->principalPrefix . $userId;
+		return $this->principalPrefix.$userId;
 	}
 
 	/**

Indentation +55 added lines, -55 removed lines

@@ -31,66 +31,66 @@
 use Sabre\HTTP\ResponseInterface;
 
 class BearerAuth extends AbstractBearer {
-	/** @var IUserSession */
-	private $userSession;
-	/** @var ISession */
-	private $session;
-	/** @var IRequest */
-	private $request;
-	/** @var string */
-	private $principalPrefix;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var ISession */
+    private $session;
+    /** @var IRequest */
+    private $request;
+    /** @var string */
+    private $principalPrefix;
 
-	/**
-	 * @param IUserSession $userSession
-	 * @param ISession $session
-	 * @param string $principalPrefix
-	 * @param IRequest $request
-	 */
-	public function __construct(IUserSession $userSession,
-								ISession $session,
-								IRequest $request,
-								$principalPrefix = 'principals/users/') {
-		$this->userSession = $userSession;
-		$this->session = $session;
-		$this->request = $request;
-		$this->principalPrefix = $principalPrefix;
+    /**
+     * @param IUserSession $userSession
+     * @param ISession $session
+     * @param string $principalPrefix
+     * @param IRequest $request
+     */
+    public function __construct(IUserSession $userSession,
+                                ISession $session,
+                                IRequest $request,
+                                $principalPrefix = 'principals/users/') {
+        $this->userSession = $userSession;
+        $this->session = $session;
+        $this->request = $request;
+        $this->principalPrefix = $principalPrefix;
 
-		// setup realm
-		$defaults = new \OCP\Defaults();
-		$this->realm = $defaults->getName();
-	}
+        // setup realm
+        $defaults = new \OCP\Defaults();
+        $this->realm = $defaults->getName();
+    }
 
-	private function setupUserFs($userId) {
-		\OC_Util::setupFS($userId);
-		$this->session->close();
-		return $this->principalPrefix . $userId;
-	}
+    private function setupUserFs($userId) {
+        \OC_Util::setupFS($userId);
+        $this->session->close();
+        return $this->principalPrefix . $userId;
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function validateBearerToken($bearerToken) {
-		\OC_Util::setupFS();
+    /**
+     * {@inheritdoc}
+     */
+    public function validateBearerToken($bearerToken) {
+        \OC_Util::setupFS();
 
-		if (!$this->userSession->isLoggedIn()) {
-			$this->userSession->tryTokenLogin($this->request);
-		}
-		if ($this->userSession->isLoggedIn()) {
-			return $this->setupUserFs($this->userSession->getUser()->getUID());
-		}
+        if (!$this->userSession->isLoggedIn()) {
+            $this->userSession->tryTokenLogin($this->request);
+        }
+        if ($this->userSession->isLoggedIn()) {
+            return $this->setupUserFs($this->userSession->getUser()->getUID());
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	/**
-	 * \Sabre\DAV\Auth\Backend\AbstractBearer::challenge sets an WWW-Authenticate
-	 * header which some DAV clients can't handle. Thus we override this function
-	 * and make it simply return a 401.
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 */
-	public function challenge(RequestInterface $request, ResponseInterface $response) {
-		$response->setStatus(401);
-	}
+    /**
+     * \Sabre\DAV\Auth\Backend\AbstractBearer::challenge sets an WWW-Authenticate
+     * header which some DAV clients can't handle. Thus we override this function
+     * and make it simply return a 401.
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     */
+    public function challenge(RequestInterface $request, ResponseInterface $response) {
+        $response->setStatus(401);
+    }
 }

apps/dav/lib/Connector/Sabre/Exception/FileLocked.php

Indentation +14 added lines, -14 removed lines

@@ -29,19 +29,19 @@
 use Exception;
 
 class FileLocked extends \Sabre\DAV\Exception {
-	public function __construct($message = "", $code = 0, Exception $previous = null) {
-		if ($previous instanceof \OCP\Files\LockNotAcquiredException) {
-			$message = sprintf('Target file %s is locked by another process.', $previous->path);
-		}
-		parent::__construct($message, $code, $previous);
-	}
+    public function __construct($message = "", $code = 0, Exception $previous = null) {
+        if ($previous instanceof \OCP\Files\LockNotAcquiredException) {
+            $message = sprintf('Target file %s is locked by another process.', $previous->path);
+        }
+        parent::__construct($message, $code, $previous);
+    }
 
-	/**
-	 * Returns the HTTP status code for this exception
-	 *
-	 * @return int
-	 */
-	public function getHTTPCode() {
-		return 423;
-	}
+    /**
+     * Returns the HTTP status code for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+        return 423;
+    }
 }