From 54f61352f074f9c4698eb2b94e019ab101518b4c Mon Sep 17 00:00:00 2001
From: Robin Appelman <robin@icewind.nl>
Date: Thu, 17 Jun 2021 13:53:11 +0200
Subject: better error messages if the users home is not writable during
 scanning

Signed-off-by: Robin Appelman <robin@icewind.nl>
---
 apps/files/lib/Command/Scan.php     |  1 +
 lib/private/Files/Utils/Scanner.php | 27 ++++++++++++++++++++-------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/apps/files/lib/Command/Scan.php b/apps/files/lib/Command/Scan.php
index 710c76de493..a59665c56e9 100644
--- a/apps/files/lib/Command/Scan.php
+++ b/apps/files/lib/Command/Scan.php
@@ -162,6 +162,7 @@ class Scan extends Base {
 			}
 		} catch (ForbiddenException $e) {
 			$output->writeln("<error>Home storage for user $user not writable or 'files' subdirectory missing</error>");
+			$output->writeln('  ' . $e->getMessage());
 			$output->writeln('Make sure you\'re running the scan command only as the user the web server runs as');
 		} catch (InterruptedException $e) {
 			# exit the function if ctrl-c has been pressed
diff --git a/lib/private/Files/Utils/Scanner.php b/lib/private/Files/Utils/Scanner.php
index dc220bc710d..277ce38175f 100644
--- a/lib/private/Files/Utils/Scanner.php
+++ b/lib/private/Files/Utils/Scanner.php
@@ -27,11 +27,13 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
+
 namespace OC\Files\Utils;
 
 use OC\Files\Cache\Cache;
 use OC\Files\Filesystem;
 use OC\Files\Storage\FailedStorage;
+use OC\Files\Storage\Home;
 use OC\ForbiddenException;
 use OC\Hooks\PublicEmitter;
 use OC\Lock\DBLockingProvider;
@@ -211,13 +213,24 @@ class Scanner extends PublicEmitter {
 			}
 
 			// if the home storage isn't writable then the scanner is run as the wrong user
-			if ($storage->instanceOfStorage('\OC\Files\Storage\Home') and
-				(!$storage->isCreatable('') or !$storage->isCreatable('files'))
-			) {
-				if ($storage->is_dir('files')) {
-					throw new ForbiddenException();
-				} else {// if the root exists in neither the cache nor the storage the user isn't setup yet
-					break;
+			if ($storage->instanceOfStorage(Home::class)) {
+				/** @var Home $storage */
+				foreach (['', 'files'] as $path) {
+					if (!$storage->isCreatable($path)) {
+						$fullPath = $storage->getSourcePath($path);
+						if (!$storage->is_dir($path) && $storage->getCache()->inCache($path)) {
+							throw new NotFoundException("User folder $fullPath exists in cache but not on disk");
+						} elseif ($storage->is_dir($path)) {
+							$ownerUid = fileowner($fullPath);
+							$owner = posix_getpwuid($ownerUid);
+							$owner = $owner['name'] ?? $ownerUid;
+							$permissions = decoct(fileperms($fullPath));
+							throw new ForbiddenException("User folder $fullPath is not writable, folders is owned by $owner and has mode $permissions");
+						} else {
+							// if the root exists in neither the cache nor the storage the user isn't setup yet
+							break 2;
+						}
+					}
 				}
 			}
 
-- 
cgit v1.2.3