2 files changed, 110 insertions, 173 deletions

diff --git a/apps/files_sharing/lib/ShareBackend/File.php b/apps/files_sharing/lib/ShareBackend/File.php
index 83474546581..2aa52ef1b7f 100644
--- a/apps/files_sharing/lib/ShareBackend/File.php
+++ b/apps/files_sharing/lib/ShareBackend/File.php
@@ -1,73 +1,53 @@
 <?php
+
 /**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Andreas Fischer <bantu@owncloud.com>
- * @author Bart Visscher <bartv@thisnet.nl>
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Michael Gapczynski <GapczynskiM@gmail.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <robin@icewind.nl>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- * @author Vincent Petry <pvince81@owncloud.com>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 namespace OCA\Files_Sharing\ShareBackend;
 
+use OC\Files\Filesystem;
+use OC\Files\View;
 use OCA\FederatedFileSharing\FederatedShareProvider;
-
-class File implements \OCP\Share_Backend_File_Dependent {
-
-	const FORMAT_SHARED_STORAGE = 0;
-	const FORMAT_GET_FOLDER_CONTENTS = 1;
-	const FORMAT_FILE_APP_ROOT = 2;
-	const FORMAT_OPENDIR = 3;
-	const FORMAT_GET_ALL = 4;
-	const FORMAT_PERMISSIONS = 5;
-	const FORMAT_TARGET_NAMES = 6;
+use OCA\Files_Sharing\Helper;
+use OCP\Files\NotFoundException;
+use OCP\IDBConnection;
+use OCP\Server;
+use OCP\Share\IShare;
+use OCP\Share_Backend_File_Dependent;
+use Psr\Log\LoggerInterface;
+
+class File implements Share_Backend_File_Dependent {
+	public const FORMAT_SHARED_STORAGE = 0;
+	public const FORMAT_GET_FOLDER_CONTENTS = 1;
+	public const FORMAT_FILE_APP_ROOT = 2;
+	public const FORMAT_OPENDIR = 3;
+	public const FORMAT_GET_ALL = 4;
+	public const FORMAT_PERMISSIONS = 5;
+	public const FORMAT_TARGET_NAMES = 6;
 
 	private $path;
 
-	/** @var FederatedShareProvider */
-	private $federatedShareProvider;
-
-	public function __construct(FederatedShareProvider $federatedShareProvider = null) {
+	public function __construct(
+		private ?FederatedShareProvider $federatedShareProvider = null,
+	) {
 		if ($federatedShareProvider) {
 			$this->federatedShareProvider = $federatedShareProvider;
 		} else {
-			$federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application();
-			$this->federatedShareProvider = $federatedSharingApp->getFederatedShareProvider();
+			$this->federatedShareProvider = Server::get(FederatedShareProvider::class);
 		}
 	}
 
 	public function isValidSource($itemSource, $uidOwner) {
 		try {
-			$path = \OC\Files\Filesystem::getPath($itemSource);
+			$path = Filesystem::getPath($itemSource);
 			// FIXME: attributes should not be set here,
 			// keeping this pattern for now to avoid unexpected
 			// regressions
-			$this->path = \OC\Files\Filesystem::normalizePath(basename($path));
+			$this->path = Filesystem::normalizePath(basename($path));
 			return true;
-		} catch (\OCP\Files\NotFoundException $e) {
+		} catch (NotFoundException $e) {
 			return false;
 		}
 	}
@@ -79,9 +59,9 @@ class File implements \OCP\Share_Backend_File_Dependent {
 			return $path;
 		} else {
 			try {
-				$path = \OC\Files\Filesystem::getPath($itemSource);
+				$path = Filesystem::getPath($itemSource);
 				return $path;
-			} catch (\OCP\Files\NotFoundException $e) {
+			} catch (NotFoundException $e) {
 				return false;
 			}
 		}
@@ -89,22 +69,17 @@ class File implements \OCP\Share_Backend_File_Dependent {
 
 	/**
 	 * create unique target
-	 * @param string $filePath
+	 *
+	 * @param string $itemSource
 	 * @param string $shareWith
-	 * @param array $exclude (optional)
 	 * @return string
 	 */
-	public function generateTarget($filePath, $shareWith, $exclude = null) {
-		$shareFolder = \OCA\Files_Sharing\Helper::getShareFolder();
-		$target = \OC\Files\Filesystem::normalizePath($shareFolder . '/' . basename($filePath));
+	public function generateTarget($itemSource, $shareWith) {
+		$shareFolder = Helper::getShareFolder();
+		$target = Filesystem::normalizePath($shareFolder . '/' . basename($itemSource));
 
-		// for group shares we return the target right away
-		if ($shareWith === false) {
-			return $target;
-		}
-
-		\OC\Files\Filesystem::initMountPoints($shareWith);
-		$view = new \OC\Files\View('/' . $shareWith . '/files');
+		Filesystem::initMountPoints($shareWith);
+		$view = new View('/' . $shareWith . '/files');
 
 		if (!$view->is_dir($shareFolder)) {
 			$dir = '';
@@ -117,26 +92,24 @@ class File implements \OCP\Share_Backend_File_Dependent {
 			}
 		}
 
-		$excludeList = (is_array($exclude)) ? $exclude : array();
-
-		return \OCA\Files_Sharing\Helper::generateUniqueTarget($target, $excludeList, $view);
+		return Helper::generateUniqueTarget($target, $view);
 	}
 
 	public function formatItems($items, $format, $parameters = null) {
 		if ($format === self::FORMAT_SHARED_STORAGE) {
 			// Only 1 item should come through for this format call
 			$item = array_shift($items);
-			return array(
+			return [
 				'parent' => $item['parent'],
 				'path' => $item['path'],
 				'storage' => $item['storage'],
 				'permissions' => $item['permissions'],
 				'uid_owner' => $item['uid_owner'],
-			);
-		} else if ($format === self::FORMAT_GET_FOLDER_CONTENTS) {
-			$files = array();
+			];
+		} elseif ($format === self::FORMAT_GET_FOLDER_CONTENTS) {
+			$files = [];
 			foreach ($items as $item) {
-				$file = array();
+				$file = [];
 				$file['fileid'] = $item['file_source'];
 				$file['storage'] = $item['storage'];
 				$file['path'] = $item['file_target'];
@@ -150,38 +123,38 @@ class File implements \OCP\Share_Backend_File_Dependent {
 				$file['uid_owner'] = $item['uid_owner'];
 				$file['displayname_owner'] = $item['displayname_owner'];
 
-				$storage = \OC\Files\Filesystem::getStorage('/');
+				$storage = Filesystem::getStorage('/');
 				$cache = $storage->getCache();
 				$file['size'] = $item['size'];
 				$files[] = $file;
 			}
 			return $files;
-		} else if ($format === self::FORMAT_OPENDIR) {
-			$files = array();
+		} elseif ($format === self::FORMAT_OPENDIR) {
+			$files = [];
 			foreach ($items as $item) {
 				$files[] = basename($item['file_target']);
 			}
 			return $files;
-		} else if ($format === self::FORMAT_GET_ALL) {
-			$ids = array();
+		} elseif ($format === self::FORMAT_GET_ALL) {
+			$ids = [];
 			foreach ($items as $item) {
 				$ids[] = $item['file_source'];
 			}
 			return $ids;
-		} else if ($format === self::FORMAT_PERMISSIONS) {
-			$filePermissions = array();
+		} elseif ($format === self::FORMAT_PERMISSIONS) {
+			$filePermissions = [];
 			foreach ($items as $item) {
 				$filePermissions[$item['file_source']] = $item['permissions'];
 			}
 			return $filePermissions;
-		} else if ($format === self::FORMAT_TARGET_NAMES) {
-			$targets = array();
+		} elseif ($format === self::FORMAT_TARGET_NAMES) {
+			$targets = [];
 			foreach ($items as $item) {
 				$targets[] = $item['file_target'];
 			}
 			return $targets;
 		}
-		return array();
+		return [];
 	}
 
 	/**
@@ -191,10 +164,14 @@ class File implements \OCP\Share_Backend_File_Dependent {
 	 * @return boolean
 	 */
 	public function isShareTypeAllowed($shareType) {
-		if ($shareType === \OCP\Share::SHARE_TYPE_REMOTE) {
+		if ($shareType === IShare::TYPE_REMOTE) {
 			return $this->federatedShareProvider->isOutgoingServer2serverShareEnabled();
 		}
 
+		if ($shareType === IShare::TYPE_REMOTE_GROUP) {
+			return $this->federatedShareProvider->isOutgoingServer2serverGroupShareEnabled();
+		}
+
 		return true;
 	}
 
@@ -207,8 +184,15 @@ class File implements \OCP\Share_Backend_File_Dependent {
 		if (isset($source['parent'])) {
 			$parent = $source['parent'];
 			while (isset($parent)) {
-				$query = \OCP\DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1);
-				$item = $query->execute(array($parent))->fetchRow();
+				$qb = Server::get(IDBConnection::class)->getQueryBuilder();
+				$qb->select('parent', 'uid_owner')
+					->from('share')
+					->where(
+						$qb->expr()->eq('id', $qb->createNamedParameter($parent))
+					);
+				$result = $qb->executeQuery();
+				$item = $result->fetch();
+				$result->closeCursor();
 				if (isset($item['parent'])) {
 					$parent = $item['parent'];
 				} else {
@@ -222,7 +206,7 @@ class File implements \OCP\Share_Backend_File_Dependent {
 		if (isset($fileOwner)) {
 			$source['fileOwner'] = $fileOwner;
 		} else {
-			\OCP\Util::writeLog('files_sharing', "No owner found for reshare", \OCP\Util::ERROR);
+			Server::get(LoggerInterface::class)->error('No owner found for reshare', ['app' => 'files_sharing']);
 		}
 
 		return $source;
diff --git a/apps/files_sharing/lib/ShareBackend/Folder.php b/apps/files_sharing/lib/ShareBackend/Folder.php
index 80b141326d3..df5529c3c4a 100644
--- a/apps/files_sharing/lib/ShareBackend/Folder.php
+++ b/apps/files_sharing/lib/ShareBackend/Folder.php
@@ -1,108 +1,61 @@
 <?php
+
 /**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Bart Visscher <bartv@thisnet.nl>
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Michael Gapczynski <GapczynskiM@gmail.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 namespace OCA\Files_Sharing\ShareBackend;
 
-class Folder extends File implements \OCP\Share_Backend_Collection {
-
-	/**
-	 * get shared parents
-	 *
-	 * @param int $itemSource item source ID
-	 * @param string $shareWith with whom should the item be shared
-	 * @param string $owner owner of the item
-	 * @return array with shares
-	 */
-	public function getParents($itemSource, $shareWith = null, $owner = null) {
-		$result = array();
-		$parent = $this->getParentId($itemSource);
-		while ($parent) {
-			$shares = \OCP\Share::getItemSharedWithUser('folder', $parent, $shareWith, $owner);
-			if ($shares) {
-				foreach ($shares as $share) {
-					$name = basename($share['path']);
-					$share['collection']['path'] = $name;
-					$share['collection']['item_type'] = 'folder';
-					$share['file_path'] = $name;
-					$displayNameOwner = \OCP\User::getDisplayName($share['uid_owner']);
-					$displayNameShareWith = \OCP\User::getDisplayName($share['share_with']);
-					$share['displayname_owner'] = $displayNameOwner ? $displayNameOwner : $share['uid_owner'];
-					$share['share_with_displayname'] = $displayNameShareWith ? $displayNameShareWith : $share['uid_owner'];
-
-					$result[] = $share;
-				}
-			}
-			$parent = $this->getParentId($parent);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * get file cache ID of parent
-	 *
-	 * @param int $child file cache ID of child
-	 * @return mixed parent ID or null
-	 */
-	private function getParentId($child) {
-		$query = \OCP\DB::prepare('SELECT `parent` FROM `*PREFIX*filecache` WHERE `fileid` = ?');
-		$result = $query->execute(array($child));
-		$row = $result->fetchRow();
-		$parent = $row ? $row['parent'] : null;
-
-		return $parent;
-	}
+use OCP\IDBConnection;
+use OCP\Server;
+use OCP\Share_Backend_Collection;
 
+class Folder extends File implements Share_Backend_Collection {
 	public function getChildren($itemSource) {
-		$children = array();
-		$parents = array($itemSource);
-		$query = \OCP\DB::prepare('SELECT `id` FROM `*PREFIX*mimetypes` WHERE `mimetype` = ?');
-		$result = $query->execute(array('httpd/unix-directory'));
+		$children = [];
+		$parents = [$itemSource];
+
+		$qb = Server::get(IDBConnection::class)->getQueryBuilder();
+		$qb->select('id')
+			->from('mimetypes')
+			->where(
+				$qb->expr()->eq('mimetype', $qb->createNamedParameter('httpd/unix-directory'))
+			);
+		$result = $qb->execute();
+		$row = $result->fetch();
+		$result->closeCursor();
+
 		if ($row = $result->fetchRow()) {
-			$mimetype = (int) $row['id'];
+			$mimetype = (int)$row['id'];
 		} else {
 			$mimetype = -1;
 		}
 		while (!empty($parents)) {
-			$parents = "'".implode("','", $parents)."'";
-			$query = \OCP\DB::prepare('SELECT `fileid`, `name`, `mimetype` FROM `*PREFIX*filecache`'
-				.' WHERE `parent` IN ('.$parents.')');
-			$result = $query->execute();
-			$parents = array();
-			while ($file = $result->fetchRow()) {
-				$children[] = array('source' => $file['fileid'], 'file_path' => $file['name']);
+			$qb = Server::get(IDBConnection::class)->getQueryBuilder();
+
+			$parents = array_map(function ($parent) use ($qb) {
+				return $qb->createNamedParameter($parent);
+			}, $parents);
+
+			$qb->select('`fileid', 'name', '`mimetype')
+				->from('filecache')
+				->where(
+					$qb->expr()->in('parent', $parents)
+				);
+
+			$result = $qb->execute();
+
+			$parents = [];
+			while ($file = $result->fetch()) {
+				$children[] = ['source' => $file['fileid'], 'file_path' => $file['name']];
 				// If a child folder is found look inside it
-				if ((int) $file['mimetype'] === $mimetype) {
+				if ((int)$file['mimetype'] === $mimetype) {
 					$parents[] = $file['fileid'];
 				}
 			}
+			$result->closeCursor();
 		}
 		return $children;
 	}
-
 }