feat: add appconfig value to disable fixed userfolder permissions opt…

…imization

Signed-off-by: Robin Appelman <[email protected]>

lib/private/Files/Node/LazyUserFolder.php

@@ -23,10 +23,20 @@ class LazyUserFolder extends LazyFolder {
 	private string $path;
 	private IMountManager $mountManager;
 
-	public function __construct(IRootFolder $rootFolder, IUser $user, IMountManager $mountManager) {
+	public function __construct(IRootFolder $rootFolder, IUser $user, IMountManager $mountManager, bool $useDefaultPermissions = true) {
 		$this->user = $user;
 		$this->mountManager = $mountManager;
 		$this->path = '/' . $user->getUID() . '/files';
+		$data = [
+			'path' => $this->path,
+			// Sharing user root folder is not allowed
+			'type' => FileInfo::TYPE_FOLDER,
+			'mimetype' => FileInfo::MIMETYPE_FOLDER,
+		];
+		if ($useDefaultPermissions) {
+			$data['permissions'] = Constants::PERMISSION_ALL ^ Constants::PERMISSION_SHARE;
+		}
+
 		parent::__construct($rootFolder, function () use ($user): Folder {
 			try {
 				$node = $this->getRootFolder()->get($this->path);
@@ -44,13 +54,7 @@ public function __construct(IRootFolder $rootFolder, IUser $user, IMountManager
 				}
 				return $this->getRootFolder()->newFolder($this->path);
 			}
-		}, [
-			'path' => $this->path,
-			// Sharing user root folder is not allowed
-			'permissions' => Constants::PERMISSION_ALL ^ Constants::PERMISSION_SHARE,
-			'type' => FileInfo::TYPE_FOLDER,
-			'mimetype' => FileInfo::MIMETYPE_FOLDER,
-		]);
+		}, $data);
 	}
 
 	public function getMountPoint() {

lib/private/Files/Node/Root.php

@@ -24,6 +24,7 @@
 use OCP\Files\Node as INode;
 use OCP\Files\NotFoundException;
 use OCP\Files\NotPermittedException;
+use OCP\IAppConfig;
 use OCP\ICache;
 use OCP\ICacheFactory;
 use OCP\IUser;
@@ -60,6 +61,7 @@ class Root extends Folder implements IRootFolder {
 	private IUserManager $userManager;
 	private IEventDispatcher $eventDispatcher;
 	private ICache $pathByIdCache;
+	private bool $homeFolderOverwritten = false;
 
 	/**
 	 * @param Manager $manager
@@ -75,6 +77,7 @@ public function __construct(
 		IUserManager $userManager,
 		IEventDispatcher $eventDispatcher,
 		ICacheFactory $cacheFactory,
+		IAppConfig $appConfig,
 	) {
 		parent::__construct($this, $view, '');
 		$this->mountManager = $manager;
@@ -88,6 +91,7 @@ public function __construct(
 			$this->userFolderCache = new CappedMemoryCache();
 		});
 		$this->pathByIdCache = $cacheFactory->createLocal('path-by-id');
+		$this->homeFolderOverwritten = $appConfig->getValueBool('files', 'homeFolderOverwritten');
 	}
 
 	/**
@@ -367,7 +371,7 @@ public function getUserFolder($userId) {
 					$folder = $this->newFolder('/' . $userId . '/files');
 				}
 			} else {
-				$folder = new LazyUserFolder($this, $userObject, $this->mountManager);
+				$folder = new LazyUserFolder($this, $userObject, $this->mountManager, !$this->homeFolderOverwritten);
 			}
 
 			$this->userFolderCache->set($userId, $folder);

lib/private/Server.php

@@ -406,6 +406,7 @@ public function __construct($webRoot, \OC\Config $config) {
 				$this->get(IUserManager::class),
 				$this->get(IEventDispatcher::class),
 				$this->get(ICacheFactory::class),
+				$this->get(IAppConfig::class),
 			);
 
 			$previewConnector = new \OC\Preview\WatcherConnector(

tests/lib/Files/Node/FileTest.php

@@ -38,7 +38,7 @@ protected function getViewDeleteMethod() {
 	public function testGetContent(): void {
 		/** @var \OC\Files\Node\Root|\PHPUnit\Framework\MockObject\MockObject $root */
 		$root = $this->getMockBuilder('\OC\Files\Node\Root')
-			->setConstructorArgs([$this->manager, $this->view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
+			->setConstructorArgs([$this->manager, $this->view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory, $this->appConfig])
 			->getMock();
 
 		$hook = function ($file) {
@@ -68,7 +68,7 @@ public function testGetContentNotPermitted(): void {
 
 		/** @var \OC\Files\Node\Root|\PHPUnit\Framework\MockObject\MockObject $root */
 		$root = $this->getMockBuilder('\OC\Files\Node\Root')
-			->setConstructorArgs([$this->manager, $this->view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
+			->setConstructorArgs([$this->manager, $this->view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory, $this->appConfig])
 			->getMock();
 
 		$root->expects($this->any())
@@ -87,7 +87,7 @@ public function testGetContentNotPermitted(): void {
 	public function testPutContent(): void {
 		/** @var \OC\Files\Node\Root|\PHPUnit\Framework\MockObject\MockObject $root */
 		$root = $this->getMockBuilder('\OC\Files\Node\Root')
-			->setConstructorArgs([$this->manager, $this->view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
+			->setConstructorArgs([$this->manager, $this->view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory, $this->appConfig])
 			->getMock();
 
 		$root->expects($this->any())
@@ -114,7 +114,7 @@ public function testPutContentNotPermitted(): void {
 
 		/** @var \OC\Files\Node\Root|\PHPUnit\Framework\MockObject\MockObject $root */
 		$root = $this->getMockBuilder('\OC\Files\Node\Root')
-			->setConstructorArgs([$this->manager, $this->view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
+			->setConstructorArgs([$this->manager, $this->view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory, $this->appConfig])
 			->getMock();
 
 		$this->view->expects($this->once())
@@ -129,7 +129,7 @@ public function testPutContentNotPermitted(): void {
 	public function testGetMimeType(): void {
 		/** @var \OC\Files\Node\Root|\PHPUnit\Framework\MockObject\MockObject $root */
 		$root = $this->getMockBuilder('\OC\Files\Node\Root')
-			->setConstructorArgs([$this->manager, $this->view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory])
+			->setConstructorArgs([$this->manager, $this->view, $this->user, $this->userMountCache, $this->logger, $this->userManager, $this->eventDispatcher, $this->cacheFactory, $this->appConfig])
 			->getMock();
 
 		$this->view->expects($this->once())
@@ -155,6 +155,7 @@ public function testFOpenRead(): void {
 			$this->userManager,
 			$this->eventDispatcher,
 			$this->cacheFactory,
+			$this->appConfig,
 		);
 
 		$hook = function ($file) {
@@ -192,6 +193,7 @@ public function testFOpenWrite(): void {
 			$this->userManager,
 			$this->eventDispatcher,
 			$this->cacheFactory,
+			$this->appConfig,
 		);
 		$hooksCalled = 0;
 		$hook = function ($file) use (&$hooksCalled) {
@@ -233,6 +235,7 @@ public function testFOpenReadNotPermitted(): void {
 			$this->userManager,
 			$this->eventDispatcher,
 			$this->cacheFactory,
+			$this->appConfig,
 		);
 		$hook = function ($file) {
 			throw new \Exception('Hooks are not supposed to be called');
@@ -260,6 +263,7 @@ public function testFOpenReadWriteNoReadPermissions(): void {
 			$this->userManager,
 			$this->eventDispatcher,
 			$this->cacheFactory,
+			$this->appConfig,
 		);
 		$hook = function () {
 			throw new \Exception('Hooks are not supposed to be called');
@@ -287,6 +291,7 @@ public function testFOpenReadWriteNoWritePermissions(): void {
 			$this->userManager,
 			$this->eventDispatcher,
 			$this->cacheFactory,
+			$this->appConfig,
 		);
 		$hook = function () {
 			throw new \Exception('Hooks are not supposed to be called');