upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-23 09:53:17 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Only set copy etag if the destination source can be found

Browse source 
The etag is only set for files, but it's also possible that in edge
cases the copy destination node can't be found. In that case we don't
need to set any etag.

Required for #26083

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
This commit is contained in:
Christoph Wurst 2021-04-23 10:53:24 +02:00
parent 513aba623e
commit 1722044992
No known key found for this signature in database
GPG key ID: CC42AC2A7F0E56D8
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/dav/lib/Connector/Sabre/CopyEtagHeaderPlugin.php
View file

@ -25,6 +25,7 @@
namespace OCA\DAV\Connector\Sabre;
use Sabre\DAV\Exception\NotFound;
use Sabre\HTTP\RequestInterface;
use Sabre\HTTP\ResponseInterface;
@ -74,7 +75,13 @@ class CopyEtagHeaderPlugin extends \Sabre\DAV\ServerPlugin {
* @return void
*/
public function afterMove($source, $destination) {
$node = $this->server->tree->getNodeForPath($destination);
try {
$node = $this->server->tree->getNodeForPath($destination);
} catch (NotFound $e) {
// Don't care
return;
}
if ($node instanceof File) {
$eTag = $node->getETag();
$this->server->httpResponse->setHeader('OC-ETag', $eTag);

14
apps/dav/tests/unit/Connector/Sabre/CopyEtagHeaderPluginTest.php
View file

@ -29,6 +29,7 @@ namespace OCA\DAV\Tests\unit\Connector\Sabre;
use OCA\DAV\Connector\Sabre\CopyEtagHeaderPlugin;
use OCA\DAV\Connector\Sabre\File;
use Sabre\DAV\Exception\NotFound;
use Sabre\DAV\Server;
use Sabre\DAV\Tree;
use Test\TestCase;
@ -73,6 +74,19 @@ class CopyEtagHeaderPluginTest extends TestCase {
$this->assertNull($response->getHeader('OC-Etag'));
}
public function testAfterMoveNodeNotFound(): void {
$tree = $this->createMock(Tree::class);
$tree->expects(self::once())
->method('getNodeForPath')
->with('test.txt')
->willThrowException(new NotFound());
$this->server->tree = $tree;
$this->plugin->afterMove('', 'test.txt');
// Nothing to assert, we are just testing if the exception is handled
}
public function testAfterMove() {
$node = $this->getMockBuilder(File::class)
->disableOriginalConstructor()