Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
May 15, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 8 additions & 19 deletions console.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions cron.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
Loading