Revert: "Check datadirectory owner, not config owner."

Signed-off-by: Simon L <szaimen@e.mail.de>
nextcloud · May 14, 2024 · 88648fa · 88648fa
1 parent e3f341f
commit 88648fa
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 23 deletions.
diff --git a/console.php b/console.php
@@ -41,28 +41,17 @@ function exceptionHandler($exception) {
 		exit(1);
 	}
 
-	// Check if the data directory is available and the server is installed
-	$dataDirectory = $config->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data');
-	if ($config->getSystemValueBool('installed', false) && !is_dir($dataDirectory)) {
-		echo "Data directory (" . $dataDirectory . ") not found" . PHP_EOL;
+	$user = posix_getuid();
+	$configUser = fileowner(OC::$configDir . 'config.php');
+	if ($user !== $configUser) {
+		echo "Console has to be executed with the user that owns the file config/config.php" . PHP_EOL;
+		echo "Current user id: " . $user . PHP_EOL;
+		echo "Owner id of config.php: " . $configUser . PHP_EOL;
+		echo "Try adding 'sudo -u #" . $configUser . "' to the beginning of the command (without the single quotes)" . PHP_EOL;
+		echo "If running with 'docker exec' try adding the option '-u " . $configUser . "' to the docker command (without the single quotes)" . PHP_EOL;
 		exit(1);
 	}
 
-	// Check if the user running the console is the same as the user that owns the data directory
-	// If the data directory does not exist, the server is not setup yet and we can skip.
-	if (is_dir($dataDirectory)) {
-		$user = posix_getuid();
-		$dataDirectoryUser = fileowner($dataDirectory);
-		if ($user !== $dataDirectoryUser) {
-			echo "Console has to be executed with the user that owns the data directory" . PHP_EOL;
-			echo "Current user id: " . $user . PHP_EOL;
-			echo "Owner id of the data directory: " . $dataDirectoryUser . PHP_EOL;
-			echo "Try adding 'sudo -u #" . $dataDirectoryUser . "' to the beginning of the command (without the single quotes)" . PHP_EOL;
-			echo "If running with 'docker exec' try adding the option '-u " . $dataDirectoryUser . "' to the docker command (without the single quotes)" . PHP_EOL;
-			exit(1);
-		}
-	}
-
 	$oldWorkingDir = getcwd();
 	if ($oldWorkingDir === false) {
 		echo "This script can be run from the Nextcloud root directory only." . PHP_EOL;

diff --git a/cron.php b/cron.php
@@ -130,11 +130,11 @@
 		}
 
 		$user = posix_getuid();
-		$dataDirectoryUser = fileowner($config->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data'));
-		if ($user !== $dataDirectoryUser) {
-			echo "Cron has to be executed with the user that owns the data directory" . PHP_EOL;
+		$configUser = fileowner(OC::$configDir . 'config.php');
+		if ($user !== $configUser) {
+			echo "Console has to be executed with the user that owns the file config/config.php" . PHP_EOL;
 			echo "Current user id: " . $user . PHP_EOL;
-			echo "Owner id of the data directory: " . $dataDirectoryUser . PHP_EOL;
+			echo "Owner id of config.php: " . $configUser . PHP_EOL;
 			exit(1);
 		}