Merge pull request #3416 from owncloud/files_encryption

New files encryption app

5 files changed, 160 insertions, 11 deletions

diff --git a/lib/files/cache/cache.php b/lib/files/cache/cache.php
index 3341fe50525..b912b4423e7 100644
--- a/lib/files/cache/cache.php
+++ b/lib/files/cache/cache.php
@@ -107,7 +107,7 @@ class Cache {
 			$params = array($file);
 		}
 		$query = \OC_DB::prepare(
-			'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`, `encrypted`, `etag`
+			'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`, `encrypted`, `unencrypted_size`, `etag`
 			 FROM `*PREFIX*filecache` ' . $where);
 		$result = $query->execute($params);
 		$data = $result->fetchRow();
@@ -123,6 +123,7 @@ class Cache {
 			$data['size'] = (int)$data['size'];
 			$data['mtime'] = (int)$data['mtime'];
 			$data['encrypted'] = (bool)$data['encrypted'];
+            $data['unencrypted_size'] = (int)$data['unencrypted_size'];
 			$data['storage'] = $this->storageId;
 			$data['mimetype'] = $this->getMimetype($data['mimetype']);
 			$data['mimepart'] = $this->getMimetype($data['mimepart']);
@@ -144,8 +145,9 @@ class Cache {
 		$fileId = $this->getId($folder);
 		if ($fileId > -1) {
 			$query = \OC_DB::prepare(
-				'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`, `encrypted`, `etag`
-				 FROM `*PREFIX*filecache` WHERE `parent` = ? ORDER BY `name` ASC');
+				'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`, `encrypted`, `unencrypted_size`, `etag`
+			 	 FROM `*PREFIX*filecache` WHERE `parent` = ? ORDER BY `name` ASC');
+
 			$result = $query->execute(array($fileId));
 			if (\OC_DB::isError($result)) {
 				\OCP\Util::writeLog('cache', 'getFolderContents failed: ' . $result->getMessage(), \OCP\Util::ERROR);
@@ -233,7 +235,7 @@ class Cache {
 	 * @return array
 	 */
 	function buildParts(array $data) {
-		$fields = array('path', 'parent', 'name', 'mimetype', 'size', 'mtime', 'storage_mtime', 'encrypted', 'etag');
+		$fields = array('path', 'parent', 'name', 'mimetype', 'size', 'mtime', 'storage_mtime', 'encrypted', 'unencrypted_size', 'etag');
 		$params = array();
 		$queryParts = array();
 		foreach ($data as $name => $value) {
@@ -401,7 +403,7 @@ class Cache {
 	 */
 	public function search($pattern) {
 		$query = \OC_DB::prepare('
-			SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `etag`
+			SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `unencrypted_size`, `etag`
 			FROM `*PREFIX*filecache` WHERE `name` LIKE ? AND `storage` = ?'
 		);
 		$result = $query->execute(array($pattern, $this->getNumericStorageId()));
@@ -427,7 +429,7 @@ class Cache {
 			$where = '`mimepart` = ?';
 		}
 		$query = \OC_DB::prepare('
-			SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `etag`
+			SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `unencrypted_size`, `etag`
 			FROM `*PREFIX*filecache` WHERE ' . $where . ' AND `storage` = ?'
 		);
 		$mimetype = $this->getMimetypeId($mimetype);
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index 99d87011df2..b10625e20de 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -236,7 +236,9 @@ class Filesystem {
 	}
 
 	static public function initMounts(){
-		self::$mounts = new Mount\Manager();
+		if(!self::$mounts) {
+			self::$mounts = new Mount\Manager();
+		}
 	}
 
 	/**
diff --git a/lib/files/view.php b/lib/files/view.php
index 168d781d62c..8e7727d335c 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -371,6 +371,7 @@ class View {
 					list(, $internalPath2) = Filesystem::resolvePath($absolutePath2 . $postFix2);
 					if ($storage) {
 						$result = $storage->rename($internalPath1, $internalPath2);
+                        \OC_FileProxy::runPostProxies('rename', $absolutePath1, $absolutePath2);
 					} else {
 						$result = false;
 					}
@@ -758,6 +759,9 @@ class View {
 				$data['permissions'] = $permissions;
 			}
 		}
+
+        $data = \OC_FileProxy::runPostProxies('getFileInfo', $path, $data);
+
 		return $data;
 	}
 
diff --git a/lib/public/share.php b/lib/public/share.php
index a561319e9bd..03d662676c6 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -106,6 +106,111 @@ class Share {
 		}
 		return false;
 	}
+	
+	/**
+	* @brief Prepare a path to be passed to DB as file_target
+	* @return string Prepared path
+	*/
+	public static function prepFileTarget( $path ) {
+	
+		// Paths in DB are stored with leading slashes, so add one if necessary
+		if ( substr( $path, 0, 1 ) !== '/' ) {
+		
+			$path = '/' . $path;
+		
+		}
+		
+		return $path;
+	
+	}
+		
+	/**
+	* @brief Find which users can access a shared item
+	* @param $path to the file
+	* @param $user owner of the file
+	* @param include owner to the list of users with access to the file
+	* @return array
+	* @note $path needs to be relative to user data dir, e.g. 'file.txt' 
+	*       not '/admin/data/file.txt'
+	*/
+	public static function getUsersSharingFile($path, $user, $includeOwner = false, $removeDuplicates = true) {
+
+		$path_parts = explode(DIRECTORY_SEPARATOR, trim($path, DIRECTORY_SEPARATOR));
+		$path = '';
+		$shares = array();
+		$publicShare = false;
+		$view = new \OC\Files\View('/' . $user . '/files/');
+		foreach ($path_parts as $p) {
+			$path .= '/' . $p;
+			$meta = $view->getFileInfo(\OC_Filesystem::normalizePath($path));
+			$source = $meta['fileid'];
+
+			// Fetch all shares of this file path from DB
+			$query = \OC_DB::prepare(
+				'SELECT share_with
+				FROM
+				`*PREFIX*share`
+				WHERE
+				item_source = ? AND share_type = ?'
+			);
+
+			$result = $query->execute(array($source, self::SHARE_TYPE_USER));
+
+			if (\OC_DB::isError($result)) {
+				\OC_Log::write('OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR);
+			}
+
+			while ($row = $result->fetchRow()) {
+				$shares[] = $row['share_with'];
+			}
+
+			// We also need to take group shares into account
+
+			$query = \OC_DB::prepare(
+				'SELECT share_with
+				FROM
+				`*PREFIX*share`
+				WHERE
+				item_source = ? AND share_type = ?'
+			);
+
+			$result = $query->execute(array($source, self::SHARE_TYPE_GROUP));
+
+			if (\OC_DB::isError($result)) {
+				\OC_Log::write('OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR);
+			}
+
+			while ($row = $result->fetchRow()) {
+				$usersInGroup = \OC_Group::usersInGroup($row['share_with']);
+				$shares = array_merge($shares, $usersInGroup);
+			}
+
+			//check for public link shares
+			$query = \OC_DB::prepare(
+				'SELECT share_with
+				FROM
+				`*PREFIX*share`
+				WHERE
+				item_source = ? AND share_type = ?'
+			);
+
+			$result = $query->execute(array($source, self::SHARE_TYPE_LINK));
+
+			if (\OC_DB::isError($result)) {
+				\OC_Log::write('OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR);
+			}
+
+			if ($result->fetchRow()) {
+				$publicShare = true;
+			}
+		}
+		// Include owner in list of users, if requested
+		if ($includeOwner) {
+			$shares[] = $user;
+		}
+
+		return array("users" => array_unique($shares), "public" => $publicShare);
+	}
 
 	/**
 	* @brief Get the items of item type shared with the current user
@@ -132,7 +237,7 @@ class Share {
 		return self::getItems($itemType, $itemTarget, self::$shareTypeUserAndGroups, \OC_User::getUser(), null, $format,
 			$parameters, 1, $includeCollections);
 	}
-
+	
 	/**
 	* @brief Get the item of item type shared with the current user by source
 	* @param string Item type
@@ -409,8 +514,16 @@ class Share {
 				'fileSource' => $item['file_source'],
 				'shareType' => $shareType,
 				'shareWith' => $shareWith,
+				'itemParent' => $item['parent'],
 			));
 			self::delete($item['id']);
+			\OC_Hook::emit('OCP\Share', 'post_unshare', array(
+					'itemType' => $itemType,
+					'itemSource' => $itemSource,
+					'shareType' => $shareType,
+					'shareWith' => $shareWith,
+					'itemParent' => $item['parent'],
+			));
 			return true;
 		}
 		return false;
@@ -433,6 +546,11 @@ class Share {
 			foreach ($shares as $share) {
 				self::delete($share['id']);
 			}
+			\OC_Hook::emit('OCP\Share', 'post_unshareAll', array(
+					'itemType' => $itemType,
+					'itemSource' => $itemSource,
+					'shares' => $shares
+			));
 			return true;
 		}
 		return false;
@@ -1089,6 +1207,17 @@ class Share {
 		if ($shareType == self::SHARE_TYPE_GROUP) {
 			$groupItemTarget = self::generateTarget($itemType, $itemSource, $shareType, $shareWith['group'],
 				$uidOwner, $suggestedItemTarget);
+			\OC_Hook::emit('OCP\Share', 'pre_shared', array(
+				'itemType' => $itemType,
+				'itemSource' => $itemSource,
+				'itemTarget' => $groupItemTarget,
+				'shareType' => $shareType,
+				'shareWith' => $shareWith['group'],
+				'uidOwner' => $uidOwner,
+				'permissions' => $permissions,
+				'fileSource' => $fileSource,
+				'token' => $token
+			));
 			if (isset($fileSource)) {
 				if ($parentFolder) {
 					if ($parentFolder === true) {
@@ -1164,6 +1293,17 @@ class Share {
 		} else {
 			$itemTarget = self::generateTarget($itemType, $itemSource, $shareType, $shareWith, $uidOwner,
 				$suggestedItemTarget);
+			\OC_Hook::emit('OCP\Share', 'pre_shared', array(
+				'itemType' => $itemType,
+				'itemSource' => $itemSource,
+				'itemTarget' => $itemTarget,
+				'shareType' => $shareType,
+				'shareWith' => $shareWith,
+				'uidOwner' => $uidOwner,
+				'permissions' => $permissions,
+				'fileSource' => $fileSource,
+				'token' => $token
+			));
 			if (isset($fileSource)) {
 				if ($parentFolder) {
 					if ($parentFolder === true) {
diff --git a/lib/user.php b/lib/user.php
index 32b91c35efc..26fe73f8bfe 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -393,13 +393,14 @@ class OC_User {
 	 * @brief Set password
 	 * @param $uid The username
 	 * @param $password The new password
+	 * @param $recoveryPassword for the encryption app to reset encryption keys
 	 * @returns true/false
 	 *
 	 * Change the password of a user
 	 */
-	public static function setPassword( $uid, $password ) {
+	public static function setPassword( $uid, $password, $recoveryPassword = null ) {
 		$run = true;
-		OC_Hook::emit( "OC_User", "pre_setPassword", array( "run" => &$run, "uid" => $uid, "password" => $password ));
+		OC_Hook::emit( "OC_User", "pre_setPassword", array( "run" => &$run, "uid" => $uid, "password" => $password, "recoveryPassword" => $recoveryPassword ));
 
 		if( $run ) {
 			$success = false;
@@ -412,7 +413,7 @@ class OC_User {
 			}
 			// invalidate all login cookies
 			OC_Preferences::deleteApp($uid, 'login_token');
-			OC_Hook::emit( "OC_User", "post_setPassword", array( "uid" => $uid, "password" => $password ));
+			OC_Hook::emit( "OC_User", "post_setPassword", array( "uid" => $uid, "password" => $password, "recoveryPassword" => $recoveryPassword ));
 			return $success;
 		}
 		else{