From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Tue, 16 Mar 2021 16:35:17 +0000 (+0100)
Subject: Only perform login check during ownership transfer for encryption
X-Git-Tag: v22.0.0beta1~270^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e68c4a4ed377822d700b9a146704e8434c1b9516;p=nextcloud-server.git

Only perform login check during ownership transfer for encryption

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
---

diff --git a/apps/files/lib/Service/OwnershipTransferService.php b/apps/files/lib/Service/OwnershipTransferService.php
index 870aa9f9d77..3ab1a0c29d5 100644
--- a/apps/files/lib/Service/OwnershipTransferService.php
+++ b/apps/files/lib/Service/OwnershipTransferService.php
@@ -100,12 +100,15 @@ class OwnershipTransferService {
 		$destinationUid = $destinationUser->getUID();
 		$sourcePath = rtrim($sourceUid . '/files/' . $path, '/');
 
-		// target user has to be ready
-		if ($destinationUser->getLastLogin() === 0 || !$this->encryptionManager->isReadyForUser($destinationUid)) {
+		// If encryption is on we have to ensure the user has logged in before and that all encryption modules are ready
+		if (($this->encryptionManager->isEnabled() && $destinationUser->getLastLogin() === 0)
+			|| !$this->encryptionManager->isReadyForUser($destinationUid)) {
 			throw new TransferOwnershipException("The target user is not ready to accept files. The user has at least to have logged in once.", 2);
 		}
 
 		// setup filesystem
+		// Requesting the user folder will set it up if the user hasn't logged in before
+		\OC::$server->getUserFolder($destinationUser->getUID());
 		Filesystem::initMountPoints($sourceUid);
 		Filesystem::initMountPoints($destinationUid);