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

Merge pull request #26406 from nextcloud/backport/26396/stable21

This commit is contained in:
John Molakvoæ 2021-04-02 16:59:51 +02:00 committed by GitHub
parent e14860c8f2 dc8e819915
commit b59cf16325
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/private/DirectEditing/Manager.php
View File

@ -27,6 +27,7 @@
namespace OC\DirectEditing; namespace OC\DirectEditing;
use Doctrine\DBAL\FetchMode; use Doctrine\DBAL\FetchMode;
use OC\Files\Node\Folder;
use OCP\AppFramework\Http\NotFoundResponse; use OCP\AppFramework\Http\NotFoundResponse;
use OCP\AppFramework\Http\Response; use OCP\AppFramework\Http\Response;
use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Http\TemplateResponse;
@ -130,7 +131,12 @@ class Manager implements IManager {
if ($userFolder->nodeExists($path)) { if ($userFolder->nodeExists($path)) {
throw new \RuntimeException('File already exists'); throw new \RuntimeException('File already exists');
} else { } else {
$file = $userFolder->newFile($path); if (!$userFolder->nodeExists(dirname($path))) {
throw new \RuntimeException('Invalid path');
}
/** @var Folder $folder */
$folder = $userFolder->get(dirname($path));
$file = $folder->newFile(basename($path));
$editor = $this->getEditor($editorId); $editor = $this->getEditor($editorId);
$creators = $editor->getCreators(); $creators = $editor->getCreators();
foreach ($creators as $creator) { foreach ($creators as $creator) {

12
lib/private/Files/Template/TemplateManager.php
View File

@ -36,7 +36,6 @@ use OCP\Files\GenericFileException;
use OCP\Files\IRootFolder; use OCP\Files\IRootFolder;
use OCP\Files\Node; use OCP\Files\Node;
use OCP\Files\NotFoundException; use OCP\Files\NotFoundException;
use OCP\Files\NotPermittedException;
use OCP\Files\Template\FileCreatedFromTemplateEvent; use OCP\Files\Template\FileCreatedFromTemplateEvent;
use OCP\Files\Template\ICustomTemplateProvider; use OCP\Files\Template\ICustomTemplateProvider;
use OCP\Files\Template\ITemplateManager; use OCP\Files\Template\ITemplateManager;
@ -154,7 +153,11 @@ class TemplateManager implements ITemplateManager {
} catch (NotFoundException $e) { } catch (NotFoundException $e) {
} }
try { try {
$targetFile = $userFolder->newFile($filePath); if (!$userFolder->nodeExists(dirname($filePath))) {
throw new GenericFileException($this->l10n->t('Invalid path'));
}
$folder = $userFolder->get(dirname($filePath));
$targetFile = $folder->newFile(basename($filePath));
if ($templateType === 'user' && $templateId !== '') { if ($templateType === 'user' && $templateId !== '') {
$template = $userFolder->get($templateId); $template = $userFolder->get($templateId);
$template->copy($targetFile->getPath()); $template->copy($targetFile->getPath());
@ -295,9 +298,10 @@ class TemplateManager implements ITemplateManager {
} }
try { try {
$folder = $userFolder->newFolder($userTemplatePath);
} catch (NotPermittedException $e) {
$folder = $userFolder->get($userTemplatePath); $folder = $userFolder->get($userTemplatePath);
} catch (NotFoundException $e) {
$folder = $userFolder->get(dirname($userTemplatePath));
$folder = $folder->newFolder(basename($userTemplatePath));
} }
$folderIsEmpty = count($folder->getDirectoryListing()) === 0; $folderIsEmpty = count($folder->getDirectoryListing()) === 0;

22
tests/lib/DirectEditing/ManagerTest.php
View File

@ -154,11 +154,16 @@ class ManagerTest extends TestCase {
$this->random->expects($this->once()) $this->random->expects($this->once())
->method('generate') ->method('generate')
->willReturn($expectedToken); ->willReturn($expectedToken);
$folder = $this->createMock(Folder::class);
$this->userFolder $this->userFolder
->method('nodeExists') ->method('nodeExists')
->with('/File.txt') ->withConsecutive(['/File.txt'], ['/'])
->willReturn(false); ->willReturnOnConsecutiveCalls(false, true);
$this->userFolder->expects($this->once()) $this->userFolder
->method('get')
->with('/')
->willReturn($folder);
$folder->expects($this->once())
->method('newFile') ->method('newFile')
->willReturn($file); ->willReturn($file);
$token = $this->manager->create('/File.txt', 'testeditor', 'createEmpty'); $token = $this->manager->create('/File.txt', 'testeditor', 'createEmpty');
@ -174,11 +179,16 @@ class ManagerTest extends TestCase {
$this->random->expects($this->once()) $this->random->expects($this->once())
->method('generate') ->method('generate')
->willReturn($expectedToken); ->willReturn($expectedToken);
$folder = $this->createMock(Folder::class);
$this->userFolder $this->userFolder
->method('nodeExists') ->method('nodeExists')
->with('/File.txt') ->withConsecutive(['/File.txt'], ['/'])
->willReturn(false); ->willReturnOnConsecutiveCalls(false, true);
$this->userFolder->expects($this->once()) $this->userFolder
->method('get')
->with('/')
->willReturn($folder);
$folder->expects($this->once())
->method('newFile') ->method('newFile')
->willReturn($file); ->willReturn($file);
$this->manager->create('/File.txt', 'testeditor', 'createEmpty'); $this->manager->create('/File.txt', 'testeditor', 'createEmpty');