allow storage backends to implement custom permission management

4 files changed, 43 insertions, 18 deletions

diff --git a/lib/files/cache/permissions.php b/lib/files/cache/permissions.php
index dd7233abc70..d0968337f02 100644
--- a/lib/files/cache/permissions.php
+++ b/lib/files/cache/permissions.php
@@ -10,13 +10,29 @@ namespace OC\Files\Cache;
 
 class Permissions {
 	/**
+	 * @var string $storageId
+	 */
+	private $storageId;
+
+	/**
+	 * @param \OC\Files\Storage\Storage|string $storage
+	 */
+	public function __construct($storage){
+		if($storage instanceof \OC\Files\Storage\Storage){
+			$this->storageId = $storage->getId();
+		}else{
+			$this->storageId = $storage;
+		}
+	}
+
+	/**
 	 * get the permissions for a single file
 	 *
 	 * @param int $fileId
 	 * @param string $user
 	 * @return int (-1 if file no permissions set)
 	 */
-	static public function get($fileId, $user) {
+	public function get($fileId, $user) {
 		$query = \OC_DB::prepare('SELECT `permissions` FROM `*PREFIX*permissions` WHERE `user` = ? AND `fileid` = ?');
 		$result = $query->execute(array($user, $fileId));
 		if ($row = $result->fetchRow()) {
@@ -33,7 +49,7 @@ class Permissions {
 	 * @param string $user
 	 * @param int $permissions
 	 */
-	static public function set($fileId, $user, $permissions) {
+	public function set($fileId, $user, $permissions) {
 		if (self::get($fileId, $user) !== -1) {
 			$query = \OC_DB::prepare('UPDATE `*PREFIX*permissions` SET `permissions` = ? WHERE `user` = ? AND `fileid` = ?');
 		} else {
@@ -49,7 +65,7 @@ class Permissions {
 	 * @param string $user
 	 * @return int[]
 	 */
-	static public function getMultiple($fileIds, $user) {
+	public function getMultiple($fileIds, $user) {
 		if (count($fileIds) === 0) {
 			return array();
 		}
@@ -72,17 +88,15 @@ class Permissions {
 	 * @param int $fileId
 	 * @param string $user
 	 */
-	static public function remove($fileId, $user) {
+	public function remove($fileId, $user) {
 		$query = \OC_DB::prepare('DELETE FROM `*PREFIX*permissions` WHERE `fileid` = ? AND `user` = ?');
 		$query->execute(array($fileId, $user));
 	}
 
-	static public function removeMultiple($fileIds, $user) {
-		$params = $fileIds;
-		$params[] = $user;
-		$inPart = implode(', ', array_fill(0, count($fileIds), '?'));
-
-		$query = \OC_DB::prepare('DELETE FROM `*PREFIX*permissions` WHERE `fileid` IN (' . $inPart . ') AND `user` = ?');
-		$query->execute($params);
+	public function removeMultiple($fileIds, $user) {
+		$query = \OC_DB::prepare('DELETE FROM `*PREFIX*permissions` WHERE `fileid` = ? AND `user` = ?');
+		foreach($fileIds as $fileId){
+			$query->execute(array($fileId, $user));
+		}
 	}
 }
diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php
index f471752d1ff..cf6fe64a4f2 100644
--- a/lib/files/storage/common.php
+++ b/lib/files/storage/common.php
@@ -57,19 +57,19 @@ abstract class Common implements \OC\Files\Storage\Storage {
 	public function getPermissions($path){
 		$permissions = 0;
 		if($this->isCreatable($path)){
-			$permissions |= \OCP\Share::PERMISSION_CREATE;
+			$permissions |= \OCP\PERMISSION_CREATE;
 		}
 		if($this->isReadable($path)){
-			$permissions |= \OCP\Share::PERMISSION_READ;
+			$permissions |= \OCP\PERMISSION_READ;
 		}
 		if($this->isUpdatable($path)){
-			$permissions |= \OCP\Share::PERMISSION_UPDATE;
+			$permissions |= \OCP\PERMISSION_UPDATE;
 		}
 		if($this->isDeletable($path)){
-			$permissions |= \OCP\Share::PERMISSION_DELETE;
+			$permissions |= \OCP\PERMISSION_DELETE;
 		}
 		if($this->isSharable($path)){
-			$permissions |= \OCP\Share::PERMISSION_SHARE;
+			$permissions |= \OCP\PERMISSION_SHARE;
 		}
 		return $permissions;
 	}
@@ -259,6 +259,10 @@ abstract class Common implements \OC\Files\Storage\Storage {
 		return new \OC\Files\Cache\Scanner($this);
 	}
 
+	public function getPermissionsCache(){
+		return new \OC\Files\Cache\Permissions($this);
+	}
+
 	/**
 	 * get the owner of a path
 	 * @param string $path The path to get the owner
diff --git a/lib/files/storage/storage.php b/lib/files/storage/storage.php
index bb1ba16984d..73dcb8fe36b 100644
--- a/lib/files/storage/storage.php
+++ b/lib/files/storage/storage.php
@@ -65,6 +65,11 @@ interface Storage{
 	public function getOwner($path);
 
 	/**
+	 * @return \OC\Files\Cache\Permissions
+	 */
+	public function getPermissionsCache();
+
+	/**
 	 * get the ETag for a file or folder
 	 *
 	 * @param string $path
diff --git a/lib/files/view.php b/lib/files/view.php
index a54c3ee3564..e516a4fed6a 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -701,7 +701,8 @@ class View {
 			}
 		}
 
-		$data['permissions'] = Cache\Permissions::get($data['fileid'], \OC_User::getUser());
+		$permissionsCache = $storage->getPermissionsCache();
+		$data['permissions'] = $permissionsCache->get($data['fileid'], \OC_User::getUser());
 
 		return $data;
 	}
@@ -759,8 +760,9 @@ class View {
 			$files[$i]['type'] = $file['mimetype'] === 'httpd/unix-directory' ? 'dir' : 'file';
 			$ids[] = $file['fileid'];
 		}
+		$permissionsCache = $storage->getPermissionsCache();
 
-		$permissions = Cache\Permissions::getMultiple($ids, \OC_User::getUser());
+		$permissions = $permissionsCache->getMultiple($ids, \OC_User::getUser());
 		foreach ($files as $i => $file) {
 			$files[$i]['permissions'] = $permissions[$file['fileid']];
 		}