Mirrors/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2024-08-14 02:11:49 +02:00
Code Issues Actions 34 Packages Projects Releases Wiki Activity

Merge pull request #7732 from owncloud/datafolderexistence

Browse Source 
Added .ocdata file to check for data folder validity
This commit is contained in:
Vincent Petry 2014-03-20 11:31:28 +01:00
commit 36c0f08ec0
8 changed files with 153 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/base.php
View File

@ -518,6 +518,7 @@ class OC {
echo $error['hint'] . "\n\n";
}
} else {
OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
OC_Template::printGuestPage('', 'error', array('errors' => $errors));
}
exit;

4
lib/private/response.php
View File

@ -12,6 +12,7 @@ class OC_Response {
const STATUS_TEMPORARY_REDIRECT = 307;
const STATUS_NOT_FOUND = 404;
const STATUS_INTERNAL_SERVER_ERROR = 500;
const STATUS_SERVICE_UNAVAILABLE = 503;
/**
* @brief Enable response caching by sending correct HTTP headers
@ -74,6 +75,9 @@ class OC_Response {
case self::STATUS_INTERNAL_SERVER_ERROR;
$status = $status . ' Internal Server Error';
break;
case self::STATUS_SERVICE_UNAVAILABLE;
$status = $status . ' Service Unavailable';
break;
}
header($protocol.' '.$status);
}

4
lib/private/setup.php
View File

@ -106,6 +106,10 @@ class OC_Setup {
//guess what this does
OC_Installer::installShippedApps();
// create empty file in data dir, so we can later find
// out that this is indeed an ownCloud data directory
file_put_contents(OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data').'/.ocdata', '');
//create htaccess files for apache hosts
if (isset($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) {
self::createHtaccess();

5
lib/private/updater.php
View File

@ -102,6 +102,11 @@ class Updater extends BasicEmitter {
}
$this->emit('\OC\Updater', 'maintenanceStart');
// create empty file in data dir, so we can later find
// out that this is indeed an ownCloud data directory
// (in case it didn't exist before)
file_put_contents(\OC_Config::getValue('datadirectory', \OC::$SERVERROOT.'/data').'/.ocdata', '');
/*
* START CONFIG CHANGES FOR OLDER VERSIONS
*/

34
lib/private/util.php
View File

@ -290,12 +290,18 @@ class OC_Util {
* @return array arrays with error messages and hints
*/
public static function checkServer() {
// Assume that if checkServer() succeeded before in this session, then all is fine.
if(\OC::$session->exists('checkServer_suceeded') && \OC::$session->get('checkServer_suceeded')) {
return array();
$errors = array();
$CONFIG_DATADIRECTORY = OC_Config::getValue('datadirectory', OC::$SERVERROOT . '/data');
if (!\OC::needUpgrade() && OC_Config::getValue('installed', false)) {
// this check needs to be done every time
$errors = self::checkDataDirectoryValidity($CONFIG_DATADIRECTORY);
}
$errors = array();
// Assume that if checkServer() succeeded before in this session, then all is fine.
if(\OC::$session->exists('checkServer_suceeded') && \OC::$session->get('checkServer_suceeded')) {
return $errors;
}
$defaults = new \OC_Defaults();
@ -341,7 +347,6 @@ class OC_Util {
);
}
}
$CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
// Create root dir.
if(!is_dir($CONFIG_DATADIRECTORY)) {
$success=@mkdir($CONFIG_DATADIRECTORY);
@ -540,6 +545,25 @@ class OC_Util {
return $errors;
}
/**
* Check that the data directory exists and is valid by
* checking the existence of the ".ocdata" file.
*
* @param string $dataDirectory data directory path
* @return bool true if the data directory is valid, false otherwise
*/
public static function checkDataDirectoryValidity($dataDirectory) {
$errors = array();
if (!file_exists($dataDirectory.'/.ocdata')) {
$errors[] = array(
'error' => 'Data directory (' . $dataDirectory . ') is invalid',
'hint' => 'Please check that the data directory contains a file' .
' ".ocdata" in its root.'
);
}
return $errors;
}
/**
* @return void
*/

108
tests/lib/utilcheckserver.php Normal file
View File

@ -0,0 +1,108 @@
<?php
/**
* Copyright (c) 2014 Vincent Petry <pvince81@owncloud.com>
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
*/
/**
* Tests for server check functions
*/
class Test_Util_CheckServer extends PHPUnit_Framework_TestCase {
private $datadir;
public function setUp() {
$this->datadir = \OC_Config::getValue('datadirectory', \OC::$SERVERROOT . '/data');
file_put_contents($this->datadir . '/.ocdata', '');
}
public function tearDown() {
// clean up
@unlink($this->datadir . '/.ocdata');
}
/**
* Test that checkServer() returns no errors in the regular case.
*/
public function testCheckServer() {
$result = \OC_Util::checkServer();
$this->assertEmpty($result);
}
/**
* Test that checkServer() does not check the data dir validity
* when the server is not installed yet (else the setup cannot
* be run...)
*/
public function testCheckServerSkipDataDirValidityOnSetup() {
// simulate old version that didn't have it
unlink($this->datadir . '/.ocdata');
$session = \OC::$server->getSession();
$oldInstalled = \OC_Config::getValue('installed', false);
// simulate that the server isn't setup yet
\OC_Config::setValue('installed', false);
// even though ".ocdata" is missing, the error isn't
// triggered to allow setup to run
$result = \OC_Util::checkServer();
$this->assertEmpty($result);
// restore config
\OC_Config::setValue('installed', $oldInstalled);
}
/**
* Test that checkServer() does not check the data dir validity
* when an upgrade is required (else the upgrade cannot be
* performed...)
*/
public function testCheckServerSkipDataDirValidityOnUpgrade() {
// simulate old version that didn't have it
unlink($this->datadir . '/.ocdata');
$session = \OC::$server->getSession();
$oldCurrentVersion = $session->get('OC_Version');
$oldInstallVersion = \OC_Config::getValue('version', '0.0.0');
// upgrade condition to simulate needUpgrade() === true
$session->set('OC_Version', array(6, 0, 0, 2));
\OC_Config::setValue('version', '6.0.0.1');
// even though ".ocdata" is missing, the error isn't
// triggered to allow for upgrade
$result = \OC_Util::checkServer();
$this->assertEmpty($result);
// restore versions
$session->set('OC_Version', $oldCurrentVersion);
\OC_Config::setValue('version', $oldInstallVersion);
}
/**
* Test that checkDataDirectoryValidity returns no error
* when ".ocdata" is present.
*/
public function testCheckDataDirValidity() {
$result = \OC_Util::checkDataDirectoryValidity($this->datadir);
$this->assertEmpty($result);
}
/**
* Test that checkDataDirectoryValidity and checkServer
* both return an error when ".ocdata" is missing.
*/
public function testCheckDataDirValidityWhenFileMissing() {
unlink($this->datadir . '/.ocdata');
$result = \OC_Util::checkDataDirectoryValidity($this->datadir);
$this->assertEquals(1, count($result));
$result = \OC_Util::checkServer();
$this->assertEquals(1, count($result));
}
}

1
tests/testcleanuplistener.php
View File

@ -83,6 +83,7 @@ class TestCleanupListener implements PHPUnit_Framework_TestListener {
$knownEntries = array(
'owncloud.log' => true,
'owncloud.db' => true,
'.ocdata' => true,
'..' => true,
'.' => true
);

2
version.php
View File

@ -1,7 +1,7 @@
<?php
// We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel when updating major/minor version number.
$OC_Version=array(6, 90, 0, 1);
$OC_Version=array(6, 90, 0, 2);
// The human readable string
$OC_VersionString='7.0 pre alpha';