[stable10] Fix error logs due to deletion of keys

apps/files_trashbin/lib/Storage.php

@@ -199,6 +199,28 @@ private function doDelete($path, $method) {
 		return $result;
 	}
 
+	/**
+	 * Retain the encryption keys
+	 *
+	 * @param $filename
+	 * @param $owner
+	 * @param $ownerPath
+	 * @param $timestamp
+	 * @param $sourceStorage
+	 * @return bool
+	 */
+
+	public function retainKeys($filename, $owner, $ownerPath, $timestamp, $sourceStorage) {
+		if (\OC::$server->getEncryptionManager()->isEnabled()) {
+			if ($sourceStorage !== null) {
+				$sourcePath = '/' . $owner . '/files_trashbin/files/'. $filename . '.d' . $timestamp;
+				$targetPath = '/' . $owner . '/files/' . $ownerPath;
+				return $sourceStorage->copyKeys($sourcePath, $targetPath);
+			}
+		}
+		return false;
+	}
+
 	/**
 	 * Setup the storate wrapper callback
 	 */

apps/files_trashbin/lib/Trashbin.php

@@ -208,7 +208,7 @@ public static function copyBackupForOwner($ownerPath, $owner, $timestamp) {
 		$view = new View('/');
 		self::copy_recursive($source, $target, $view);
 
-		self::retainVersions($targetFilename, $owner, $ownerPath, $timestamp, true);
+		self::retainVersions($targetFilename, $owner, $ownerPath, $timestamp, null, true);
 
 		if ($view->file_exists($target)) {
 			self::insertTrashEntry($owner, $targetFilename, $targetLocation, $timestamp);
@@ -304,7 +304,7 @@ public static function move2trash($file_path) {
 			\OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_moveToTrash', ['filePath' => Filesystem::normalizePath($file_path),
 				'trashPath' => Filesystem::normalizePath($filename . '.d' . $timestamp)]);
 
-			self::retainVersions($filename, $owner, $ownerPath, $timestamp);
+			self::retainVersions($filename, $owner, $ownerPath, $timestamp, $sourceStorage);
 
 			// if owner !== user we need to also add a copy to the owners trash
 			if ($user !== $owner) {
@@ -331,9 +331,19 @@ public static function move2trash($file_path) {
 	 * @param integer $timestamp when the file was deleted
 	 * @param bool $forceCopy true to only make a copy of the versions into the trashbin
 	 */
-	private static function retainVersions($filename, $owner, $ownerPath, $timestamp, $forceCopy = false) {
+	private static function retainVersions($filename, $owner, $ownerPath, $timestamp, $sourceStorage = null, $forceCopy = false) {
 		if (\OCP\App::isEnabled('files_versions') && !empty($ownerPath)) {
 
+			$copyKeysResult = false;
+
+			/**
+			 * In case if encryption is enabled then we need to retain the keys which were
+			 * deleted due to move operation to trashbin.
+			 */
+			if ($sourceStorage !== null) {
+				$copyKeysResult = $sourceStorage->retainKeys($filename, $owner, $ownerPath, $timestamp, $sourceStorage);
+			}
+
 			$user = User::getUser();
 			$rootView = new View('/');
 
@@ -355,6 +365,10 @@ private static function retainVersions($filename, $owner, $ownerPath, $timestamp
 					}
 				}
 			}
+
+			if ($copyKeysResult === true) {
+				$sourceStorage->deleteAllFileKeys($filename);
+			}
 		}
 	}
 

lib/private/Files/Storage/Wrapper/Encryption.php

@@ -1028,6 +1028,18 @@ protected function copyKeys($source, $target) {
 		return false;
 	}
 
+	/**
+	 *
+	 * delete file keys of the file
+	 *
+	 * @param $path path of the file key to delete
+	 * @return bool
+	 */
+	protected function deleteAllFileKeys($path) {
+		$fullPath = $this->getFullPath($path);
+		return $this->keyStorage->deleteAllFileKeys($fullPath);
+	}
+
 	/**
 	 * check if path points to a files version
 	 *