archive
/
nextcloud
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #45302 from nextcloud/revert/27613/get-config-owner

Browse Source 
Revert: "Check datadirectory owner, not config owner."
pull/45321/head
Ferdinand Thiessen 2 weeks ago committed by GitHub
parent 2b2a866b05 88648fa493
commit c1e73303db
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File

27
console.php
Unescape Escape View File

@ -41,28 +41,17 @@ try {
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;

8
cron.php
Unescape Escape View File

@ -130,11 +130,11 @@ Options:
}
$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);
}

Write Preview
Loading…
Cancel
Save