Delete orphaned shares in a background job

apps/files_sharing/command/deleteorphanedsharescommand.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright (c) 2015 Vincent Petry <[email protected]>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCA\Files_sharing\Command;
+
+use OCP\Command\ICommand;
+use OCP\IDBConnection;
+
+/**
+ * Delete all share entries that have no matching entries in the file cache table.
+ */
+class DeleteOrphanedSharesCommand implements ICommand {
+
+	/**
+     * {@inheritdoc}
+	 */
+	public function handle() {
+		$connection = \OC::$server->getDatabaseConnection();
+		// TODO: SQLite...
+		$connection->executeUpdate(
+			'DELETE `s` FROM `*PREFIX*share` `s` ' .
+			'LEFT JOIN `*PREFIX*filecache` `f` ON `s`.`file_source`=`f`.`fileid` ' .
+			'WHERE `f`.`fileid` IS NULL;'
+		);
+	}
+
+}

apps/files_sharing/lib/updater.php

@@ -21,6 +21,8 @@
 
 namespace OC\Files\Cache;
 
+use OCA\Files_sharing\Command\DeleteOrphanedSharesCommand;
+
 class Shared_Updater {
 
 	// shares which can be removed from oc_share after the delete operation was successful
@@ -92,10 +94,22 @@ private static function removeShare($path) {
 			} catch (\Exception $e) {
 				\OCP\Util::writeLog('files_sharing', "can't remove share: " . $e->getMessage(), \OCP\Util::WARN);
 			}
+
+			// it might have been a folder, schedule deletion of orphaned shares
+			self::scheduleDeleteOrphanedShares();
 		}
 		unset(self::$toRemove[$path]);
 	}
 
+	/**
+	 * Schedule a background job for the deletion of orphaned shares
+	 */
+	static private function scheduleDeleteOrphanedShares() {
+		\OC::$server->getCommandBus()->push(
+			new DeleteOrphanedSharesCommand()
+		);
+	}
+
 	/**
 	 * @param array $params
 	 */

apps/files_sharing/tests/updater.php

@@ -115,6 +115,32 @@ function testDeleteParentFolder() {
 		\OC\Files\Filesystem::getLoader()->removeStorageWrapper('oc_trashbin');
 	}
 
+	function testDeleteFolderWithOutgoingSharesInside() {
+		OC_FileProxy::register(new OCA\Files\Share\Proxy());
+
+		$fileinfo = \OC\Files\Filesystem::getFileInfo($this->folder . '/' . $this->filename);
+		$this->assertTrue($fileinfo instanceof \OC\Files\FileInfo);
+
+		\OCP\Share::shareItem('file', $fileinfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2, 31);
+
+		$foldersShared = \OCP\Share::getItemsShared('file');
+		$this->assertCount(1, $foldersShared);
+
+		$this->view->unlink($this->folder);
+
+		$foldersShared = \OCP\Share::getItemsShared('file');
+		$this->assertCount(1, $foldersShared);
+
+		// files moved to trash, still associated with share entry,
+		// so clear trash to make it an orphaned share
+		\OCA\Files_Trashbin\Trashbin::deleteAll();
+
+		$this->runCommands();
+
+		$foldersShared = \OCP\Share::getItemsShared('file');
+		$this->assertCount(0, $foldersShared);
+	}
+
 	/**
 	 * if a file gets shared the etag for the recipients root should change
 	 */

apps/files_trashbin/lib/trashbin.php

@@ -508,6 +508,8 @@ public static function deleteAll() {
 		$view->deleteAll('files_trashbin');
 		$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trash` WHERE `user`=?');
 		$query->execute(array($user));
+		$view->mkdir('files_trashbin');
+		$view->mkdir('files_trashbin/files');
 
 		return true;
 	}