Merge pull request #25943 from nextcloud/backport/25659/stable21

[stable21] catch notfound and forbidden exception in smb::getmetadata

Author: MorrisJobke

apps/files_external/lib/Lib/Storage/SMB.php

@@ -556,7 +556,13 @@ public function touch($path, $mtime = null) {
 	}
 
 	public function getMetaData($path) {
-		$fileInfo = $this->getFileInfo($path);
+		try {
+			$fileInfo = $this->getFileInfo($path);
+		} catch (NotFoundException $e) {
+			return null;
+		} catch (ForbiddenException $e) {
+			return null;
+		}
 		if (!$fileInfo) {
 			return null;
 		}

apps/files_sharing/lib/External/Scanner.php

@@ -56,7 +56,7 @@ public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1, $loc
 	 * @param int $parentId
 	 * @param array | null $cacheData existing data in the cache for the file to be scanned
 	 * @param bool $lock set to false to disable getting an additional read lock during scanning
-	 * @return array an array of metadata of the scanned file
+	 * @return array | null an array of metadata of the scanned file
 	 */
 	public function scanFile($file, $reuseExisting = 0, $parentId = -1, $cacheData = null, $lock = true, $data = null) {
 		try {

apps/files_sharing/lib/Scanner.php

@@ -45,7 +45,7 @@ class Scanner extends \OC\Files\Cache\Scanner {
 	 *
 	 * @param string $path path of the file for which to retrieve metadata
 	 *
-	 * @return array an array of metadata of the file
+	 * @return array|null an array of metadata of the file
 	 */
 	public function getData($path) {
 		$data = parent::getData($path);

lib/private/Files/Cache/Scanner.php

@@ -109,7 +109,7 @@ public function setUseTransactions($useTransactions) {
 	 * *
 	 *
 	 * @param string $path
-	 * @return array an array of metadata of the file
+	 * @return array|null an array of metadata of the file
 	 */
 	protected function getData($path) {
 		$data = $this->storage->getMetaData($path);
@@ -128,7 +128,7 @@ protected function getData($path) {
 	 * @param array|null|false $cacheData existing data in the cache for the file to be scanned
 	 * @param bool $lock set to false to disable getting an additional read lock during scanning
 	 * @param null $data the metadata for the file, as returned by the storage
-	 * @return array an array of metadata of the scanned file
+	 * @return array|null an array of metadata of the scanned file
 	 * @throws \OCP\Lock\LockedException
 	 */
 	public function scanFile($file, $reuseExisting = 0, $parentId = -1, $cacheData = null, $lock = true, $data = null) {
@@ -323,7 +323,7 @@ protected function updateCache($path, $data, $fileId = -1) {
 	 * @param bool $recursive
 	 * @param int $reuse
 	 * @param bool $lock set to false to disable getting an additional read lock during scanning
-	 * @return array an array of the meta data of the scanned file or folder
+	 * @return array|null an array of the meta data of the scanned file or folder
 	 */
 	public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1, $lock = true) {
 		if ($reuse === -1) {

lib/private/Files/Storage/Storage.php

@@ -93,7 +93,7 @@ public function getStorageCache();
 
 	/**
 	 * @param string $path
-	 * @return array
+	 * @return array|null
 	 */
 	public function getMetaData($path);
 

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

@@ -531,10 +531,6 @@ public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $t
 		return $result;
 	}
 
-	/**
-	 * @param string $path
-	 * @return array
-	 */
 	public function getMetaData($path) {
 		return $this->storage->getMetaData($this->findPathToUse($path));
 	}

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

@@ -192,10 +192,6 @@ private function modifyMetaData(string $path, array $data): array {
 		return $data;
 	}
 
-	/**
-	 * @param string $path
-	 * @return array
-	 */
 	public function getMetaData($path) {
 		$data = $this->storage->getMetaData($path);
 		if (is_null($data)) {

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

@@ -441,10 +441,6 @@ public function getETag($path) {
 		return $this->getWrapperStorage()->getETag($this->getUnjailedPath($path));
 	}
 
-	/**
-	 * @param string $path
-	 * @return array
-	 */
 	public function getMetaData($path) {
 		return $this->getWrapperStorage()->getMetaData($this->getUnjailedPath($path));
 	}

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

@@ -577,10 +577,6 @@ public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $t
 		return $this->getWrapperStorage()->moveFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
 	}
 
-	/**
-	 * @param string $path
-	 * @return array
-	 */
 	public function getMetaData($path) {
 		return $this->getWrapperStorage()->getMetaData($path);
 	}

lib/public/Files/Cache/IScanner.php

@@ -45,7 +45,7 @@ interface IScanner {
 	 * @param int $parentId
 	 * @param array | null $cacheData existing data in the cache for the file to be scanned
 	 * @param bool $lock set to false to disable getting an additional read lock during scanning
-	 * @return array an array of metadata of the scanned file
+	 * @return array | null an array of metadata of the scanned file
 	 * @throws \OC\ServerNotAvailableException
 	 * @throws \OCP\Lock\LockedException
 	 * @since 9.0.0
@@ -59,7 +59,7 @@ public function scanFile($file, $reuseExisting = 0, $parentId = -1, $cacheData =
 	 * @param bool $recursive
 	 * @param int $reuse
 	 * @param bool $lock set to false to disable getting an additional read lock during scanning
-	 * @return array an array of the meta data of the scanned file or folder
+	 * @return array | null an array of the meta data of the scanned file or folder
 	 * @since 9.0.0
 	 */
 	public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1, $lock = true);