mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7858 from nextcloud/fix-local-storage 

Use fallback path if data dir is not available for Storage/Local.php
This commit is contained in:
Morris Jobke 2018-01-23 10:52:41 +01:00 committed by GitHub
parent caccf7a2e9 bcba1a97ad
commit 5c360a41e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/Files/Mount/MountPoint.php
View File

@ -152,7 +152,7 @@ class MountPoint implements IMountPoint {
// the root storage could not be initialized, show the user!
throw new \Exception('The root storage could not be initialized. Please contact your local administrator.', $exception->getCode(), $exception);
} else {
\OCP\Util::writeLog('core', $exception->getMessage(), \OCP\Util::ERROR);
\OC::$server->getLogger()->logException($exception, ['level' => \OCP\Util::ERROR]);
}
return;
}

5
lib/private/Files/Storage/Home.php
View File

@ -25,6 +25,7 @@
*/
namespace OC\Files\Storage;
use OC\Files\Cache\HomePropagator;
/**
@ -43,6 +44,7 @@ class Home extends Local implements \OCP\Files\IHomeStorage {
/**
* Construct a Home storage instance
*
* @param array $arguments array with "user" containing the
* storage owner
*/
@ -51,7 +53,7 @@ class Home extends Local implements \OCP\Files\IHomeStorage {
$datadir = $this->user->getHome();
$this->id = 'home::' . $this->user->getUID();
parent::__construct(array('datadir' => $datadir));
parent::__construct(['datadir' => $datadir]);
}
public function getId() {
@ -90,6 +92,7 @@ class Home extends Local implements \OCP\Files\IHomeStorage {
/**
* Returns the owner of this home storage
*
* @return \OC\User\User owner of this home storage
*/
public function getUser() {

15
lib/private/Files/Storage/Local.php
View File

@ -59,12 +59,13 @@ class Local extends \OC\Files\Storage\Common {
if (!isset($arguments['datadir']) || !is_string($arguments['datadir'])) {
throw new \InvalidArgumentException('No data directory set for local storage');
}
$this->datadir = $arguments['datadir'];
$this->datadir = str_replace('//', '/', $arguments['datadir']);
// some crazy code uses a local storage on root...
if ($this->datadir === '/') {
$this->realDataDir = $this->datadir;
} else {
$this->realDataDir = rtrim(realpath($this->datadir), '/') . '/';
$realPath = realpath($this->datadir) ?: $this->datadir;
$this->realDataDir = rtrim($realPath, '/') . '/';
}
if (substr($this->datadir, -1) !== '/') {
$this->datadir .= '/';
@ -361,14 +362,18 @@ class Local extends \OC\Files\Storage\Common {
*/
public function getSourcePath($path) {
$fullPath = $this->datadir . $path;
if ($this->allowSymlinks || $path === '') {
$currentPath = $path;
if ($this->allowSymlinks || $currentPath === '') {
return $fullPath;
}
$pathToResolve = $fullPath;
$realPath = realpath($pathToResolve);
while ($realPath === false) { // for non existing files check the parent directory
$pathToResolve = dirname($pathToResolve);
$realPath = realpath($pathToResolve);
$currentPath = dirname($currentPath);
if ($currentPath === '' || $currentPath === '.') {
return $fullPath;
}
$realPath = realpath($this->datadir . $currentPath);
}
if ($realPath) {
$realPath = $realPath . '/';