Skip to content

Verify that destination is not a directory. #20472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 14, 2020
Merged

Verify that destination is not a directory. #20472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions apps/dav/lib/Upload/ChunkingPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@

namespace OCA\DAV\Upload;

use OCA\DAV\Connector\Sabre\Directory;
use Sabre\DAV\Exception\BadRequest;
use Sabre\DAV\Exception\NotFound;
use Sabre\DAV\INode;
use Sabre\DAV\Server;
use Sabre\DAV\ServerPlugin;

Expand All @@ -45,6 +48,9 @@ public function initialize(Server $server) {
/**
* @param string $sourcePath source path
* @param string $destination destination path
* @return bool|void
* @throws BadRequest
* @throws NotFound
*/
public function beforeMove($sourcePath, $destination) {
$this->sourceNode = $this->server->tree->getNodeForPath($sourcePath);
Expand All @@ -53,6 +59,16 @@ public function beforeMove($sourcePath, $destination) {
return;
}

try {
/** @var INode $destinationNode */
$destinationNode = $this->server->tree->getNodeForPath($destination);
if ($destinationNode instanceof Directory) {
throw new BadRequest("The given destination $destination is a directory.");
}
} catch (NotFound $e) {
// If the destination does not exist yet it's not a directory either ;)
}

$this->verifySize();
return $this->performMove($sourcePath, $destination);
}
Expand Down
42 changes: 38 additions & 4 deletions apps/dav/tests/unit/Upload/ChunkingPluginTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
use OCA\DAV\Connector\Sabre\Directory;
use OCA\DAV\Upload\ChunkingPlugin;
use OCA\DAV\Upload\FutureFile;
use Sabre\DAV\Exception\NotFound;
use Sabre\HTTP\RequestInterface;
use Sabre\HTTP\ResponseInterface;
use Test\TestCase;
Expand Down Expand Up @@ -87,16 +88,41 @@ public function testBeforeMoveFutureFileSkip() {
$this->assertNull($this->plugin->beforeMove('source', 'target'));
}

public function testBeforeMoveDestinationIsDirectory() {
$this->expectException(\Sabre\DAV\Exception\BadRequest::class);
$this->expectExceptionMessage('The given destination target is a directory.');

$sourceNode = $this->createMock(FutureFile::class);
$targetNode = $this->createMock(Directory::class);

$this->tree->expects($this->at(0))
->method('getNodeForPath')
->with('source')
->willReturn($sourceNode);
$this->tree->expects($this->at(1))
->method('getNodeForPath')
->with('target')
->willReturn($targetNode);
$this->response->expects($this->never())
->method('setStatus');

$this->assertNull($this->plugin->beforeMove('source', 'target'));
}

public function testBeforeMoveFutureFileSkipNonExisting() {
$sourceNode = $this->createMock(FutureFile::class);
$sourceNode->expects($this->once())
->method('getSize')
->willReturn(4);

$this->tree->expects($this->any())
$this->tree->expects($this->at(0))
->method('getNodeForPath')
->with('source')
->willReturn($sourceNode);
$this->tree->expects($this->at(1))
->method('getNodeForPath')
->with('target')
->willThrowException(new NotFound());
$this->tree->expects($this->any())
->method('nodeExists')
->with('target')
Expand All @@ -117,10 +143,14 @@ public function testBeforeMoveFutureFileMoveIt() {
->method('getSize')
->willReturn(4);

$this->tree->expects($this->any())
$this->tree->expects($this->at(0))
->method('getNodeForPath')
->with('source')
->willReturn($sourceNode);
$this->tree->expects($this->at(1))
->method('getNodeForPath')
->with('target')
->willThrowException(new NotFound());
$this->tree->expects($this->any())
->method('nodeExists')
->with('target')
Expand All @@ -143,7 +173,7 @@ public function testBeforeMoveFutureFileMoveIt() {
$this->assertFalse($this->plugin->beforeMove('source', 'target'));
}


public function testBeforeMoveSizeIsWrong() {
$this->expectException(\Sabre\DAV\Exception\BadRequest::class);
$this->expectExceptionMessage('Chunks on server do not sum up to 4 but to 3 bytes');
Expand All @@ -153,10 +183,14 @@ public function testBeforeMoveSizeIsWrong() {
->method('getSize')
->willReturn(3);

$this->tree->expects($this->any())
$this->tree->expects($this->at(0))
->method('getNodeForPath')
->with('source')
->willReturn($sourceNode);
$this->tree->expects($this->at(1))
->method('getNodeForPath')
->with('target')
->willThrowException(new NotFound());
$this->request->expects($this->once())
->method('getHeader')
->with('OC-Total-Length')
Expand Down