Excludes not writable app roots from the directory permission check

Signed-off-by: Michael Weimann <[email protected]>

settings/Controller/CheckSetupController.php

@@ -542,23 +542,43 @@ protected function getAppDirsWithDifferentOwner(): array {
 		$appDirsWithDifferentOwner = [];
 
 		foreach (OC::$APPSROOTS as $appRoot) {
-			$appsPath = $appRoot['path'];
-			$appsDir = new DirectoryIterator($appRoot['path']);
-			foreach ($appsDir as $fileInfo) {
-				if ($fileInfo->isDir() && !$fileInfo->isDot()) {
-					$absAppPath = $appsPath . DIRECTORY_SEPARATOR . $fileInfo->getFilename();
-					$appDirUser = posix_getpwuid(fileowner($absAppPath));
-					if ($appDirUser !== $currentUser) {
-						$appDirsWithDifferentOwner[] = $absAppPath . DIRECTORY_SEPARATOR . $fileInfo->getFilename();
-					}
-				}
+			if ($appRoot['writable'] === true) {
+				$appDirsWithDifferentOwner = array_merge(
+					$appDirsWithDifferentOwner,
+					$this->getAppDirsWithDifferentOwnerForAppRoot($currentUser, $appRoot)
+				);
 			}
 		}
 
 		sort($appDirsWithDifferentOwner);
 		return $appDirsWithDifferentOwner;
 	}
 
+	/**
+	 * Tests if the directories for one apps directory are writable by the current user.
+	 *
+	 * @param array $currentUser The current user
+	 * @param array $appRoot The app root config
+	 * @return string[] The none writable directory paths inside the app root
+	 */
+	private function getAppDirsWithDifferentOwnerForAppRoot(array $currentUser, array $appRoot): array {
+		$appDirsWithDifferentOwner = [];
+		$appsPath = $appRoot['path'];
+		$appsDir = new DirectoryIterator($appRoot['path']);
+
+		foreach ($appsDir as $fileInfo) {
+			if ($fileInfo->isDir() && !$fileInfo->isDot()) {
+				$absAppPath = $appsPath . DIRECTORY_SEPARATOR . $fileInfo->getFilename();
+				$appDirUser = posix_getpwuid(fileowner($absAppPath));
+				if ($appDirUser !== $currentUser) {
+					$appDirsWithDifferentOwner[] = $absAppPath . DIRECTORY_SEPARATOR . $fileInfo->getFilename();
+				}
+			}
+		}
+
+		return $appDirsWithDifferentOwner;
+	}
+
 	/**
 	 * @return DataResponse
 	 */

tests/Settings/Controller/CheckSetupControllerTest.php

@@ -629,6 +629,27 @@ public function testAppDirectoryOwnersOk() {
 		);
 	}
 
+	/**
+	 * Calls the check for a none existing app root that is marked as not writable.
+	 * It's expected that no error happens since the check shouldn't apply.
+	 *
+	 * @return void
+	 */
+	public function testAppDirectoryOwnersNotWritable() {
+		$tempDir = tempnam(sys_get_temp_dir(), 'apps') . 'dir';
+		OC::$APPSROOTS = [
+			[
+				'path' => $tempDir,
+				'url' => '/apps',
+				'writable' => false,
+			],
+		];
+		$this->assertSame(
+			[],
+			$this->invokePrivate($this->checkSetupController, 'getAppDirsWithDifferentOwner')
+		);
+	}
+
 	public function testIsBuggyNss400() {
 		$this->config->expects($this->any())
 			->method('getSystemValue')