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

[stable16] dont use part files for dav writes when the target… (#16223) 

[stable16] dont use part files for dav writes when the target folder doesn't have create permissions
This commit is contained in:
John Molakvoæ 2019-07-06 08:48:58 +02:00 committed by GitHub
parent 7028cfffe8 edb6df2199
commit 4cebe07bb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 53 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/dav/lib/Connector/Sabre/File.php
View File

@ -147,7 +147,12 @@ class File extends Node implements IFile {
if ($needsPartFile) {
// mark file as partial while uploading (ignored by the scanner)
$partFilePath = $this->getPartFileBasePath($this->path) . '.ocTransferId' . rand() . '.part';
} else {
if (!$view->isCreatable($partFilePath) && $view->isUpdatable($this->path)) {
$needsPartFile = false;
}
}
if (!$needsPartFile) {
// upload file directly as the final path
$partFilePath = $this->path;

52
apps/dav/tests/unit/Connector/Sabre/FileTest.php
View File

@ -28,13 +28,20 @@
namespace OCA\DAV\Tests\unit\Connector\Sabre;
use OC\Files\Storage\Local;
use OC\Files\Storage\Temporary;
use OC\Files\Storage\Wrapper\PermissionsMask;
use OC\Files\View;
use OCA\DAV\Connector\Sabre\File;
use OCP\Constants;
use OCP\Files\ForbiddenException;
use OCP\Files\Storage;
use OCP\IConfig;
use Test\HookHelper;
use OC\Files\Filesystem;
use OCP\Lock\ILockingProvider;
use Test\TestCase;
use Test\Traits\MountProviderTrait;
use Test\Traits\UserTrait;
/**
* Class File
@ -43,7 +50,9 @@ use OCP\Lock\ILockingProvider;
*
* @package OCA\DAV\Tests\unit\Connector\Sabre
*/
class FileTest extends \Test\TestCase {
class FileTest extends TestCase {
use MountProviderTrait;
use UserTrait;
/**
* @var string
@ -61,9 +70,8 @@ class FileTest extends \Test\TestCase {
\OC_Hook::clear();
$this->user = $this->getUniqueID('user_');
$userManager = \OC::$server->getUserManager();
$userManager->createUser($this->user, 'pass');
$this->user = 'test_user';
$this->createUser($this->user, 'pass');
$this->loginAsUser($this->user);
@ -85,9 +93,8 @@ class FileTest extends \Test\TestCase {
$storage = $this->getMockBuilder(Storage::class)
->disableOriginalConstructor()
->getMock();
$storage->expects($this->any())
->method('getId')
->will($this->returnValue('home::someuser'));
$storage->method('getId')
->willReturn('home::someuser');
return $storage;
}
@ -1163,4 +1170,35 @@ class FileTest extends \Test\TestCase {
$file->get();
}
public function testSimplePutNoCreatePermissions() {
$this->logout();
$storage = new Temporary([]);
$storage->file_put_contents('file.txt', 'old content');
$noCreateStorage = new PermissionsMask([
'storage'=> $storage,
'mask' => Constants::PERMISSION_ALL - Constants::PERMISSION_CREATE
]);
$this->registerMount($this->user, $noCreateStorage, '/' . $this->user . '/files/root');
$this->loginAsUser($this->user);
$view = new View('/' . $this->user . '/files');
$info = $view->getFileInfo('root/file.txt');
$file = new File($view, $info);
// beforeMethod locks
$view->lockFile('root/file.txt', ILockingProvider::LOCK_SHARED);
$file->put($this->getStream('new content'));
// afterMethod unlocks
$view->unlockFile('root/file.txt', ILockingProvider::LOCK_SHARED);
$this->assertEquals('new content', $view->file_get_contents('root/file.txt'));
}
}