Improve the directContoller

* Tests
* No directdownload from storage yet (as it is not tested at all)
* No direct links for folders

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2018-04-26 10:34:57 +02:00
parent d5222d68f0
commit 1c75ddac45
No known key found for this signature in database
GPG Key ID: F941078878347C0C
2 changed files with 172 additions and 18 deletions

View File

@ -27,9 +27,11 @@ namespace OCA\DAV\Controller;
use OCA\DAV\Db\Direct;
use OCA\DAV\Db\DirectMapper;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\OCS\OCSBadRequestException;
use OCP\AppFramework\OCS\OCSNotFoundException;
use OCP\AppFramework\OCSController;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\Files\File;
use OCP\Files\IRootFolder;
use OCP\IRequest;
use OCP\IURLGenerator;
@ -87,13 +89,11 @@ class DirectController extends OCSController {
}
$file = array_shift($files);
$storage = $file->getStorage();
$directDownload = $storage->getDirectDownload($file->getInternalPath());
if (!($file instanceof File)) {
throw new OCSBadRequestException('Direct download only works for files');
}
if (isset($directDownload['url'])) {
$url = $directDownload['url'];
} else {
// Fallback to our default implemenation
//TODO: at some point we should use the directdownlaod function of storages
$direct = new Direct();
$direct->setUserId($this->userId);
$direct->setFileId($fileId);
@ -105,7 +105,6 @@ class DirectController extends OCSController {
$this->mapper->insert($direct);
$url = $this->urlGenerator->getAbsoluteURL('remote.php/direct/'.$token);
}
return new DataResponse([
'url' => $url,

View File

@ -0,0 +1,155 @@
<?php
declare(strict_types=1);
/**
* @copyright 2018, Roeland Jago Douma <roeland@famdouma.nl>
*
* @author Roeland Jago Douma <roeland@famdouma.nl>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\DAV\Tests\Unit\DAV\Controller;
use OCA\DAV\Controller\DirectController;
use OCA\DAV\Db\Direct;
use OCA\DAV\Db\DirectMapper;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\OCS\OCSBadRequestException;
use OCP\AppFramework\OCS\OCSNotFoundException;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\Files\File;
use OCP\Files\Folder;
use OCP\Files\IRootFolder;
use OCP\IRequest;
use OCP\IURLGenerator;
use OCP\Security\ISecureRandom;
use Test\TestCase;
class DirectControllerTest extends TestCase {
/** @var IRootFolder|\PHPUnit_Framework_MockObject_MockObject */
private $rootFolder;
/** @var DirectMapper|\PHPUnit_Framework_MockObject_MockObject */
private $directMapper;
/** @var ISecureRandom|\PHPUnit_Framework_MockObject_MockObject */
private $random;
/** @var ITimeFactory|\PHPUnit_Framework_MockObject_MockObject */
private $timeFactory;
/** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */
private $urlGenerator;
/** @var DirectController */
private $controller;
public function setUp() {
parent::setUp();
$this->rootFolder = $this->createMock(IRootFolder::class);
$this->directMapper = $this->createMock(DirectMapper::class);
$this->random = $this->createMock(ISecureRandom::class);
$this->timeFactory = $this->createMock(ITimeFactory::class);
$this->urlGenerator = $this->createMock(IURLGenerator::class);
$this->controller = new DirectController(
'dav',
$this->createMock(IRequest::class),
$this->rootFolder,
'awesomeUser',
$this->directMapper,
$this->random,
$this->timeFactory,
$this->urlGenerator
);
}
public function testGetUrlNonExistingFileId() {
$userFolder = $this->createMock(Folder::class);
$this->rootFolder->method('getUserFolder')
->with('awesomeUser')
->willReturn($userFolder);
$userFolder->method('getById')
->with(101)
->willReturn([]);
$this->expectException(OCSNotFoundException::class);
$this->controller->getUrl(101);
}
public function testGetUrlForFolder() {
$userFolder = $this->createMock(Folder::class);
$this->rootFolder->method('getUserFolder')
->with('awesomeUser')
->willReturn($userFolder);
$folder = $this->createMock(Folder::class);
$userFolder->method('getById')
->with(101)
->willReturn([$folder]);
$this->expectException(OCSBadRequestException::class);
$this->controller->getUrl(101);
}
public function testGetUrlValid() {
$userFolder = $this->createMock(Folder::class);
$this->rootFolder->method('getUserFolder')
->with('awesomeUser')
->willReturn($userFolder);
$file = $this->createMock(File::class);
$this->timeFactory->method('getTime')
->willReturn(42);
$userFolder->method('getById')
->with(101)
->willReturn([$file]);
$this->random->method('generate')
->with(
60,
ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS
)->willReturn('superduperlongtoken');
$this->directMapper->expects($this->once())
->method('insert')
->willReturnCallback(function (Direct $direct) {
$this->assertSame('awesomeUser', $direct->getUserId());
$this->assertSame(101, $direct->getFileId());
$this->assertSame('superduperlongtoken', $direct->getToken());
$this->assertSame(42 + 60*60*8, $direct->getExpiration());
});
$this->urlGenerator->method('getAbsoluteURL')
->willReturnCallback(function(string $url) {
return 'https://my.nextcloud/'.$url;
});
$result = $this->controller->getUrl(101);
$this->assertInstanceOf(DataResponse::class, $result);
$this->assertSame([
'url' => 'https://my.nextcloud/remote.php/direct/superduperlongtoken',
], $result->getData());
}
}