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

Merge pull request #8877 from owncloud/getpath-storage-check 

Verify that we have a valid storage in View->getPath
This commit is contained in:
Thomas Müller 2014-06-06 09:44:57 +02:00
parent 1745fe1664 d359765bdc
commit 79b65269c9
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/private/files/view.php
View File

@ -359,7 +359,8 @@ class View {
$absolutePath = Filesystem::normalizePath($this->getAbsolutePath($path));
list($storage, $internalPath) = Filesystem::resolvePath($absolutePath . $postFix);
if (!($storage instanceof \OC\Files\Storage\Shared) &&
(!$internalPath || $internalPath === '' || $internalPath === '/')) {
(!$internalPath || $internalPath === '' || $internalPath === '/')
) {
// do not allow deleting the storage's root / the mount point
// because for some storages it might delete the whole contents
// but isn't supposed to work that way
@ -678,6 +679,7 @@ class View {
/**
* abstraction layer for basic filesystem functions: wrapper for \OC\Files\Storage\Storage
*
* @param string $operation
* @param string $path
* @param array $hooks (optional)
@ -1125,7 +1127,7 @@ class View {
* Note that the resulting path is not guarantied to be unique for the id, multiple paths can point to the same file
*
* @param int $id
* @return string
* @return string|null
*/
public function getPath($id) {
$manager = Filesystem::getMountManager();
@ -1138,12 +1140,14 @@ class View {
/**
* @var \OC\Files\Mount\Mount $mount
*/
$cache = $mount->getStorage()->getCache();
$internalPath = $cache->getPathById($id);
if (is_string($internalPath)) {
$fullPath = $mount->getMountPoint() . $internalPath;
if (!is_null($path = $this->getRelativePath($fullPath))) {
return $path;
if ($mount->getStorage()) {
$cache = $mount->getStorage()->getCache();
$internalPath = $cache->getPathById($id);
if (is_string($internalPath)) {
$fullPath = $mount->getMountPoint() . $internalPath;
if (!is_null($path = $this->getRelativePath($fullPath))) {
return $path;
}
}
}
}