upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 18:21:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 37

Merge pull request #18878 from nextcloud/backport/18805/stable18

Browse source 
[stable18] Check if file already exists during file creation
This commit is contained in:
Roeland Jago Douma 2020-01-15 12:24:06 +01:00 committed by GitHub
commit 7a79e95254
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/private/DirectEditing/Manager.php
View file

@ -123,15 +123,21 @@ class Manager implements IManager {
public function create(string $path, string $editorId, string $creatorId, $templateId = null): string {
$userFolder = $this->rootFolder->getUserFolder($this->userId);
$file = $userFolder->newFile($path);
$editor = $this->getEditor($editorId);
$creators = $editor->getCreators();
foreach ($creators as $creator) {
if ($creator->getId() === $creatorId) {
$creator->create($file, $creatorId, $templateId);
return $this->createToken($editorId, $file, $path);
try {
$file = $userFolder->get($path);
throw new \RuntimeException('File already exists');
} catch (\OCP\Files\NotFoundException $e) {
$file = $userFolder->newFile($path);
$editor = $this->getEditor($editorId);
$creators = $editor->getCreators();
foreach ($creators as $creator) {
if ($creator->getId() === $creatorId) {
$creator->create($file, $creatorId, $templateId);
return $this->createToken($editorId, $file, $path);
}
}
}
throw new \RuntimeException('No creator found');
}

15
tests/lib/DirectEditing/ManagerTest.php
View file

@ -12,6 +12,7 @@ use OCP\DirectEditing\IEditor;
use OCP\DirectEditing\IToken;
use OCP\Files\Folder;
use OCP\Files\IRootFolder;
use OCP\Files\NotFoundException;
use OCP\IDBConnection;
use OCP\IL10N;
use OCP\IUserSession;
@ -151,6 +152,10 @@ class ManagerTest extends TestCase {
$this->random->expects($this->once())
->method('generate')
->willReturn($expectedToken);
$this->userFolder
->method('get')
->with('/File.txt')
->willThrowException(new NotFoundException());
$this->userFolder->expects($this->once())
->method('newFile')
->willReturn($file);
@ -167,6 +172,10 @@ class ManagerTest extends TestCase {
$this->random->expects($this->once())
->method('generate')
->willReturn($expectedToken);
$this->userFolder
->method('get')
->with('/File.txt')
->willThrowException(new NotFoundException());
$this->userFolder->expects($this->once())
->method('newFile')
->willReturn($file);
@ -177,4 +186,10 @@ class ManagerTest extends TestCase {
$this->assertInstanceOf(NotFoundResponse::class, $secondResult);
}
public function testCreateFileAlreadyExists() {
$this->expectException(\RuntimeException::class);
$this->manager->create('/File.txt', 'testeditor', 'createEmpty');
}
}