Merge pull request #32961 from nextcloud/more-debug-lazyuserfolder

Make it easier to debug issue #32304
nextcloud · May 15, 2023 · 3bf19f7 · 3bf19f7
2 parents 2f467d9 + 1cc1866
commit 3bf19f7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/lib/private/Files/Node/LazyFolder.php b/lib/private/Files/Node/LazyFolder.php
@@ -27,6 +27,7 @@
 namespace OC\Files\Node;
 
 use OC\Files\Utils\PathHelper;
+use OCP\Files\Folder;
 use OCP\Constants;
 
 /**
@@ -37,8 +38,8 @@
  *
  * @package OC\Files\Node
  */
-class LazyFolder implements \OCP\Files\Folder {
-	/** @var \Closure */
+class LazyFolder implements Folder {
+	/** @var \Closure(): Folder */
 	private $folderClosure;
 
 	/** @var LazyFolder | null */
@@ -49,7 +50,7 @@ class LazyFolder implements \OCP\Files\Folder {
 	/**
 	 * LazyFolder constructor.
 	 *
-	 * @param \Closure $folderClosure
+	 * @param \Closure(): Folder $folderClosure
 	 */
 	public function __construct(\Closure $folderClosure, array $data = []) {
 		$this->folderClosure = $folderClosure;

diff --git a/lib/private/Files/Node/LazyUserFolder.php b/lib/private/Files/Node/LazyUserFolder.php
@@ -28,7 +28,10 @@
 use OCP\Files\IRootFolder;
 use OCP\Files\Mount\IMountManager;
 use OCP\Files\NotFoundException;
+use OCP\Files\Folder;
+use OCP\Files\File;
 use OCP\IUser;
+use Psr\Log\LoggerInterface;
 
 class LazyUserFolder extends LazyFolder {
 	private IRootFolder $root;
@@ -41,14 +44,22 @@ public function __construct(IRootFolder $rootFolder, IUser $user, IMountManager
 		$this->user = $user;
 		$this->mountManager = $mountManager;
 		$this->path = '/' . $user->getUID() . '/files';
-		parent::__construct(function () use ($user) {
+		parent::__construct(function () use ($user): Folder {
 			try {
-				return $this->root->get('/' . $user->getUID() . '/files');
+				$node = $this->root->get($this->path);
+				if ($node instanceof File) {
+					$e = new \RuntimeException();
+					\OCP\Server::get(LoggerInterface::class)->error('User root storage is not a folder: ' . $this->path, [
+						'exception' => $e,
+					]);
+					throw $e;
+				}
+				return $node;
 			} catch (NotFoundException $e) {
 				if (!$this->root->nodeExists('/' . $user->getUID())) {
 					$this->root->newFolder('/' . $user->getUID());
 				}
-				return $this->root->newFolder('/' . $user->getUID() . '/files');
+				return $this->root->newFolder($this->path);
 			}
 		}, [
 			'path' => $this->path,