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

Merge pull request #16632 from nextcloud/bugfix/external-reshare 

Set proper root path for single file shares originating from other storages
This commit is contained in:
Roeland Jago Douma 2020-09-01 08:48:31 +02:00 committed by GitHub
parent 023d18bc40 af381a9a93
commit e0d767d3e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files_sharing/lib/SharedStorage.php
View File

@ -244,7 +244,7 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto
}
public function fopen($path, $mode) {
if ($source = $this->getUnjailedPath($path)) {
$source = $this->getUnjailedPath($path);
switch ($mode) {
case 'r+':
case 'rb+':
@ -294,8 +294,6 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto
\OCP\Util::emitHook('\OC\Files\Storage\Shared', 'fopen', $info);
return $this->nonMaskedStorage->fopen($this->getUnjailedPath($path), $mode);
}
return false;
}
/**
* see http://php.net/manual/en/function.rename.php

6
lib/private/Files/Storage/Wrapper/Jail.php
View File

@ -56,11 +56,7 @@ class Jail extends Wrapper {
}
public function getUnjailedPath($path) {
if ($path === '') {
return $this->rootPath;
} else {
return Filesystem::normalizePath($this->rootPath . '/' . $path);
}
return trim(Filesystem::normalizePath($this->rootPath . '/' . $path), '/');
}
/**