fix: Fix data directory permission check and its test

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

Author: come-nc

lib/private/legacy/OC_Util.php

@@ -314,7 +314,14 @@ public static function checkServer(SystemConfig $config) {
 							[$urlGenerator->linkToDocs('admin-dir_permissions')])
 					];
 				}
-			} elseif (!is_writable($CONFIG_DATADIRECTORY) || !is_readable($CONFIG_DATADIRECTORY)) {
+			} elseif (!is_readable($CONFIG_DATADIRECTORY)) {
+				$permissionsHint = $l->t('Permissions can usually be fixed by giving the web server write access to the root directory. See %s.',
+					[$urlGenerator->linkToDocs('admin-dir_permissions')]);
+				$errors[] = [
+					'error' => $l->t('Your data directory is not readable.'),
+					'hint' => $permissionsHint
+				];
+			} elseif (!is_writable($CONFIG_DATADIRECTORY)) {
 				// is_writable doesn't work for NFS mounts, so try to write a file and check if it exists.
 				$testFile = sprintf('%s/%s.tmp', $CONFIG_DATADIRECTORY, uniqid('data_dir_writability_test_'));
 				$handle = fopen($testFile, 'w');

tests/lib/UtilCheckServerTest.php

@@ -148,9 +148,9 @@ public function testDataDirWritable(): void {
 	}
 
 	/**
-	 * Tests an error is given when the datadir is not writable
+	 * Tests an error is given when the datadir is not readable
 	 */
-	public function testDataDirNotWritable(): void {
+	public function testDataDirNotReadable(): void {
 		chmod($this->datadir, 0300);
 		$result = \OC_Util::checkServer($this->getConfig([
 			'installed' => true,
@@ -163,7 +163,7 @@ public function testDataDirNotWritable(): void {
 	 * Tests no error is given when the datadir is not writable during setup
 	 */
 	public function testDataDirNotWritableSetup(): void {
-		chmod($this->datadir, 0300);
+		chmod($this->datadir, 0500);
 		$result = \OC_Util::checkServer($this->getConfig([
 			'installed' => false,
 			'version' => implode('.', Util::getVersion())